NH_Gooi/nhgooi.nl
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Pull new-api into release/dev #5

Merged
mischa.spelt merged 26 commits from new-api into release/dev 2024-09-12 15:04:12 +02:00
Conversation 0 Commits 26 Files Changed 37 +3 -3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 35713d2974 - Show all commits

2
app/Http/Controllers/Controller.php
View File

@@ -144,7 +144,7 @@ class Controller extends BaseController
protected static function JsonToDateTime($obj)
{
return is_object($obj) ? new \DateTime($obj->date, new \DateTimeZone($obj->timezone)) : new \DateTime($obj);
return is_object($obj) ? new \DateTime($obj->date, new \DateTimeZone($obj->timezone)) : \Carbon\Carbon::parse($obj)->setTimezone(date_default_timezone_get());
}
public function __call($method, $arguments)

2
resources/views/partial/radioscheduleweek.blade.php
View File

@@ -26,5 +26,5 @@
@endif
</div>
</div>
@endforeach
@endforeach