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

v0.10.0d - Rolled back menuplan to old system layout and functionality

Browse Source
This commit is contained in:
Neerholt
2020-08-17 12:24:43 +02:00
parent 773655c294
commit 9db169aadb
7 changed files with 92 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/MenuPlanController.php
+42 -5
View File
@@ -60,8 +60,11 @@ class MenuPlanController extends Controller
public function store(Request $request)
{
$requestMenuPlanCreate = $request->validate([
"week" => "required|max:2",
"menu" => "required",
"week" => "required|max:255",
"monday" => "required|max:255",
"tuesday" => "required|max:255",
"wednesday" => "required|max:255",
"thursday" => "required|max:255",
]);
$menuPlan = new MenuPlan($requestMenuPlanCreate);
@@ -74,12 +77,25 @@ class MenuPlanController extends Controller
$menuPlan->save();
$menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
$menuArray = [];
if($request->newsoption == true){
$news = new News();
$news->name = "Ny menuplan";
$news->subname = "Uge " . $menuPlan->week;
$news->content = $menuPlan->menu;
$news->content =
'<h2 class="ql-align-center"><strong>Mandag:</strong></h2>'.
'<p class="ql-align-center">'.$menuPlan->monday.'</p><p class="ql-align-center"><br></p>'.
'<h2 class="ql-align-center"><strong>Tirsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuPlan->tuesday.'</p><p class="ql-align-center"><br></p>'.
'<h2 class="ql-align-center"><strong>Onsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuPlan->wednesday.'</p><p class="ql-align-center"><br></p>'.
'<h2 class="ql-align-center"><strong>Torsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuPlan->thursday.'</p>';
$news->type_id = '2';
$news->arrangement_id = $menuPlan->id;
@@ -148,7 +164,18 @@ class MenuPlanController extends Controller
$news->subname = "Uge " . $menuplan->week;
$news->arrangement_id = $menuplan->id;
$news->type_id = '2';
$news->content = $menuplan->menu;
$news->content =
'<h2 class="ql-align-center"><strong>Mandag:</strong></h2>'.
'<p class="ql-align-center">'.$menuplan->monday.'</p><p class="ql-align-center"><br></p>'.
'<h2 class="ql-align-center"><strong>Tirsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuplan->tuesday.'</p><p class="ql-align-center"><br></p>'.
'<h2 class="ql-align-center"><strong>Onsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuplan->wednesday.'</p><p class="ql-align-center"><br></p>'.
'<h2 class="ql-align-center"><strong>Torsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuplan->thursday.'</p>';
NewsController::storeAndGet($news);
@@ -193,7 +220,17 @@ class MenuPlanController extends Controller
'<h1 style="font-size: 28px; text-align: center; color: white;">Uge '. $menuPlan->week. '</h1>'.
'</div>'.
'<div style="text-align: center">'.
$menuPlan->menu.
'<h2 class="ql-align-center"><strong>Mandag:</strong></h2>'.
'<p class="ql-align-center">'.$menuPlan->monday.'</p><p class="ql-align-center"><br></p>'.
'<h2 class="ql-align-center"><strong>Tirsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuPlan->tuesday.'</p><p class="ql-align-center"><br></p>'.
'<h2 class="ql-align-center"><strong>Onsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuPlan->wednesday.'</p><p class="ql-align-center"><br></p>'.
'<h2 class="ql-align-center"><strong>Torsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuPlan->thursday.'</p>';
'</div>'.
'</body>'.
'</html>';
skolehjem/app/MenuPlan.php
+1 -1
View File
@@ -15,6 +15,6 @@ class MenuPlan extends Model
{
//protected variable which contains name of database field(s) to be filled.
protected $fillable = [
'week', 'menu'
'week', 'monday', "tuesday", 'wednesday', 'thursday'
];
}