~doyle/zpan.git

author	Jordan Doyle <jordan@doyle.wf>	2016-06-26 14:11:49.0 +01:00:00
committer	Jordan Doyle <jordan@doyle.wf>	2016-06-26 14:11:49.0 +01:00:00
commit	f9e6fd4c2da3f4d0870682c93a0e12a6275db7ae [patch]
tree	2120704f428c091ca6eeaa309a2890a055485125
parent	94624f04bbeab4a55a634bd80a98f868e12fcf55
download	f9e6fd4c2da3f4d0870682c93a0e12a6275db7ae.tar.gz

Fix issue for radio timetable too

Diff

 app/Http/Controllers/DJ/TimetableController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/DJ/TimetableController.php b/app/Http/Controllers/DJ/TimetableController.php
index b4a10a8..180ddc6 100644
--- a/app/Http/Controllers/DJ/TimetableController.php
+++ a/app/Http/Controllers/DJ/TimetableController.php
@@ -178,14 +178,14 @@
            $carbon = Carbon::now()->setISODate(
                Carbon::now()->year,
                Carbon::now()->weekOfYear,
                $slot->day + 1
                $slot->day
            )->setTime($slot->hour, 0)->tz(auth()->check() ? auth()->user()->getTimezone() : 'Europe/London');

            if (Carbon::now()->weekOfYear !== $carbon->weekOfYear) {
                continue;
            }

            $timetable[$carbon->dayOfWeek - 1][$carbon->hour] = [
            $timetable[$carbon->dayOfWeek][$carbon->hour] = [
                'id' => $slot->user->userid,
                'name' => $raw ? $slot->user->getDisplayName()->toHtml() : $slot->user->getDisplayName()
            ];