From 7d5837c5f171678d6e6b12de63bd48e899acb3a0 Mon Sep 17 00:00:00 2001
From: Xu <git@xumail.de>
Date: Fri, 29 Dec 2023 15:21:38 +0100
Subject: [PATCH] fix needed angeltypes in shifttypes and locations, search for
 more user related data in log

---
 includes/view/Locations_view.php           |  2 +-
 resources/views/admin/shifttypes/view.twig | 30 ++++++++++++----------
 src/Models/LogEntry.php                    |  7 ++++-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/includes/view/Locations_view.php b/includes/view/Locations_view.php
index 8932ac55..6e9b3536 100644
--- a/includes/view/Locations_view.php
+++ b/includes/view/Locations_view.php
@@ -28,7 +28,7 @@ function location_view(Location $location, ShiftsFilterRenderer $shiftsFilterRen
     }
 
     $neededAngelTypes = '';
-    if (auth()->can('admin_shifts')) {
+    if (auth()->can('admin_shifts') && $location->neededAngelTypes->isNotEmpty()) {
         $neededAngelTypes .= '<h3>' . __('location.required_angels') . '</h3><ul>';
         foreach ($location->neededAngelTypes as $neededAngelType) {
             if ($neededAngelType->count) {
diff --git a/resources/views/admin/shifttypes/view.twig b/resources/views/admin/shifttypes/view.twig
index d36333da..d2778151 100644
--- a/resources/views/admin/shifttypes/view.twig
+++ b/resources/views/admin/shifttypes/view.twig
@@ -9,18 +9,20 @@
         <h3>{{ __('general.description') }}</h3>
         {{ shifttype.description|md }}
     </div>
-    <div class="col-md-12">
-        <h3>{{ __('location.required_angels') }}</h3>
-        <ul>
-            {% for neededAngelType in shifttype.neededAngelTypes %}
-                {% if neededAngelType.count %}
-                    <li>
-                        <a href="{{ url('angeltypes', {'action':'view', 'angeltype_id': neededAngelType.angelType.id}) }}">
-                            {{ neededAngelType.angelType.name -}}
-                        </a>: {{ neededAngelType.count }}
-                    </li>
-                {% endif %}
-            {% endfor %}
-        </ul>
-    </div>
+    {% if shifttype.neededAngelTypes.isNotEmpty() %}
+        <div class="col-md-12">
+            <h3>{{ __('location.required_angels') }}</h3>
+            <ul>
+                {% for neededAngelType in shifttype.neededAngelTypes %}
+                    {% if neededAngelType.count %}
+                        <li>
+                            <a href="{{ url('angeltypes', {'action':'view', 'angeltype_id': neededAngelType.angelType.id}) }}">
+                                {{ neededAngelType.angelType.name -}}
+                            </a>: {{ neededAngelType.count }}
+                        </li>
+                    {% endif %}
+                {% endfor %}
+            </ul>
+        </div>
+    {% endif %}
 {% endblock %}
diff --git a/src/Models/LogEntry.php b/src/Models/LogEntry.php
index ce53f70c..ae2df036 100644
--- a/src/Models/LogEntry.php
+++ b/src/Models/LogEntry.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Engelsystem\Models;
 
 use Carbon\Carbon;
+use Engelsystem\Models\User\User;
 use Engelsystem\Models\User\UsesUserModel;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -57,7 +58,11 @@ class LogEntry extends BaseModel
             ->limit(10000);
 
         if (!empty($userId)) {
-            $query->where('user_id', $userId);
+            $query->where(function (Builder $query) use ($userId): void {
+                $user = User::findOrFail($userId);
+                $query->where('user_id', $userId)
+                    ->orWhere('message', 'like', '%' . $user->name . ' (' . $userId . ')%');
+            });
         }
 
         if (!empty($keyword)) {