diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 5262b5f..492c433 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -59,10 +59,7 @@ class MenuPlanController extends Controller { $requestMenuPlanCreate = $request->validate([ "week" => "required|max:2", - "monday" => "required|max:255", - "tuesday" => "required|max:255", - "wednesday" => "required|max:255", - "thursday" => "required|max:255" + "menu" => "required", ]); $menuPlan = new MenuPlan($requestMenuPlanCreate); @@ -79,7 +76,7 @@ class MenuPlanController extends Controller $news = new News(); $news->name = "Ny menuplan Uge " . $menuPlan->week; - $news->content = ""; + $news->content = $menuPlan->menu; $news->save(); } @@ -139,7 +136,7 @@ class MenuPlanController extends Controller $news = new News(); $news->name = "Opdateret menuplan Uge " . $menuplan->week; - $news->content = ""; + $news->content = $menuplan->menu; $news->save(); } diff --git a/skolehjem/app/MenuPlan.php b/skolehjem/app/MenuPlan.php index 77dc688..ad1a5f8 100644 --- a/skolehjem/app/MenuPlan.php +++ b/skolehjem/app/MenuPlan.php @@ -15,6 +15,6 @@ class MenuPlan extends Model { //protected variable which contains name of database field(s) to be filled. protected $fillable = [ - 'week', 'monday', "tuesday", 'wednesday', 'thursday' + 'week', 'menu' ]; } diff --git a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php index 2a7fdc3..06f78b5 100644 --- a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php +++ b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php @@ -18,10 +18,7 @@ class CreateMenuPlans extends Migration Schema::create('menu_plans', function (Blueprint $table) { $table->id(); $table->string('week', 2); - $table->string('monday', 255); - $table->string('tuesday', 255); - $table->string('wednesday', 255); - $table->string('thursday', 255); + $table->longText('menu'); $table->unique('week'); $table->timestamps(); //$table->text('description'); diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php index 9bfdf5e..446a1a4 100644 --- a/skolehjem/resources/views/admin/menuplans/create.blade.php +++ b/skolehjem/resources/views/admin/menuplans/create.blade.php @@ -17,14 +17,26 @@ .toggle__text::before { border-color: black; } + + .tox-notification { + display: none !important; + } + + .tox { + border-radius: 4px !important; + margin-bottom: 1rem; + } - +

Opret Menuplan:

@csrf - +