diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 7b8bf83..f10fc7b 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -64,13 +64,15 @@ class MenuPlanController extends Controller ]); $menuPlans = new MenuPlan($requestMenuPlanCreate); - $saved = $menuPlans->save(); - if(!$saved){ - return Response::detect("menuplans.store"); - }else{ + $allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->get(); + + if(count($allMenuPlans) > 0) + return redirect()->route("menu-plans.index")->with('WeekExists', '

Der findes allerede en menuplan for den uge!

'); + else { + $menuPlans->save(); $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20)); - return Response::detect("menuplans.index", ['menuPlans' => $menuPlans]); + return redirect()->route("menu-plans.index", ['menuPlans' => $menuPlans]); } } @@ -110,14 +112,17 @@ class MenuPlanController extends Controller //FORCED UPDATE $menuplan = MenuPlan::find($id); - $menuplan->update($data); - $saved = $menuplan->save(); - if(!$saved){ - return Response::detect("menuplans.update", [ "menuplan" => $menuplan ]); + $allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->where('id', '!=', $id)->get(); + + if(count($allMenuPlans) > 0){ + return redirect()->route("menu-plans.index")->with('WeekExists', '

Der findes allerede en menuplan for den uge!

'); }else{ + $menuplan->update($data); + $menuplan->save(); + $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20)); - return Response::detect("menuplans.index", ['menuPlans' => $menuPlans]); + return redirect()->route("menu-plans.index", ['menuPlans' => $menuPlans]); } } diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index 83e091a..dfab8fe 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -18,8 +18,9 @@ @csrf - + {!! session()->get('WeekExists') !!} +
Uge