Mirrors/streaming-website
2
0
Fork 0
mirror of https://github.com/voc/streaming-website synced 2024-11-14 16:37:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed asymetic rendering of events where one room starts a day before the others

Browse source
This commit is contained in:
Andreas Hubel 2019-06-07 23:35:46 +02:00
parent d16f2d8888
commit b93a03b6c4
1 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
model/Schedule.php
View file

@ -81,6 +81,7 @@ class Schedule
return [];
$program = array();
$rooms = array();
// re-calculate day-ends
// some schedules have long gaps before the first talk or talks that expand beyond the dayend
@ -96,6 +97,9 @@ class Schedule
$roomName = (string)$room['name'];
if($this->isRoomFiltered($roomName))
continue;
if(!in_array($roomName, $rooms))
$rooms[] = $roomName;
foreach($room->event as $event)
{
@ -131,15 +135,39 @@ class Schedule
$dayend = (int)$day['end'];
$roomidx = 0;
foreach($day->room as $room)
foreach($rooms as $roomName)
{
$roomidx++;
$lastend = false;
$roomName = trim((string)$room['name']);
if($this->isRoomFiltered($roomName))
continue;
$result = $day->xpath("room[@name='".$roomName."']");
if(!$result) {
// this room has no events on this day -> add long gap
$program[$roomName][] = array(
'special' => 'gap',
'fstart' => date('c', $daystart),
'fend' => date('c', $dayend),
'start' => $daystart,
'end' => $dayend,
'duration' => $dayend - $daystart,
);
$program[$roomName][] = array(
'special' => 'daychange',
'title' => 'Daychange from Day '.$dayidx.' to '.($dayidx+1),
'start' => $dayend,
'end' => (int)$schedule->day[$dayidx]['start'],
'duration' => 60*60,
);
continue;
}
$room = $result[0];
$eventsSorted = [];
foreach($room->event as $event)
{