From 66ddd329446b6e8062f6e8b4bf5c2f27d0b549b5 Mon Sep 17 00:00:00 2001 From: Sebastian <seba4928@edu.sde.dk> Date: Mon, 29 Jun 2020 08:31:36 +0200 Subject: [PATCH] Working on MenuPlanController.php --- .../Http/Controllers/MenuPlanController.php | 22 +++++++++---------- .../views/admin/menuplans/edit.blade.php | 20 +++++++++-------- .../views/admin/menuplans/index.blade.php | 2 +- .../views/admin/menuplans/update.blade.php | 4 ++-- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 4a5e0a9..9a7944a 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -75,8 +75,8 @@ class MenuPlanController extends Controller */ public function edit($id) { - $editLink = MenuPlan::find($id); - return Response::detect("menuplans.edit", ["menu-plans" => $editLink]); + $menuplan = MenuPlan::find($id); + return Response::detect("menuplans.edit", ["menuplan" => $menuplan]); } /** @@ -88,15 +88,14 @@ class MenuPlanController extends Controller */ public function update(Request $request, $id) { - $data = $request->validate([ - "name" => "", - "link" => "" - ]); + $data = $request->all(); - $id->update($data); - $id->save(); - return Response::detect("menuplans.update"); + $menuplan = MenuPlan::find($id); + $menuplan->update($data); + $menuplan->save(); + + return Response::detect("menuplans.update", [ "menuplan" => $menuplan ]); } /** @@ -107,7 +106,8 @@ class MenuPlanController extends Controller */ public function destroy($id) { - $id->delete(); - return Response::detect("menuplans.destroy"); + $menuplan = MenuPlan::find($id); + $menuplan->delete(); + return redirect()->route("menu-plans.index"); } } diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php index 7295eae..45a90a3 100644 --- a/skolehjem/resources/views/admin/menuplans/edit.blade.php +++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php @@ -6,26 +6,28 @@ @endsection @section("path") - <a href="{{ route('menu-plans.edit') }}" class="text-white">Rediger Menuplan</a> / + <a href="{{ route('menu-plans.edit', [ "menu_plan" => $menuplan ]) }}" class="text-white">Rediger Menuplan</a> / @endsection @section("content") <h1>Rediger Menuplan:</h1> - <form method="post" action=""> + <form method="post" action="{{ route("menu-plans.update", [ "menu_plan" => $menuplan ]) }}"> + @csrf + @method("PUT") <label for="mandag">Mandag:</label> - <input type="text" name="mandag" id="mandag" value="{Mandag}" required> + <input type="text" name="mandag" id="mandag" value="{{ $menuplan->monday }}" required> <label for="tirsdag">Tirsdag:</label> - <input type="text" name="tirsdag" id="tirsdag" value="{Tirsdag}" required> + <input type="text" name="tirsdag" id="tirsdag" value="{{ $menuplan->tuesday }}" required> <label for="onsdag">Onsdag:</label> - <input type="text" name="onsdag" id="onsdag" value="{Onsdag}" required> + <input type="text" name="onsdag" id="onsdag" value="{{ $menuplan->wednesday }}" required> <label for="torsdag">Torsdag:</label> - <input type="text" name="torsdag" id="torsdag" value="{Torsdag}" required> + <input type="text" name="torsdag" id="torsdag" value="{{ $menuplan->thursday }}" required> <label for="fredag">Fredag:</label> - <input type="text" name="fredag" id="fredag" value="{Fredag}" required> + <input type="text" name="fredag" id="fredag" value="{{ $menuplan->friday }}" required> <label for="lørdag">Lørdag:</label> - <input type="text" name="lørdag" id="lørdag" value="{Lørdag}" required> + <input type="text" name="lørdag" id="lørdag" value="{{ $menuplan->saturday }}" required> <label for="søndag">Søndag:</label> - <input type="text" name="søndag" id="søndag" value="{Søndag}" required> + <input type="text" name="søndag" id="søndag" value="{{ $menuplan->sunday }}" required> <input type="submit" class="btn btn-dark text-white" value="Opret Menuplan"> </form> diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index 52c5e54..5c006ff 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -32,7 +32,7 @@ <td>{{$menuplan->saturday}}</td> <td>{{$menuplan->sunday}}</td> <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td> - <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td> + <td><a href="{{ route("menu-plans.destroy", [ "menu_plan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td> </tr> @endforeach </table> diff --git a/skolehjem/resources/views/admin/menuplans/update.blade.php b/skolehjem/resources/views/admin/menuplans/update.blade.php index ae46029..8c5ecc9 100644 --- a/skolehjem/resources/views/admin/menuplans/update.blade.php +++ b/skolehjem/resources/views/admin/menuplans/update.blade.php @@ -6,9 +6,9 @@ @endsection @section("path") - <a href="{{ route('menuplans.edit') }}" class="text-white">Rediger Menuplan</a> / + <a href="{{ route('menu-plans.edit', [ "menu_plan" => $menuplan ]) }}" class="text-white">Rediger Menuplan</a> / @endsection @section("content") - Din menuplan blev (ikke) redigeret. + Din menuplan blev redigeret. @endsection