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

Merge pull request #643 from MyIgel/show-angetypes 

Shift page: show additional angeltypes if shift entries where found
This commit is contained in:
msquare 2019-08-21 22:22:05 +02:00 committed by GitHub
parent f73b8e7a0e b2a4225a62
commit ce6419e308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
includes/view/Shifts_view.php
View File

@ -2,6 +2,7 @@
use Engelsystem\Models\User\User; use Engelsystem\Models\User\User;
use Engelsystem\ShiftSignupState; use Engelsystem\ShiftSignupState;
use Illuminate\Support\Collection;
/** /**
* Renders the basic shift view header. * Renders the basic shift view header.
@ -115,10 +116,22 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupSt
} }
$needed_angels = ''; $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); $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()]; $content = [msg()];
if ($shift_signup_state->getState() == ShiftSignupState::COLLIDES) { if ($shift_signup_state->getState() == ShiftSignupState::COLLIDES) {