From 46528fe1d888ae09d125c2ae8ac1952f1d7f29f6 Mon Sep 17 00:00:00 2001 From: msquare Date: Tue, 27 Dec 2016 23:02:05 +0100 Subject: shift view performance improvements --- includes/pages/user_shifts.php | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'includes/pages') diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 5703ea8b..6b942804 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -130,19 +130,8 @@ function view_user_shifts() { $shiftsFilter = $_SESSION['ShiftsFilter']; $shifts = Shifts_by_ShiftsFilter($shiftsFilter, $user); - - $ownshifts_source = sql_select(" - SELECT `ShiftTypes`.`name`, `Shifts`.* - FROM `Shifts` - INNER JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) - INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = '" . sql_escape($user['UID']) . "') - WHERE `Shifts`.`RID` IN (" . implode(',', $shiftsFilter->getRooms()) . ") - AND `start` BETWEEN " . $shiftsFilter->getStartTime() . " AND " . $shiftsFilter->getEndTime()); - $ownshifts = []; - foreach ($ownshifts_source as $ownshift) { - $ownshifts[$ownshift['SID']] = $ownshift; - } - unset($ownshifts_source); + $needed_angeltypes = NeededAngeltypes_by_ShiftsFilter($shiftsFilter, $user); + $shift_entries = ShiftEntries_by_ShiftsFilter($shiftsFilter, $user); if ($user['api_key'] == "") { User_reset_api_key($user, false); @@ -163,7 +152,7 @@ function view_user_shifts() { $end_day = date("Y-m-d", $shiftsFilter->getEndTime()); $end_time = date("H:i", $shiftsFilter->getEndTime()); - $shiftCalendarRenderer = new ShiftCalendarRenderer($shifts, $shiftsFilter); + $shiftCalendarRenderer = new ShiftCalendarRenderer($shifts, $needed_angeltypes, $shift_entries, $shiftsFilter); return page([ div('col-md-12', [ msg(), -- cgit v1.2.3-54-g00ecf