iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update shifts_controller.php 

fix problem when missing needed angeltype entry
This commit is contained in:
msquare 2018-08-28 18:28:09 +02:00 committed by GitHub
parent d93ace2eae
commit 1090d5e889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
includes/controller/shifts_controller.php
View File

@ -277,6 +277,10 @@ function shift_controller()
$shift_signup_state = new ShiftSignupState(ShiftSignupState::OCCUPIED, 0); $shift_signup_state = new ShiftSignupState(ShiftSignupState::OCCUPIED, 0);
foreach ($angeltypes as &$angeltype) { foreach ($angeltypes as &$angeltype) {
$needed_angeltype = NeededAngeltype_by_Shift_and_Angeltype($shift, $angeltype); $needed_angeltype = NeededAngeltype_by_Shift_and_Angeltype($shift, $angeltype);
if(empty($needed_angeltype)) {
continue;
}
$shift_entries = ShiftEntries_by_shift_and_angeltype($shift['SID'], $angeltype['id']); $shift_entries = ShiftEntries_by_shift_and_angeltype($shift['SID'], $angeltype['id']);
$angeltype_signup_state = Shift_signup_allowed( $angeltype_signup_state = Shift_signup_allowed(
@ -288,11 +292,7 @@ function shift_controller()
$needed_angeltype, $needed_angeltype,
$shift_entries $shift_entries
); );
if (empty($shift_signup_state)) { $shift_signup_state->combineWith($angeltype_signup_state);
$shift_signup_state = $angeltype_signup_state;
} else {
$shift_signup_state->combineWith($angeltype_signup_state);
}
$angeltype['shift_signup_state'] = $angeltype_signup_state; $angeltype['shift_signup_state'] = $angeltype_signup_state;
} }