kontakt
/
engelsystem
3
0
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity

fix shift view bug

Browse Source
main
msquare 5 years ago
parent a1bb019af6
commit a521ace9f7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File

6
includes/controller/shifts_controller.php
Unescape Escape View File

@ -269,11 +269,12 @@ function shift_controller()
$shifttype = ShiftType($shift['shifttype_id']); $shifttype = ShiftType($shift['shifttype_id']);
$room = Room($shift['RID']); $room = Room($shift['RID']);
$angeltypes = AngelTypes(); $angeltypes_source = AngelTypes();
$angeltypes = [];
$user_shifts = Shifts_by_user($user->id); $user_shifts = Shifts_by_user($user->id);
$shift_signup_state = new ShiftSignupState(ShiftSignupState::OCCUPIED, 0); $shift_signup_state = new ShiftSignupState(ShiftSignupState::OCCUPIED, 0);
foreach ($angeltypes as &$angeltype) { foreach ($angeltypes_source as &$angeltype) {
$needed_angeltype = NeededAngeltype_by_Shift_and_Angeltype($shift, $angeltype); $needed_angeltype = NeededAngeltype_by_Shift_and_Angeltype($shift, $angeltype);
if (empty($needed_angeltype)) { if (empty($needed_angeltype)) {
continue; continue;
@ -292,6 +293,7 @@ function shift_controller()
); );
$shift_signup_state->combineWith($angeltype_signup_state); $shift_signup_state->combineWith($angeltype_signup_state);
$angeltype['shift_signup_state'] = $angeltype_signup_state; $angeltype['shift_signup_state'] = $angeltype_signup_state;
$angeltypes[] = $angeltype;
} }
return [ return [

Write Preview
Loading…
Cancel
Save