From 40bff62daf79cb8e1507c9f93d517b728bcfbf14 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Wed, 28 Dec 2016 17:31:59 +0100
Subject: repair room-mapping

---
 model/Schedule.php                 | 3 ---
 template/assemblies/schedule.phtml | 2 +-
 2 files changed, 1 insertion(+), 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
-- 
cgit v1.2.3