diff options
| author | MaZderMind | 2016-12-28 17:31:59 +0100 |
|---|---|---|
| committer | MaZderMind | 2016-12-28 17:31:59 +0100 |
| commit | 40bff62daf79cb8e1507c9f93d517b728bcfbf14 (patch) | |
| tree | 97a80ca97a099797d54d86df2d8c96cb5c8edc28 | |
| parent | 037c748ff6cf737969f7e8e74a030bed1ff3c2ab (diff) | |
repair room-mapping
| -rw-r--r-- | model/Schedule.php | 3 | ||||
| -rw-r--r-- | template/assemblies/schedule.phtml | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/model/Schedule.php b/model/Schedule.php index 917d70b..4c0a802 100644 --- a/model/Schedule.php +++ b/model/Schedule.php @@ -117,9 +117,6 @@ class Schedule $room_known = isset($mapping[$name]); - if($room_known) - $name = $mapping[$name]; - $eventsSorted = []; foreach($room->event as $event) { diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml index 90ec1b9..ad58ce7 100644 --- a/template/assemblies/schedule.phtml +++ b/template/assemblies/schedule.phtml @@ -3,7 +3,7 @@ <div class="now"><span>now</span></div> <? $rooms = $schedule->getSchedule() ?> <? foreach($rooms as $roomname => $events): ?> - <div class="room <? if(isset($room) && $roomname == $room->getSlug()): ?>highlight<? endif ?>" style="width: <?=round($schedule->getDurationSum() / $schedule->getScale())?>px"> + <div class="room <? if(isset($room) && $roomname == $room->getScheduleName()): ?>highlight<? endif ?>" style="width: <?=round($schedule->getDurationSum() / $schedule->getScale())?>px"> <? $fromstart = 0; ?> <? foreach($events as $event): ?> <div |