From bccd00683fc5db3447c2c4749e782c0ce6d0188d Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Mon, 31 Aug 2020 14:04:02 +0200
Subject: [PATCH] v0.10.19 - Added building name to reservation site Fixed
 $eventsToDelete in EventController.php

---
 .../app/Http/Controllers/EventController.php      | 15 +++++++--------
 .../Controllers/WashingReservationController.php  |  2 +-
 .../app/washing-reservations/index.blade.php      |  3 ++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php
index 267331f..c7e7bd7 100644
--- a/skolehjem/app/Http/Controllers/EventController.php
+++ b/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')
-            ->where('events.date', '<=', date('Y-m-d H:i', strtotime('-1 day')))->get();
+        $eventsToDelete = Event::query()->get();
 
-        foreach ($eventsToDelete as $event)
-        {
-            DB::table('user_events')
-                ->where('event_id', '=', $event->id)
-                ->delete();
+        foreach ($eventsToDelete as $event) {
+            if (date('Y-m-d H:i', strtotime('-1 day')) >= date('Y-m-d H:i', strtotime($event->date))) {
+                UserEvent::query()->where('event_id', '=', $event->id)->delete();
 
-            $event->delete();
+                $event->delete();
+            }
         }
 
         $events = Event::query()->orderBY('date' , 'asc')->paginate($request->input("limit", 20));
diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php
index 17e768b..37ab1b3 100644
--- a/skolehjem/app/Http/Controllers/WashingReservationController.php
+++ b/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]);
     }
diff --git a/skolehjem/resources/views/app/washing-reservations/index.blade.php b/skolehjem/resources/views/app/washing-reservations/index.blade.php
index a40b800..63890c3 100644
--- a/skolehjem/resources/views/app/washing-reservations/index.blade.php
+++ b/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")