diff options
Diffstat (limited to 'includes/view/Shifts_view.php')
| -rw-r--r-- | includes/view/Shifts_view.php | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php index 133ceb06..ef8da9c2 100644 --- a/includes/view/Shifts_view.php +++ b/includes/view/Shifts_view.php @@ -2,6 +2,7 @@ use Engelsystem\Models\User\User; use Engelsystem\ShiftSignupState; +use Illuminate\Support\Collection; /** * Renders the basic shift view header. @@ -115,10 +116,22 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupSt } $needed_angels = ''; - foreach ($shift['NeedAngels'] as $needed_angeltype) { + $neededAngels = new Collection($shift['NeedAngels']); + foreach ($neededAngels as $needed_angeltype) { $needed_angels .= Shift_view_render_needed_angeltype($needed_angeltype, $angeltypes, $shift, $user_shift_admin); } + foreach ($shift['ShiftEntry'] as $shiftEntry) { + if (!$neededAngels->where('TID', $shiftEntry['TID'])->first()) { + $needed_angels .= Shift_view_render_needed_angeltype([ + 'TID' => $shiftEntry['TID'], + 'count' => 0, + 'restricted' => true, + 'taken' => true, + ], $angeltypes, $shift, $user_shift_admin); + } + } + $content = [msg()]; if ($shift_signup_state->getState() == ShiftSignupState::COLLIDES) { @@ -197,7 +210,7 @@ function Shift_view_render_needed_angeltype($needed_angeltype, $angeltypes, $shi $needed_angels .= '<h3>' . AngelType_name_render($angeltype) . '</h3>'; $bar_max = max($needed_angeltype['count'] * 10, $needed_angeltype['taken'] * 10, 10); - $bar_value = max($bar_max/10, $needed_angeltype['taken'] * 10); + $bar_value = max($bar_max / 10, $needed_angeltype['taken'] * 10); $needed_angels .= progress_bar( 0, $bar_max, |