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

Shift page: show additional angeltypes if shift entries where found

This commit is contained in:
Igor Scheller 2019-08-21 22:08:39 +02:00
parent 1a6c7599d6
commit b2a4225a62
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
includes/view/Shifts_view.php
View File

@ -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,