From b3f92834b0d531d479b7d2f99dbe04fa30faf3f0 Mon Sep 17 00:00:00 2001 From: msquare Date: Mon, 26 Dec 2016 14:33:18 +0100 Subject: reduce number of sql queries on shift calendar --- includes/model/NeededAngelTypes_model.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'includes/model') diff --git a/includes/model/NeededAngelTypes_model.php b/includes/model/NeededAngelTypes_model.php index 76796869..3bd3660f 100644 --- a/includes/model/NeededAngelTypes_model.php +++ b/includes/model/NeededAngelTypes_model.php @@ -87,14 +87,15 @@ function NeededAngelTypes_by_shift($shiftId) { $shift_entries = ShiftEntries_by_shift($shiftId); $needed_angeltypes = []; foreach ($needed_angeltypes_source as $angeltype) { + $angeltype['shift_entries'] = []; $angeltype['taken'] = 0; - foreach($shift_entries as $shift_entry) { - if($shift_entry['TID']==$angeltype['id'] && $shift_entry['freeloaded'] == 0) { - $angeltype['taken']++; + foreach ($shift_entries as $shift_entry) { + if ($shift_entry['TID'] == $angeltype['angel_type_id'] && $shift_entry['freeloaded'] == 0) { + $angeltype['taken'] ++; + $angeltype['shift_entries'][] = $shift_entry; } } - $angeltype['shift_entries'] = $shift_entries; $needed_angeltypes[] = $angeltype; } -- cgit v1.2.3-54-g00ecf