🐛 fix wrong checkin end in event suggestions backend (#2299)

Traewelling · Jan 29, 2024 · ca2ad40 · ca2ad40
1 parent 37bee80
commit ca2ad40
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 30 deletions.
diff --git a/app/Http/Controllers/Frontend/Admin/EventController.php b/app/Http/Controllers/Frontend/Admin/EventController.php
@@ -50,7 +50,6 @@ public function renderSuggestions(): View {
         return view('admin.events.suggestions', [
             'suggestions' => EventSuggestion::where('processed', false)
                                             ->where('end', '>', DB::raw('CURRENT_TIMESTAMP'))
-                                            ->where('user_id', '!=', auth()->user()->id) //moderator can't accept their own suggestions
                                             ->orderBy('begin')
                                             ->get()
         ]);

diff --git a/composer.lock b/composer.lock
diff --git a/resources/views/admin/events/suggestion-create.blade.php b/resources/views/admin/events/suggestion-create.blade.php
@@ -75,7 +75,7 @@ class="form-control" placeholder="{{ __('stationboard.station-placeholder') }}"
                             <div class="col-6">
                                 <div class="form-floating">
                                     <input id="begin" type="datetime-local" class="form-control" name="begin"
-                                           value="{{ $event->begin->toDateTimeLocalString() }}"
+                                           value="{{ $event->begin->startOfDay()->toDateTimeLocalString() }}"
                                            required
                                     />
                                     <label for="begin">Checkin {{ __('events.begin') }}:</label>
@@ -84,7 +84,7 @@ class="form-control" placeholder="{{ __('stationboard.station-placeholder') }}"
                             <div class="col-6">
                                 <div class="form-floating">
                                     <input id="end" type="datetime-local" class="form-control" name="end"
-                                           value="{{ $event->begin->toDateTimeLocalString() }}"
+                                           value="{{ $event->end->endOfDay()->toDateTimeLocalString() }}"
                                            required
                                     />
                                     <label for="end">Checkin {{ __('events.end') }}:</label>

diff --git a/resources/views/admin/events/suggestions.blade.php b/resources/views/admin/events/suggestions.blade.php
@@ -1,14 +1,15 @@
-@php use App\Enum\EventRejectionReason; @endphp
 @php use Illuminate\Support\Facades\Date; @endphp
 @extends('admin.layout')
 
-@section('title', 'Veranstaltungsvorschläge')
+@section('title', 'Event suggestions')
 
 @section('content')
     <div class="card">
         <div class="card-body">
-            @if($suggestions->count() == 0)
-                <p class="font-weight-bold text-danger">Es sind aktuell keine Vorschläge vorhanden. :(</p>
+            @if($suggestions->count() === 0)
+                <p class="font-weight-bold text-danger">
+                    Nothing to do here! 🎉
+                </p>
             @else
                 <table class="table">
                     <thead>
@@ -26,6 +27,10 @@
                     </thead>
                     <tbody>
                         @foreach($suggestions as $event)
+                            @if($event->user->id === auth()->id() && !auth()->user()->hasRole('admin'))
+                                @continue
+                            @endif
+
                             <tr class="{{$event->begin->isPast() ? 'table-danger' : ''}}">
                                 <td>{{$event->name}}</td>
                                 <td>{{$event->host}}</td>
@@ -70,5 +75,13 @@
                 </table>
             @endif
         </div>
+        @if(!auth()->user()->hasRole('admin'))
+            <div class="card-footer">
+                <small>
+                    You cannot see your own suggestions.
+                    They are only visible to other event moderators and admins.
+                </small>
+            </div>
+        @endif
     </div>
 @endsection