From 394b8551c8e1cefca6e85817253699ddf745a25f Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Tue, 30 Jun 2020 12:38:02 +0200
Subject: [PATCH] Edited menuplan - Can now be seen by users

---
 .../Http/Controllers/MenuPlanController.php   |  1 +
 skolehjem/app/MenuPlan.php                    |  2 +-
 .../2020_06_23_070657_create_menu_plans.php   |  1 +
 .../views/admin/menuplans/create.blade.php    |  2 +
 .../views/admin/menuplans/edit.blade.php      |  4 +-
 .../views/admin/menuplans/index.blade.php     |  2 +
 .../views/app/menuplans/index.blade.php       | 55 ++++++++++++-------
 7 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php
index 9a89fe6..15cd47e 100644
--- a/skolehjem/app/Http/Controllers/MenuPlanController.php
+++ b/skolehjem/app/Http/Controllers/MenuPlanController.php
@@ -41,6 +41,7 @@ class MenuPlanController extends Controller
     public function store(Request $request)
     {
         $requestMenuPlanCreate = $request->validate([
+            "week" => "required|max:2",
             "monday" => "required|max:255",
             "tuesday" => "required|max:255",
             "wednesday" => "required|max:255",
diff --git a/skolehjem/app/MenuPlan.php b/skolehjem/app/MenuPlan.php
index cce1492..cef6c24 100644
--- a/skolehjem/app/MenuPlan.php
+++ b/skolehjem/app/MenuPlan.php
@@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
 class MenuPlan extends Model
 {
     protected $fillable = [
-        'monday', "tuesday", 'wednesday', 'thursday', "friday", "saturday", "sunday"
+        '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 254328c..e60532f 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
@@ -15,6 +15,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);
diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php
index 925a315..254f76e 100644
--- a/skolehjem/resources/views/admin/menuplans/create.blade.php
+++ b/skolehjem/resources/views/admin/menuplans/create.blade.php
@@ -13,6 +13,8 @@
     <h1>Opret Menuplan:</h1>
     <form action="{{ action('MenuPlanController@store') }}" method="post">
         @csrf
+        <label for="week">Uge nr.</label>
+        <input type="number" name="week" id="week" min="1" max="53" placeholder="1" required>
         <label for="monday">Mandag:</label>
         <input type="text" name="monday" id="monday" placeholder="Hawaii Pizza" required>
         <label for="tuesday">Tirsdag:</label>
diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php
index a8a8cc3..2cd747a 100644
--- a/skolehjem/resources/views/admin/menuplans/edit.blade.php
+++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php
@@ -14,6 +14,8 @@
     <form method="post" action="{{ route("menu-plans.update", [ "menu_plan" => $menuplan ]) }}">
         @csrf
         @method("PUT")
+        <label for="mandag">Uge:</label>
+        <input type="number" name="week" id="week" min="1" max="53" value="{{ $menuplan->week }}" required>
         <label for="mandag">Mandag:</label>
         <input type="text" name="monday" id="mandag" value="{{ $menuplan->monday }}" required>
         <label for="tirsdag">Tirsdag:</label>
@@ -23,6 +25,6 @@
         <label for="torsdag">Torsdag:</label>
         <input type="text" name="thursday" id="torsdag" value="{{ $menuplan->thursday }}" required>
 
-        <input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
+        <input type="submit" class="btn btn-dark text-white" value="Rediger Menuplan">
     </form>
 @endsection
diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php
index 1ddbfbb..f5ceebf 100644
--- a/skolehjem/resources/views/admin/menuplans/index.blade.php
+++ b/skolehjem/resources/views/admin/menuplans/index.blade.php
@@ -12,6 +12,7 @@
 @section("content")
     <table class="tbl">
         <tr>
+            <th>Uge</th>
             <th>Mandag</th>
             <th>Tirsdag</th>
             <th>Onsdag</th>
@@ -21,6 +22,7 @@
         </tr>
         @foreach($menuPlans as $menuplan)
         <tr>
+            <td>{{$menuplan->week}}</td>
             <td>{{$menuplan->monday}}</td>
             <td>{{$menuplan->tuesday}}</td>
             <td>{{$menuplan->wednesday}}</td>
diff --git a/skolehjem/resources/views/app/menuplans/index.blade.php b/skolehjem/resources/views/app/menuplans/index.blade.php
index f66d484..3f4514a 100644
--- a/skolehjem/resources/views/app/menuplans/index.blade.php
+++ b/skolehjem/resources/views/app/menuplans/index.blade.php
@@ -5,26 +5,39 @@
 @endsection
 
 @section("content")
-    <main>
-        <h1 class="text-center sde-blue mb-0">Menuplan</h1>
-        <span class="text-center sde-black-80 bold" id="week">Uge x</span>
-        <div class="col w-100 mt-auto">
-            <div class="w-100" id="mandag">
-                <h3 class="sde-blue bold text-center">Mandag</h3>
-                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
-            </div>
-            <div class="w-100" id="tirsdag">
-                <h3 class="sde-blue bold text-center">Tirsdag</h3>
-                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
-            </div>
-            <div class="w-100" id="onsdag">
-                <h3 class="sde-blue bold text-center">Onsdag</h3>
-                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
-            </div>
-            <div class="w-100" id="torsdag">
-                <h3 class="sde-blue bold text-center">Torsdag</h3>
-                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
-            </div>
-        </div>
+    <?php
+        $Week = date('W'); //Current week
+    ?>
+    <main onload="myFunction()">
+        @if($menuPlans->contains('week', $Week)) {{-- If any of the menues in the menu table has the number of the week in the 'week' column, do this --}}
+            @foreach($menuPlans as $menuplan)
+                @if($menuplan->week == $Week)
+                    <h1 class="text-center sde-blue mb-0">Menuplan</h1>
+                    <span class="text-center sde-black-80 bold">Uge: {{$menuplan->week}}</span>
+                    <div class="col w-100 mt-auto text-center">
+                            <div class="w-100" id="mandag">
+                                <h3 class="sde-blue bold mb-0">Mandag</h3>
+                                <p>{{$menuplan->monday}}</p>
+                            </div>
+                            <div class="w-100" id="tirsdag">
+                                <h3 class="sde-blue bold mb-0">Tirsdag</h3>
+                                <p>{{$menuplan->tuesday}}</p>
+                            </div>
+                            <div class="w-100" id="onsdag">
+                                <h3 class="sde-blue bold mb-0">Onsdag</h3>
+                                <p>{{$menuplan->wednesday}}</p>
+                            </div>
+                            <div class="w-100" id="torsdag">
+                                <h3 class="sde-blue bold mb-0">Torsdag</h3>
+                                <p>{{$menuplan->thursday}}</p>
+                            </div>
+                    </div>
+                @endif
+            @endforeach
+        @else
+            <h1 class="text-center sde-blue mb-0">Menuplan</h1>
+            <p class="text-center">Der er ingen menuplaner denne uge!</p>
+        @endif
     </main>
+    {{ $menuPlans->links() }}
 @endsection