From 103dfa68309c24ea4bb6ca0e3127aafaf29fdc9e Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 13:01:53 +0200 Subject: [PATCH 1/4] (Maybe) Fixed Menuplans --- .../views/admin/menuplans/delete.blade.php | 2 +- .../views/admin/menuplans/edit.blade.php | 2 +- .../views/admin/menuplans/show.blade.php | 4 +-- .../views/admin/menuplans/store.blade.php | 25 +++---------------- 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/skolehjem/resources/views/admin/menuplans/delete.blade.php b/skolehjem/resources/views/admin/menuplans/delete.blade.php index ca84f3d..a817ecd 100644 --- a/skolehjem/resources/views/admin/menuplans/delete.blade.php +++ b/skolehjem/resources/views/admin/menuplans/delete.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Fjern Menuplan / + Fjern Menuplan / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php index c8cab9a..7295eae 100644 --- a/skolehjem/resources/views/admin/menuplans/edit.blade.php +++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Rediger Menuplan / + Rediger Menuplan / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/menuplans/show.blade.php b/skolehjem/resources/views/admin/menuplans/show.blade.php index 1a08414..f6dc87a 100644 --- a/skolehjem/resources/views/admin/menuplans/show.blade.php +++ b/skolehjem/resources/views/admin/menuplans/show.blade.php @@ -2,11 +2,11 @@ @extends("admin.layout.header") @section("title") - Menuplan - Read + Menuplan - Vis @endsection @section("path") - Vis Menuplan / + Vis Menuplan / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/menuplans/store.blade.php b/skolehjem/resources/views/admin/menuplans/store.blade.php index e7c4ae2..1896239 100644 --- a/skolehjem/resources/views/admin/menuplans/store.blade.php +++ b/skolehjem/resources/views/admin/menuplans/store.blade.php @@ -2,32 +2,13 @@ @extends("admin.layout.header") @section("title") - Vaskemaskiner - Vis + Vaskemaskiner - Opret @endsection @section("path") - Vis Vaskemaskiner / + Opret Vaskemaskiner / @endsection @section("content") - - - - - - - - - - - - - - - - - - - -
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+ Vaskemaskinen blev (ikke) oprettet. @endsection From 1105233f7cacefd89da9d0b365c81ae380655df6 Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 13:14:08 +0200 Subject: [PATCH 2/4] Edited BookingController.php --- skolehjem/app/Http/Controllers/BookingController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/BookingController.php b/skolehjem/app/Http/Controllers/BookingController.php index a5bf5f8..3408353 100644 --- a/skolehjem/app/Http/Controllers/BookingController.php +++ b/skolehjem/app/Http/Controllers/BookingController.php @@ -72,7 +72,7 @@ class BookingController extends Controller */ public function edit($id) { - // + return Response::detect("bookings.show", [ "bookings" => $id]); } /** From a77b266999c3d44627c32b7bc47bfd11b18d048e Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 13:28:51 +0200 Subject: [PATCH 3/4] Removed: BookingController.php, Booking.php - Was already made being called washing-reservation Route in web.php (Bookings not needed) Fixed: WashingReservationController.php admin->layout->base (washing-reservations instead of booking) --- skolehjem/app/Booking.php | 10 -- .../Http/Controllers/BookingController.php | 100 ------------------ .../WashingReservationController.php | 14 +-- .../views/admin/layout/base.blade.php | 4 +- .../views/admin/root/index.blade.php | 6 +- .../resources/views/app/root/index.blade.php | 6 +- skolehjem/routes/web.php | 1 - 7 files changed, 15 insertions(+), 126 deletions(-) delete mode 100644 skolehjem/app/Booking.php delete mode 100644 skolehjem/app/Http/Controllers/BookingController.php diff --git a/skolehjem/app/Booking.php b/skolehjem/app/Booking.php deleted file mode 100644 index 663e86c..0000000 --- a/skolehjem/app/Booking.php +++ /dev/null @@ -1,10 +0,0 @@ -paginate($request->input("limit", 20)); - - return Response::detect("bookings.index", [ "bookings" => $booking]); - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - return Response::detect("bookings.create"); - } - - /** - * Store a newly created resource in storage. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response - */ - public function store(Request $request) - { - $requestBooking = $request->validate([ - "name_first" => "required|max:255", - "name_last" => "required|max:255", - "phone" => "required|unique:users", - "machine_choice" => "required|max:255", - ]); - - $booking = new Booking($requestBooking); - $booking->save(); - - return Response::detect("bookings.store"); - } - - /** - * Display the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function show($id) - { - return Response::detect("bookings.show", [ "bookings" => $id]); - } - - /** - * Show the form for editing the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function edit($id) - { - return Response::detect("bookings.show", [ "bookings" => $id]); - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response - */ - public function update(Request $request, $id) - { - // - } - - /** - * Remove the specified resource from storage. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function destroy($id) - { - // - } -} diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 6679e7d..34acf20 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -19,7 +19,7 @@ class WashingReservationController extends Controller { $reservations = WashingReservation::query()->paginate($request->query("page", 1)); - return Response::detect("washing-reservation.index"); + return Response::detect("washing-reservations.index", [ "reservations" => $reservations]); } /** @@ -29,7 +29,7 @@ class WashingReservationController extends Controller */ public function create() { - return Response::detect("washing-reservation.create"); + return Response::detect("washing-reservations.create"); } /** @@ -47,7 +47,7 @@ class WashingReservationController extends Controller $machineReservation = new WashingReservation($data); $machineReservation->save(); - return Response::detect("washing-reservation.store"); + return Response::detect("washing-reservations.store"); } /** @@ -60,7 +60,7 @@ class WashingReservationController extends Controller { $machineReservation = WashingReservation::find($id); - return Response::detect("washing-reservation.show", [ + return Response::detect("washing-reservations.show", [ "machineReservation" => $machineReservation ]); } @@ -73,7 +73,7 @@ class WashingReservationController extends Controller */ public function edit($id) { - return Response::detect("washing-reservation.edit"); + return Response::detect("washing-reservations.edit"); } /** @@ -95,7 +95,7 @@ class WashingReservationController extends Controller $machineReservation->save(); - return Response::detect("washing-reservation.edit", [ + return Response::detect("washing-reservations.edit", [ "washingReservation" => $machineReservation ]); } @@ -111,6 +111,6 @@ class WashingReservationController extends Controller $machineReservation = WashingReservation::find($id); $machineReservation->delete(); - return Response::detect("washing-reservation.delete"); + return Response::detect("washing-reservations.delete"); } } diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 39e978b..7ed0dfa 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -31,10 +31,10 @@
diff --git a/skolehjem/resources/views/admin/root/index.blade.php b/skolehjem/resources/views/admin/root/index.blade.php index 4738b86..2682a95 100644 --- a/skolehjem/resources/views/admin/root/index.blade.php +++ b/skolehjem/resources/views/admin/root/index.blade.php @@ -13,7 +13,7 @@ {{--@extends("app.vagttelefons.index")--}} {{--Booking Liste--}} -{{--@extends("app.bookings.index")--}} +{{--@extends("app.washing-reservations.index")--}} {{--Menuplan--}} {{--@extends("app.menuplans.index")--}} @@ -44,10 +44,10 @@ {{--@extends("admin.menuplans.update")--}} {{--Create booking--}} -{{--@extends("admin.bookings.create")--}} +{{--@extends("admin.washing-reservations.create")--}} {{--Read booking--}} -{{--@extends("admin.bookings.show")--}} +{{--@extends("admin.washing-reservations.show")--}} {{--Create washing-machine--}} {{--@extends("admin.washing-machines.create")--}} diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index 4738b86..2682a95 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -13,7 +13,7 @@ {{--@extends("app.vagttelefons.index")--}} {{--Booking Liste--}} -{{--@extends("app.bookings.index")--}} +{{--@extends("app.washing-reservations.index")--}} {{--Menuplan--}} {{--@extends("app.menuplans.index")--}} @@ -44,10 +44,10 @@ {{--@extends("admin.menuplans.update")--}} {{--Create booking--}} -{{--@extends("admin.bookings.create")--}} +{{--@extends("admin.washing-reservations.create")--}} {{--Read booking--}} -{{--@extends("admin.bookings.show")--}} +{{--@extends("admin.washing-reservations.show")--}} {{--Create washing-machine--}} {{--@extends("admin.washing-machines.create")--}} diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 7863c02..cacec32 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -32,4 +32,3 @@ Route::resource("washing-machines", "WashingMachineController"); Route::resource("washing-reservations", "WashingReservationController"); Route::resource("feedbacks", "FeedbackController"); Route::resource("external-links", "ExternalLinkController"); -Route::resource("bookings", "BookingController"); From 65ec87af511068d0e9bbc70fa88a349b0062032e Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 13:30:58 +0200 Subject: [PATCH 4/4] Added washing-reservations --- .../washing-reservations/create.blade.php | 27 ++++++++++++++ .../washing-reservations/delete.blade.php | 13 +++++++ .../admin/washing-reservations/edit.blade.php | 28 ++++++++++++++ .../washing-reservations/index.blade.php | 37 +++++++++++++++++++ .../admin/washing-reservations/show.blade.php | 33 +++++++++++++++++ .../washing-reservations/store.blade.php | 14 +++++++ .../washing-reservations/update.blade.php | 14 +++++++ 7 files changed, 166 insertions(+) create mode 100644 skolehjem/resources/views/admin/washing-reservations/create.blade.php create mode 100644 skolehjem/resources/views/admin/washing-reservations/delete.blade.php create mode 100644 skolehjem/resources/views/admin/washing-reservations/edit.blade.php create mode 100644 skolehjem/resources/views/admin/washing-reservations/index.blade.php create mode 100644 skolehjem/resources/views/admin/washing-reservations/show.blade.php create mode 100644 skolehjem/resources/views/admin/washing-reservations/store.blade.php create mode 100644 skolehjem/resources/views/admin/washing-reservations/update.blade.php diff --git a/skolehjem/resources/views/admin/washing-reservations/create.blade.php b/skolehjem/resources/views/admin/washing-reservations/create.blade.php new file mode 100644 index 0000000..5460e31 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/create.blade.php @@ -0,0 +1,27 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Opret +@endsection + +@section("path") + Opret Booking / +@endsection + +@section("content") +

Opret Booking:

+
+ @csrf + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/delete.blade.php b/skolehjem/resources/views/admin/washing-reservations/delete.blade.php new file mode 100644 index 0000000..faf2283 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/delete.blade.php @@ -0,0 +1,13 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Fjern +@endsection + +@section("path") + Fjern Booking / +@endsection + +@section("content") +@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/edit.blade.php b/skolehjem/resources/views/admin/washing-reservations/edit.blade.php new file mode 100644 index 0000000..036dbf0 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/edit.blade.php @@ -0,0 +1,28 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Rediger +@endsection + +@section("path") + Rediger Booking / +@endsection + +@section("content") +

Rediger Booking:

+
+ @csrf + + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php new file mode 100644 index 0000000..c298261 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -0,0 +1,37 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Vis +@endsection + +@section("path") + Vis Booking / +@endsection + +@section("content") + + + + + + + + + + + @foreach($reservations as $reservation) + + + + + + + + + + @endforeach +
IDFornavnEfternavnTlf nrVaskemaskineUpdateDelete
{ID}{Fornavn}{Efternavn}{Tlf Nr}{Vaskemaskine Nr.}UpdateDelete
+ + {{ $reservations->links() }} +@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/show.blade.php b/skolehjem/resources/views/admin/washing-reservations/show.blade.php new file mode 100644 index 0000000..6dea5a8 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/show.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Vis +@endsection + +@section("path") + Vis Booking / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnTelefon Nr.VaskemaskineUpdateDelete
IDFornavnEfternavnTelefon Nr.VaskemaskineUpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/store.blade.php b/skolehjem/resources/views/admin/washing-reservations/store.blade.php new file mode 100644 index 0000000..616c3e8 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/store.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Opret +@endsection + +@section("path") + Opret Booking / +@endsection + +@section("content") + Booking blev (ikke) oprettet. +@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/update.blade.php b/skolehjem/resources/views/admin/washing-reservations/update.blade.php new file mode 100644 index 0000000..9dd8408 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/update.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Rediger +@endsection + +@section("path") + Rediger Booking / +@endsection + +@section("content") + Din booking blev (ikke) redigeret. +@endsection