Merge pull request #643 from MyIgel/show-angetypes

Shift page: show additional angeltypes if shift entries where found

1 files changed, 14 insertions, 1 deletions

diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php
index 4a4e4f0c..cbd0208d 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) {