diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 27fe206..ed02a45 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -33,7 +33,12 @@ class EventController extends Controller */ public function index(Request $request) { - DB::table('events')->where('date', '<=', date('Y-m-d H:i', strtotime('-1 day')))->delete(); + DB::table('user_events') + ->where('event_id') + ->delete(); + DB::table('events') + ->where('events.date', '<=', date('Y-m-d H:i', strtotime('-1 day'))) + ->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 a2fca22..e187c80 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -15,6 +15,8 @@ use App\WashingReservation; use Illuminate\Support\Facades\DB; use Illuminate\View\View; +date_default_timezone_set('Europe/Copenhagen'); + class WashingReservationController extends Controller { public function __construct() @@ -37,6 +39,8 @@ class WashingReservationController extends Controller */ public function index(Request $request) { + WashingReservation::query()->where('time', '<', date('Y-m-d H:i:s', strtotime('-1 hour')))->delete(); + $reservations = WashingReservation::query()->orderBY('time' , 'asc')->paginate($request->query("limit", 20)); return Response::detect("washing-reservations.index", [ "reservations" => $reservations]); @@ -260,6 +264,8 @@ class WashingReservationController extends Controller public function appindex(Request $request) { + 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)); return Response::detect("washing-reservations.index", [ "reservations" => $reservations]); diff --git a/skolehjem/resources/views/admin/locations/show.blade.php b/skolehjem/resources/views/admin/locations/show.blade.php index 43c8a97..d32860c 100644 --- a/skolehjem/resources/views/admin/locations/show.blade.php +++ b/skolehjem/resources/views/admin/locations/show.blade.php @@ -18,23 +18,23 @@ $i = 1; ?>