From 9db169aadb57e8570f9e3226c69c1dad11a9619f Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Mon, 17 Aug 2020 12:24:43 +0200
Subject: [PATCH] v0.10.0d - Rolled back menuplan to old system layout and
 functionality

---
 .../Http/Controllers/MenuPlanController.php   | 47 +++++++++++++++--
 skolehjem/app/MenuPlan.php                    |  2 +-
 .../2020_06_23_070657_create_menu_plans.php   |  8 +--
 .../resources/views/admin/index.blade.php     | 21 ++++++--
 .../views/admin/menuplans/create.blade.php    | 50 +++----------------
 .../views/admin/menuplans/edit.blade.php      | 38 +++-----------
 .../views/app/menuplans/index.blade.php       | 12 ++++-
 7 files changed, 92 insertions(+), 86 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php
index 308c98b..e312c59 100644
--- a/skolehjem/app/Http/Controllers/MenuPlanController.php
+++ b/skolehjem/app/Http/Controllers/MenuPlanController.php
@@ -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>';
diff --git a/skolehjem/app/MenuPlan.php b/skolehjem/app/MenuPlan.php
index ad1a5f8..77dc688 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', 'menu'
+        'week', 'monday', "tuesday", 'wednesday', 'thursday'
     ];
 }
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 06f78b5..ee6d5c9 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
@@ -17,9 +17,11 @@ class CreateMenuPlans extends Migration
     {
         Schema::create('menu_plans', function (Blueprint $table) {
             $table->id();
-            $table->string('week', 2);
-            $table->longText('menu');
-            $table->unique('week');
+            $table->integer('week')->unique();
+            $table->string('monday', 255);
+            $table->string('tuesday', 255);
+            $table->string('wednesday', 255);
+            $table->string('thursday', 255);
             $table->timestamps();
             //$table->text('description');
         });
diff --git a/skolehjem/resources/views/admin/index.blade.php b/skolehjem/resources/views/admin/index.blade.php
index dcc0e31..268e64d 100644
--- a/skolehjem/resources/views/admin/index.blade.php
+++ b/skolehjem/resources/views/admin/index.blade.php
@@ -107,7 +107,7 @@
                 </div>
             </div>
         @else
-            <p style="padding: 0 4px">Der er ingen aktiviteter</p>
+            <p style="padding: 0 4px; text-align: center">Der er ingen aktiviteter</p>
         @endif
     </div>
 
@@ -148,13 +148,26 @@
         <table class="tbl mt-1">
             <tr>
                 <th class="text-white text-center" style="background-color: lightseagreen;">Ugens Menuplan</th>
+                <th class="text-white text-center" style="background-color: lightseagreen;"></th> <!--Mabye need some fix :) -->
             </tr>
-        </table>
             @if(\App\MenuPlan::query()->where("week", "=", date('W'))->first() !== null)
-                {!! \App\MenuPlan::query()->where("week", "=", date('W'))->first()->menu !!}
+                {{-- \App\MenuPlan::query()->where("week", "=", date('W'))->first() --}}
+                <tr>
+                    <td><label>Mandag </label></td>
+                    <td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday }}</td>
+                </tr>
+                    <td><label>Tirsdag</label></td>
+                    <td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday }}</td>
+                </tr>
+                    <td><label>Onsdag</label></td>
+                    <td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday }}</td>
+                </tr>
+                    <td><label>Torsdag</label></td>
+                    <td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday }}</td>
+                </tr>
             @else
                 <p class="text-center">Der er ingen menuplan for denne uge</p>
             @endif
-
+        </table>
     </div>
 @endsection
diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php
index 3f3d16c..64f2600 100644
--- a/skolehjem/resources/views/admin/menuplans/create.blade.php
+++ b/skolehjem/resources/views/admin/menuplans/create.blade.php
@@ -29,20 +29,14 @@
         <label for="week">Uge nr.</label>
         <label hidden id="error" for="errormesseages">Menuplan findes allerede</label>
         <input type="number" name="week" id="week" min="1" max="53" placeholder="1" required>
-        <div id="editor">
-            <h2 class="ql-align-center"><strong>Mandag:</strong></h2>
-            <p class="ql-align-center">{Mandag}</p>
-            <p class="ql-align-center"><br></p>
-            <h2 class="ql-align-center"><strong>Tirsdag:</strong></h2>
-            <p class="ql-align-center">{Tirsdag}</p>
-            <p class="ql-align-center"><br></p>
-            <h2 class="ql-align-center"><strong>Onsdag:</strong></h2>
-            <p class="ql-align-center">{Onsdag}</p>
-            <p class="ql-align-center"><br></p>
-            <h2 class="ql-align-center"><strong>Torsdag:</strong></h2>
-            <p class="ql-align-center">{Torsdag}</p>
-        </div>
-        <textarea name="menu" class="d-none" id="hiddenArea"></textarea>
+        <label for="monday">Mandag:</label>
+        <input type="text" name="monday" id="monday" placeholder="Hawaii Pizza" required>
+        <label for="tuesday">Tirsdag:</label>
+        <input type="text" name="tuesday" id="tuesday" placeholder="Pasta Bolognese" required>
+        <label for="wednesday">Onsdag:</label>
+        <input type="text" name="wednesday" id="wednesday" placeholder="Pandekager" required>
+        <label for="thursday">Torsdag:</label>
+        <input type="text" name="thursday" id="thursday" placeholder="Bøf med løg" required>
         <label class="toggle">
             <input class="toggle__input" id="isNews" type="checkbox" name="newsoption" onclick="change()">
             <span class="toggle__label">
