From 4407604793e0a7b99122e306ae710304846cf3ea Mon Sep 17 00:00:00 2001 From: msquare Date: Wed, 28 Dec 2016 14:53:35 +0100 Subject: move data sorting to begin --- includes/controller/rooms_controller.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'includes/controller/rooms_controller.php') diff --git a/includes/controller/rooms_controller.php b/includes/controller/rooms_controller.php index 24bf5220..a79034fb 100644 --- a/includes/controller/rooms_controller.php +++ b/includes/controller/rooms_controller.php @@ -43,13 +43,11 @@ function room_controller() { $shiftsFilterRenderer = new ShiftsFilterRenderer($shiftsFilter); $shiftsFilterRenderer->enableDaySelection($days); - $shifts = Shifts_by_ShiftsFilter($shiftsFilter); - $needed_angeltypes = NeededAngeltypes_by_ShiftsFilter($shiftsFilter); - $shift_entries = ShiftEntries_by_ShiftsFilter($shiftsFilter); + $shiftCalendarRenderer = shiftCalendarRendererByShiftFilter($shiftsFilter); return [ $room['Name'], - Room_view($room, $shiftsFilterRenderer, new ShiftCalendarRenderer($shifts, $needed_angeltypes, $shift_entries, $shiftsFilter)) + Room_view($room, $shiftsFilterRenderer, $shiftCalendarRenderer) ]; } -- cgit v1.2.3-54-g00ecf