diff options
author | msquare <msquare@notrademark.de> | 2016-12-27 23:02:05 +0100 |
---|---|---|
committer | msquare <msquare@notrademark.de> | 2016-12-27 23:02:05 +0100 |
commit | 46528fe1d888ae09d125c2ae8ac1952f1d7f29f6 (patch) | |
tree | b8361bb6aff1307845c9903d2693121835e8d033 /includes/pages/user_shifts.php | |
parent | ffc33993d4cea15d4d8a4af631afdd97c3567c36 (diff) |
shift view performance improvements
Diffstat (limited to 'includes/pages/user_shifts.php')
-rw-r--r-- | includes/pages/user_shifts.php | 17 |
1 files changed, 3 insertions, 14 deletions
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(), |