diff options
| -rw-r--r-- | includes/model/Shifts_model.php | 4 | ||||
| -rw-r--r-- | includes/view/ShiftCalendarShiftRenderer.php | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php index 74cfa356..e45c54ac 100644 --- a/includes/model/Shifts_model.php +++ b/includes/model/Shifts_model.php @@ -121,6 +121,10 @@ function Shift_free_entries($shift_id, $angeltype_id) { function Shift_signup_allowed_angel($user, $shift, $angeltype, $user_angeltype, $user_shifts, $angeltype_supporter = false) { $free_entries = Shift_free_entries($shift['SID'], $angeltype['id']); + if($user['Gekommen'] == 0) { + return new ShiftSignupState(ShiftSignupState::SHIFT_ENDED, $free_entries); + } + if ($user_shifts == null) { $user_shifts = Shifts_by_user($user); } diff --git a/includes/view/ShiftCalendarShiftRenderer.php b/includes/view/ShiftCalendarShiftRenderer.php index 50b1bf1b..e3ceb47f 100644 --- a/includes/view/ShiftCalendarShiftRenderer.php +++ b/includes/view/ShiftCalendarShiftRenderer.php @@ -78,6 +78,10 @@ class ShiftCalendarShiftRenderer { } $html .= $angeltype_html; } + if ($shift_signup_state == null) { + $shift_signup_state = new ShiftSignupState(ShiftSignupState::SHIFT_ENDED, 0); + } + if (in_array('user_shifts_admin', $privileges)) { $html .= '<li class="list-group-item">' . button(page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'], _("Add more angels"), 'btn-xs') . '</li>'; } |