vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Session message on fail - Menuplans

This commit is contained in:
Anders 2020-08-04 10:11:18 +02:00
parent e8b0f68e65
commit 9d44432fc2
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
skolehjem/app/Http/Controllers/MenuPlanController.php
View File

@ -64,13 +64,15 @@ class MenuPlanController extends Controller
]); ]);
$menuPlans = new MenuPlan($requestMenuPlanCreate); $menuPlans = new MenuPlan($requestMenuPlanCreate);
$saved = $menuPlans->save();
if(!$saved){ $allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->get();
return Response::detect("menuplans.store");
}else{ if(count($allMenuPlans) > 0)
return redirect()->route("menu-plans.index")->with('WeekExists', '<p><b>Der findes allerede en menuplan for den uge!</b></p>');
else {
$menuPlans->save();
$menuPlans = MenuPlan::query()->paginate($request->input("limit", 20)); $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 //FORCED UPDATE
$menuplan = MenuPlan::find($id); $menuplan = MenuPlan::find($id);
$menuplan->update($data);
$saved = $menuplan->save();
if(!$saved){ $allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->where('id', '!=', $id)->get();
return Response::detect("menuplans.update", [ "menuplan" => $menuplan ]);
if(count($allMenuPlans) > 0){
return redirect()->route("menu-plans.index")->with('WeekExists', '<p><b>Der findes allerede en menuplan for den uge!</b></p>');
}else{ }else{
$menuplan->update($data);
$menuplan->save();
$menuPlans = MenuPlan::query()->paginate($request->input("limit", 20)); $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
return Response::detect("menuplans.index", ['menuPlans' => $menuPlans]); return redirect()->route("menu-plans.index", ['menuPlans' => $menuPlans]);
} }
} }

3
skolehjem/resources/views/admin/menuplans/index.blade.php
View File

@ -18,8 +18,9 @@
@csrf @csrf
<input type="number" class="form-controller" id="search" name="search" pattern="[0-9]{2}" placeholder="Søg efter ugenummer"></input> <input type="number" class="form-controller" id="search" name="search" pattern="[0-9]{2}" placeholder="Søg efter ugenummer"></input>
</form> </form>
</div> </div>
{!! session()->get('WeekExists') !!}
<table class="tbl mt-2"> <table class="tbl mt-2">
<tr> <tr>
<th>Uge</th> <th>Uge</th>