From 01f9502653a74942b368f7e6a839d147da43e83a Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 3 Aug 2020 13:44:53 +0200 Subject: [PATCH 01/15] Removes - Console.log in feedback(s) --- skolehjem/resources/views/admin/feedbacks/index.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/skolehjem/resources/views/admin/feedbacks/index.blade.php b/skolehjem/resources/views/admin/feedbacks/index.blade.php index 3ec8442..ec85be1 100644 --- a/skolehjem/resources/views/admin/feedbacks/index.blade.php +++ b/skolehjem/resources/views/admin/feedbacks/index.blade.php @@ -47,7 +47,6 @@ url: '{{route('feedbacks.search')}}', data: {'option':$value}, success:function (data) { - console.log($value); $('tbody').html(data); }, error:function (data) { From 093a94498088ce96e9ffd1e428df7cd78898108c Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 3 Aug 2020 13:50:27 +0200 Subject: [PATCH 02/15] Fix --- .../app/Http/Controllers/WashingReservationController.php | 2 -- .../resources/views/admin/washing-reservations/index.blade.php | 3 --- 2 files changed, 5 deletions(-) diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index a38660c..0a775de 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -188,7 +188,6 @@ class WashingReservationController extends Controller "Vaskemaskine". "Tidspunkt". "Bruger". - "\"Update\"". "\"Delete\"". ""; @@ -219,7 +218,6 @@ class WashingReservationController extends Controller '' . WashingMachine::query()->find($user->machine_id)->name . ''. '' . $user->time . ''. '' . ucfirst(User::query()->find($user->user_id)->name_first) . ' ' . ucfirst(User::query()->find($user->user_id)->name_last) . ''. - ' $user->id ]) . '">Update'. '
$user->id ]). '" class="w-100 nostyle">'. csrf_field(). method_field("delete"). diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index 073bbab..47886c7 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -33,7 +33,6 @@ Vaskemaskine Tidspunkt Bruger - Update Delete @foreach($reservations as $reservation) @@ -41,7 +40,6 @@ {{ \App\WashingMachine::query()->find($reservation->machine_id)->name }} {{ $reservation->time }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_first) }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_last) }} - Update @csrf @method("delete") @@ -65,7 +63,6 @@ url: '{{route('washing-reservations.search')}}', data: {'search':$value, 'isCheck': $checkboxValue}, success:function (data) { - console.log($checkboxValue); $('tbody').html(data); }, error:function (data) { From 898228637cfe497652acd24788d8df7436a2b2fd Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 3 Aug 2020 14:26:58 +0200 Subject: [PATCH 03/15] Fix --- .../Controllers/WashingReservationController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 0a775de..249e57a 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -20,7 +20,7 @@ class WashingReservationController extends Controller { $this->middleware([ "auth" ]); - $this->middleware([ "check.auth:washing.machine.reservation.list" ])->only("index"); + $this->middleware([ "check.auth:washing.machine.reservation.list" ])->only(["index", "appindex"]); $this->middleware([ "check.auth:washing.machine.reservation.show" ])->only("show"); $this->middleware([ "check.auth:washing.machine.reservation.create" ])->only("create", "store"); $this->middleware([ "check.auth:washing.machine.reservation.edit" ])->only("edit", "update"); @@ -180,8 +180,6 @@ class WashingReservationController extends Controller } } - - function search(Request $request){ if($request->ajax()){ $output = "". @@ -240,9 +238,11 @@ class WashingReservationController extends Controller } } + public function appindex(Request $request) + { + $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]); + } } From 0e9c054a12e6b897a2d3e44b339b6eda860b2d9c Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 3 Aug 2020 14:27:40 +0200 Subject: [PATCH 04/15] Fix --- skolehjem/app/Http/Controllers/WashingReservationController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 249e57a..38d1d56 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -78,7 +78,7 @@ class WashingReservationController extends Controller } else { $reservations = WashingReservation::query()->paginate($request->input("limit", 20)); - return redirect()->route('washing-reservations.index', ["reservations" => $reservations]); + return redirect()->route('washing-reservations.appindex', ["reservations" => $reservations]); } } From 20d73c047ff2a82ba0d7457ed1a23361cf1f38c1 Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 3 Aug 2020 14:47:06 +0200 Subject: [PATCH 05/15] Fixed date and stuff --- skolehjem/resources/views/admin/events/create.blade.php | 2 +- skolehjem/resources/views/admin/events/edit.blade.php | 2 +- skolehjem/resources/views/admin/events/index.blade.php | 2 +- .../resources/views/admin/washing-reservations/index.blade.php | 2 +- skolehjem/resources/views/app/events/index.blade.php | 2 +- skolehjem/resources/views/app/events/yourevents.blade.php | 2 +- skolehjem/resources/views/app/users/index.blade.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index 4aaf61f..78c2df2 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -18,7 +18,7 @@ - + diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php index 8356c41..0234b54 100644 --- a/skolehjem/resources/views/admin/events/edit.blade.php +++ b/skolehjem/resources/views/admin/events/edit.blade.php @@ -19,7 +19,7 @@ - + diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 02a44f3..414eec6 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -32,7 +32,7 @@ {{ $event->name }} {{ $event->description }} - {{ $event->date }} + {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }} $event ]) }}">Update $event ]) }}">Update
$event ]) }}" class="w-100 nostyle"> diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index 47886c7..b44879d 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -38,7 +38,7 @@ @foreach($reservations as $reservation) {{ \App\WashingMachine::query()->find($reservation->machine_id)->name }} - {{ $reservation->time }} + {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_first) }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_last) }} @csrf diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index a39a82f..b38e477 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -10,7 +10,7 @@ @foreach($events as $event)

{{$event->name}}

-

{{$event->date}}

+

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}

{{$event->description}}

{!! session()->get('error#' . $event->id) !!} diff --git a/skolehjem/resources/views/app/events/yourevents.blade.php b/skolehjem/resources/views/app/events/yourevents.blade.php index 32be557..ca5fb46 100644 --- a/skolehjem/resources/views/app/events/yourevents.blade.php +++ b/skolehjem/resources/views/app/events/yourevents.blade.php @@ -13,7 +13,7 @@ @csrf @method("delete")

{{$userevent->name}}

-

{{$userevent->date}}

+

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}

{{$userevent->description}}

diff --git a/skolehjem/resources/views/app/users/index.blade.php b/skolehjem/resources/views/app/users/index.blade.php index 7e5ff8a..0bd82b7 100644 --- a/skolehjem/resources/views/app/users/index.blade.php +++ b/skolehjem/resources/views/app/users/index.blade.php @@ -5,7 +5,7 @@
Menuplan Aktiviteter - Reservationer + Reservationer Kontoret Vagttelefon
From 4fe015a74ce2211c213828ec3c7de95758fb49b0 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 3 Aug 2020 15:02:26 +0200 Subject: [PATCH 06/15] Fix --- .../views/app/vagttelefons/index.blade.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/skolehjem/resources/views/app/vagttelefons/index.blade.php b/skolehjem/resources/views/app/vagttelefons/index.blade.php index 493b44c..87a24c7 100644 --- a/skolehjem/resources/views/app/vagttelefons/index.blade.php +++ b/skolehjem/resources/views/app/vagttelefons/index.blade.php @@ -9,7 +9,7 @@

Vagttelefon

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.