c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 02:39:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Test performance

Browse Source
This commit is contained in:
Lagacé Mathieu
2020-01-24 10:33:16 -05:00
parent ef6f403e1b
commit 03cf1c5493
48 changed files with 4699 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Controllers/ScheduleController.php
View File

@@ -99,9 +99,25 @@ class ScheduleController extends Controller
}
foreach ($events as $event) {
$color = $this->getColor($event->type);
if($event->calendar_color == null)
{
$color = $this->getColor($event->type);
}
else
{
$color = $event->calendar_color;
}
if($event->calendar_icon == null)
{
$icon = "";
}
else
{
$icon = $event->calendar_icon;
}
$myevent = [
'title' => $event->name,
'start' => date('c',strtotime($event->date_begin)),
@@ -109,7 +125,8 @@ class ScheduleController extends Controller
'color' => $color,
'extraParams' => [
'db_type' => 'event'],
'id' => $event->id
'id' => $event->id,
'icon' => $icon
];
array_push($jsonevents,$myevent);
}