fix needed angeltypes in shifttypes and locations, search for more user related data in log

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) {

resources/views/admin/shifttypes/view.twig

@@ -9,6 +9,7 @@
         <h3>{{ __('general.description') }}</h3>
         {{ shifttype.description|md }}
     </div>
+    {% if shifttype.neededAngelTypes.isNotEmpty() %}
         <div class="col-md-12">
             <h3>{{ __('location.required_angels') }}</h3>
             <ul>
@@ -23,4 +24,5 @@
                 {% endfor %}
             </ul>
         </div>
+    {% endif %}
 {% endblock %}

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)) {