@@ -56,34 +50,6 @@
 
         <input type="submit" id="disable" class="btn btn-dark text-white" value="Opret Menuplan">
     </form>
-
-    <script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
-    <script>
-        var container = document.getElementById("editor");
-        var fullEditor = new Quill(container, {
-            modules: {
-                'toolbar': [
-                    [ 'bold', 'italic', 'underline', 'strike' ],
-                    [{ 'color': [] }],
-                    [{ 'script': 'super' }, { 'script': 'sub' }],
-                    [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
-                    [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
-                    [ {'direction': 'rtl'}, { 'align': [] }],
-                    [ 'link' ],
-                    [ 'clean' ]
-                ],
-            },
-            theme: 'snow'
-        });
-    </script>
-    <script>
-        var form = document.querySelector('form');
-        form.onsubmit = function() {
-            var myEditor = document.getElementById('editor');
-            var html = myEditor.children[0].innerHTML;
-            document.getElementById('hiddenArea').innerText = html;
-        }
-    </script>
 @endsection
 @section("scripts")
     <script>
diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php
index 04dea77..4d5e6d4 100644
--- a/skolehjem/resources/views/admin/menuplans/edit.blade.php
+++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php
@@ -30,8 +30,14 @@
         <label for="mandag">Uge:</label>
         <label hidden id="error" for="errormesseages">Menuplan findes allerede</label>
         <input type="number" name="week" id="week" min="1" max="53" value="{{ $menuplan->week }}" required>
-        <div id="editor">{!! $menuplan->menu !!}</div>
-        <textarea name="menu" class="d-none" id="hiddenArea"></textarea>
+        <label for="monday">Mandag:</label>
+        <input type="text" name="monday" id="monday" placeholder="Hawaii Pizza" required value="{{ $menuplan->monday }}">
+        <label for="tuesday">Tirsdag:</label>
+        <input type="text" name="tuesday" id="tuesday" placeholder="Pasta Bolognese" required value="{{ $menuplan->tuesday }}">
+        <label for="wednesday">Onsdag:</label>
+        <input type="text" name="wednesday" id="wednesday" placeholder="Pandekager" required value="{{ $menuplan->wednesday }}">
+        <label for="thursday">Torsdag:</label>
+        <input type="text" name="thursday" id="thursday" placeholder="Bøf med løg" required value="{{ $menuplan->thursday }}">
         <label class="toggle">
             <input class="toggle__input" type="checkbox" name="newsoption">
             <span class="toggle__label">
@@ -40,34 +46,6 @@
         </label>
         <input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger Menuplan">
     </form>
-
-    <script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
-    <script>
-        var container = document.getElementById("editor");
-        var fullEditor = new Quill(container, {
-            modules: {
-                'toolbar': [
-                    [ 'bold', 'italic', 'underline', 'strike' ],
-                    [{ 'color': [] }],
-                    [{ 'script': 'super' }, { 'script': 'sub' }],
-                    [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
-                    [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
-                    [ {'direction': 'rtl'}, { 'align': [] }],
-                    [ 'link' ],
-                    [ 'clean' ]
-                ],
-            },
-            theme: 'snow'
-        });
-    </script>
-    <script>
-        var form = document.querySelector('form');
-        form.onsubmit = function() {
-            var myEditor = document.getElementById('editor');
-            var html = myEditor.children[0].innerHTML;
-            document.getElementById('hiddenArea').innerText = html;
-        }
-    </script>
 @endsection
 @section("scripts")
     <script>
diff --git a/skolehjem/resources/views/app/menuplans/index.blade.php b/skolehjem/resources/views/app/menuplans/index.blade.php
index e007e5e..bd7e4f3 100644
--- a/skolehjem/resources/views/app/menuplans/index.blade.php
+++ b/skolehjem/resources/views/app/menuplans/index.blade.php
@@ -18,7 +18,17 @@
                         <span class="text-center text-white bold">{{ __('msg.ugestor') }}: {{$menuplan->week}}</span>
                     @endif
                     <div class="col w-100 mt-1">
-                        {!! $menuplan->menu !!}
+                        {!!                     '<h2 class="ql-align-center"><strong>Mandag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuplan->monday.'</p><p class="ql-align-center"></p>'.
+
+                    '<h2 class="ql-align-center"><strong>Tirsdag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuplan->tuesday.'</p><p class="ql-align-center"></p>'.
+
+                    '<h2 class="ql-align-center"><strong>Onsdag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuplan->wednesday.'</p><p class="ql-align-center"></p>'.
+
+                    '<h2 class="ql-align-center"><strong>Torsdag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuplan->thursday.'</p>' !!}
                     </div>
                 @endif
             @endforeach