From 522cf9cdf76439b4b0e8ebae4e81a6d782ebb2a3 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Fri, 21 Aug 2020 10:54:00 +0200
Subject: [PATCH 1/4] v0.10.12a - Made filter for washing machines done

---
 .../Http/Controllers/LocationController.php   | 84 +++++++++++++------
 .../admin/washing-machines/index.blade.php    |  5 +-
 2 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/LocationController.php b/skolehjem/app/Http/Controllers/LocationController.php
index 29d7c92..94fa600 100644
--- a/skolehjem/app/Http/Controllers/LocationController.php
+++ b/skolehjem/app/Http/Controllers/LocationController.php
@@ -7,6 +7,8 @@ use App\WashingMachine;
 use App\WashingReservation;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\DB;
+use function GuzzleHttp\Promise\all;
 
 class LocationController extends Controller
 {
@@ -176,39 +178,67 @@ class LocationController extends Controller
                 "<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
                 "</tr>";
 
-            if($request) {
-                $locations = Location::query()->orderBy('created_at', 'desc')->where('name', '=', $request->option)->get();
-                //$machines = WashingMachine::query()->where('created_at', '=', $locations->created_at)->get();
-            }
-            elseif($request->option == "all"){
-                $locations = Location::all();
-            }
+            if($request->option !== 'all') {
+                $locations = DB::table('washing_machines')
+                    ->join('locations', 'washing_machines.location_id','=', 'locations.id')
+                    ->select(DB::raw('washing_machines.name as washing_name, locations.name as location_name, locations.id as id'))
+                    ->where('locations.id', '=', $request->option)
+                    ->get();
 
+                if(count($locations) !== 0){
+                    foreach ($locations as $key => $location){
+                        $output.='<tr>'.
+                            '<td>' . $location->washing_name . '</td>'.
+                            '<td>' . $location->location_name . '</td>'.
+                            '<td><form method="post" action="' .route("locations.destroy", [ "location" => $location->id ]). '" class="w-100 nostyle">'.
+                            '<td><form method="post" action="' .route("locations.edit", [ "location" => $location->id ]). '" class="w-100 nostyle">'.
+                            csrf_field().
+                            method_field("delete").
 
-            if(count($locations) !== 0){
-                foreach ($locations as $key => $location){
+                            '<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>'.
+                            '</form>'.
+                            '</td>'.
+                            '</tr>';
+                    }
+                }else{
                     $output.='<tr>'.
-                        //'<td>' . $location->name . '</td>'.
-                        '<td><p>Test data</p></td>'.
-                        '<td>' . $location->name . '</td>'.
-                        '<td><form method="post" action="' .route("locations.destroy", [ "location" => $location ]). '" class="w-100 nostyle">'.
-                        '<td><form method="post" action="' .route("locations.edit", [ "location" => $location ]). '" class="w-100 nostyle">'.
-                        csrf_field().
-                        method_field("delete").
-
-                        '<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>'.
-                        '</form>'.
-                        '</td>'.
+                        '<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation i nu</td>'.
+                        '<td></td>'.
+                        '<td></td>'.
+                        '<td></td>'.
                         '</tr>';
                 }
-            }else{
-                $output.='<tr>'.
-                    '<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation i nu</td>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '</tr>';
             }
+            elseif($request->option === "all"){
+                $machines = WashingMachine::all();
+
+                if(count($machines) !== 0){
+                    foreach($machines as $machine) {
+                        $output.= '<tr>'.
+                            '<td>'.$machine->name.'</td>'.
+                            '<td>'.Location::query()->where("id", "=", $machine->location_id)->first()->name.'</td>'.
+                            '<td><a href="'. route("washing-machines.edit", [ "washing_machine" => $machine->id]) . '"><img class="w-100" src="'. asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>'.
+                            '<td><form method="post" action="'. route('washing-machines.destroy', [ 'washing_machine' => $machine->id ]) .'" class="w-100 nostyle">'.
+                                    csrf_field().
+                                    method_field("delete").
+                                  '<button class="w-100 nostyle" onclick="return confirm('."'Are you sure you want to delete?'".');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg'). '" alt="Delete"></button>'.
+                                '</form>'.
+                            '</td>'.
+                        '</tr>';
+                    }
+                }else{
+                    $output.='<tr>'.
+                        '<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation i nu</td>'.
+                        '<td></td>'.
+                        '<td></td>'.
+                        '<td></td>'.
+                        '</tr>';
+                }
+            }
+
+
+
+
             return Response($output);
         }
     }
diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php
index d4e3e41..8e1844b 100644
--- a/skolehjem/resources/views/admin/washing-machines/index.blade.php
+++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php
@@ -16,7 +16,7 @@
             <select name="risRosName" id="locationID">
                 <option selected="selected" name="all" value="all">Alle</option>
                 @foreach(\App\Location::query()->get() as $location)
-                    <option value="{{$location->name}}">{{$location->name}}</option>
+                    <option value="{{$location->id}}">{{$location->name}}</option>
                 @endforeach
             </select> <label>Vælg bygning</label>
         </div>
@@ -46,12 +46,13 @@
     <script>
         $('#locationID').change(function () {
             $value = $('#locationID').find(":selected").val();
-           // alert($value);
+            console.log($value);
             $.ajax({
                 type: 'get',
                 url: '{{route('locations.search')}}',
                 data: {'option':$value},
                 success:function (data) {
+                    console.log($value);
                     $('tbody').html(data);
                 },
                 error:function (data) {

From 78f97cbe9fcdd36d8e6b25e2afcfde8561c096a7 Mon Sep 17 00:00:00 2001
From: Sebastian D <31686237+sebathefox@users.noreply.github.com>
Date: Fri, 21 Aug 2020 13:39:45 +0200
Subject: [PATCH 2/4] Create normalize.css

---
 skolehjem/public/css/normalize.css | 351 +++++++++++++++++++++++++++++
 1 file changed, 351 insertions(+)
 create mode 100644 skolehjem/public/css/normalize.css

diff --git a/skolehjem/public/css/normalize.css b/skolehjem/public/css/normalize.css
new file mode 100644
index 0000000..f1ba570
--- /dev/null
+++ b/skolehjem/public/css/normalize.css
@@ -0,0 +1,351 @@
+
+IntelliJ IDEAPhpStormWebStorm
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+
+/* Document
+   ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
+ */
+
+html {
+  line-height: 1.15; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/* Sections
+   ========================================================================== */
+
+/**
+ * Remove the margin in all browsers.
+ */
+
+body {
+  margin: 0;
+}
+
+/**
+ * Render the `main` element consistently in IE.
+ */
+
+main {
+  display: block;
+}
+
+/**
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Remove the gray background on active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * 1. Remove the bottom border in Chrome 57-
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove the border on images inside links in IE 10.
+ */
+
+img {
+  border-style: none;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * 1. Change the font styles in all browsers.
+ * 2. Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: inherit; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+  overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+  text-transform: none;
+}
+
+/**
+ * Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
+ */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  vertical-align: baseline;
+}
+
+/**
+ * Remove the default vertical scrollbar in IE 10+.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in Edge, IE 10+, and Firefox.
+ */
+
+details {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Misc
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 10+.
+ */
+
+template {
+  display: none;
+}
+
+/**
+ * Add the correct display in IE 10.
+ */
+
+[hidden] {
+  display: none;
+}

From 6e277e9e795b6dc017c1f778b7a3858663076cd7 Mon Sep 17 00:00:00 2001
From: Sebastian D <31686237+sebathefox@users.noreply.github.com>
Date: Fri, 21 Aug 2020 13:41:06 +0200
Subject: [PATCH 3/4] Update base.blade.php

---
 skolehjem/resources/views/user/layout/base.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/skolehjem/resources/views/user/layout/base.blade.php b/skolehjem/resources/views/user/layout/base.blade.php
index ae72ff2..7405152 100644
--- a/skolehjem/resources/views/user/layout/base.blade.php
+++ b/skolehjem/resources/views/user/layout/base.blade.php
@@ -3,6 +3,7 @@
 <head>
     <title>@yield("title")</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link type="text/css" rel="stylesheet" href="{{ asset("/css/normalize.css") }}">
     <link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
 </head>
 <body style="background-color: #00788a;">

From 6d551b42d0f1a9fe0acb36cdd74592d2d597aa41 Mon Sep 17 00:00:00 2001
From: Frederik Milling Pytlick <54995208+frederikpyt@users.noreply.github.com>
Date: Fri, 21 Aug 2020 13:44:33 +0200
Subject: [PATCH 4/4] Update base.blade.php

---
 skolehjem/resources/views/app/layout/base.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php
index 69a0773..86c6d70 100644
--- a/skolehjem/resources/views/app/layout/base.blade.php
+++ b/skolehjem/resources/views/app/layout/base.blade.php
@@ -3,6 +3,7 @@
 <head>
     <title>@yield("title")</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link type="text/css" rel="stylesheet" href="{{ asset("/css/normalize.css") }}">
     @if(request()->cookie("mode") == "dark")
         <link type="text/css" rel="stylesheet" href="{{ mix("/css/webappdark.css") }}">
     @else