v0.10.19 - Added building name to reservation site

Fixed $eventsToDelete in EventController.php

skolehjem/app/Http/Controllers/EventController.php

@@ -11,6 +11,7 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
 
+date_default_timezone_set('Europe/Copenhagen');
 
 class EventController extends Controller
 {
@@ -32,16 +33,14 @@ class EventController extends Controller
      */
     public function index(Request $request)
     {
-        $eventsToDelete = DB::table('events')
+        $eventsToDelete = Event::query()->get();
-            ->where('events.date', '<=', date('Y-m-d H:i', strtotime('-1 day')))->get();
 
-        foreach ($eventsToDelete as $event)
+        foreach ($eventsToDelete as $event) {
-        {
+            if (date('Y-m-d H:i', strtotime('-1 day')) >= date('Y-m-d H:i', strtotime($event->date))) {
-            DB::table('user_events')
+                UserEvent::query()->where('event_id', '=', $event->id)->delete();
-                ->where('event_id', '=', $event->id)
-                ->delete();
 
-            $event->delete();
+                $event->delete();
+            }
         }
 
         $events = Event::query()->orderBY('date' , 'asc')->paginate($request->input("limit", 20));

skolehjem/app/Http/Controllers/WashingReservationController.php

@@ -265,7 +265,7 @@ class WashingReservationController extends Controller
     {
         WashingReservation::query()->where('time', '<', date('Y-m-d H:i:s', strtotime('-1 hour')))->delete();
 
-        $reservations = WashingReservation::query()->where("user_id", "=", auth()->user()->id)->orderBY('time' , 'asc')->paginate($request->query("limit", 20));
+        $reservations = WashingReservation::query()->join('washing_machines', 'washing_machines.id', '=', 'washing_reservations.machine_id')->join('locations', 'locations.id', '=', 'washing_machines.location_id')->where("user_id", "=", auth()->user()->id)->orderBY('time' , 'asc')->paginate($request->query("limit", 20));
 
         return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
     }

skolehjem/resources/views/app/washing-reservations/index.blade.php

@@ -15,7 +15,8 @@
                 <div class="reservation" style="margin: 0 32px 1.75rem 32px;">
                     <h3>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</h3>
                     <div class="row align-items-center">
-                        <span style="font-size: 4vw"><b>{{__('msg.tid')}}:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</span>
+                        <span style="font-size: 4vw; white-space: pre-line;"><b>{{__('msg.tid')}}:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}
+                            - {{ $reservation->name }}</span>
                         <form class="ml-auto" method="post" action="{{ route("washing-reservations.destroy", [ "washing_reservation" => $reservation ]) }}">
                             @csrf
                             @method("delete")