From 0516acba789f350f45fce685db27e057353a6dc8 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Wed, 19 Aug 2020 15:30:39 +0200
Subject: [PATCH 1/2] v0.10.10e - Made a hide show filter button, not done but
 works, css fix tomorrow

---
 .../resources/views/admin/users/index.blade.php    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php
index 86ef422..a333484 100644
--- a/skolehjem/resources/views/admin/users/index.blade.php
+++ b/skolehjem/resources/views/admin/users/index.blade.php
@@ -15,9 +15,12 @@
 
         <form method="post" action="{{ route("users.store") }}">
             @csrf
-            <input type="text" class="form-controller" id="search" name="search"  placeholder="Søg efter navn,email,tlf"></input>
+            <input type="text" class="form-controller" id="search" name="search"  placeholder="Søg efter navn,email,tlf"><br>
         </form>
+        <button id="filterButton" type="button" class="btn btn-sde-blue">Søg filter</button>
+    </div>
 
+    <div id="showHideCheckbox">
         <input class="checkbox-inline" type="checkbox" name="checkbox" id="navn" value="navn">
         <label for="navn">Navn</label>
         <input class="checkbox-inline" type="checkbox" name="checkbox" id="efternavn" value="efternavn">
@@ -105,6 +108,15 @@
                     }
                 });
             });
+
+
+
+
+            //Show hide search filter
+                $("#filterButton").click(function(){
+                    $('#showHideCheckbox').toggle();
+                });
+
         </script>
 
 

From a145c88e2c29f6072780fa80ccb9977172dfffb2 Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Thu, 20 Aug 2020 12:18:30 +0200
Subject: [PATCH 2/2] v0.10.10f - You can no longer see your own reservations
 if they're an hour past due (Samt with admin)

---
 .../washing-reservations/index.blade.php      | 29 +++++++++-------
 .../app/washing-reservations/index.blade.php  | 33 ++++++++++++-------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
index 89b9b10..a227b3b 100644
--- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php
+++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
@@ -10,6 +10,9 @@
 @endsection
 
 @section("content")
+    <?php
+    date_default_timezone_set('Europe/Copenhagen');
+    ?>
     <table class="tbl mt-0">
         <tr>
             <th>Lokation</th>
@@ -19,19 +22,21 @@
             <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
         @foreach($reservations as $reservation)
-        <tr>
-            <td>{{ \App\Location::query()->find(\App\WashingMachine::query()->find($reservation->machine_id)->location_id)->name }}</td>
-            <td>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</td>
-            <td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</td>
-            <td>{{ ucfirst(\App\User::query()->find($reservation->user_id)->name_first) }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_last) }}</td>
-            <td><form method="post" action="{{ route('washing-reservations.destroy', ['washing_reservation' => $reservation]) }}" class="w-100 nostyle">
-                    @csrf
-                    @method("delete")
+            @if(date('Y-m-d H:i:s', strtotime('-1 hour')) < $reservation->time)
+                <tr>
+                    <td>{{ \App\Location::query()->find(\App\WashingMachine::query()->find($reservation->machine_id)->location_id)->name }}</td>
+                    <td>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</td>
+                    <td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</td>
+                    <td>{{ ucfirst(\App\User::query()->find($reservation->user_id)->name_first) }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_last) }}</td>
+                    <td><form method="post" action="{{ route('washing-reservations.destroy', ['washing_reservation' => $reservation]) }}" class="w-100 nostyle">
+                            @csrf
+                            @method("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>
+                            <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>
+            @endif
         @endforeach
     </table>
 
diff --git a/skolehjem/resources/views/app/washing-reservations/index.blade.php b/skolehjem/resources/views/app/washing-reservations/index.blade.php
index a82dd51..a40b800 100644
--- a/skolehjem/resources/views/app/washing-reservations/index.blade.php
+++ b/skolehjem/resources/views/app/washing-reservations/index.blade.php
@@ -4,23 +4,32 @@
 @endsection
 
 @section("content")
+    <?php
+    date_default_timezone_set('Europe/Copenhagen');
+    $washingreservations = 0;
+    ?>
     <main style="min-height: calc(100% - 61.34px);">
         <h2 class="text-center sde-blue mb-0">{{__('msg.dinereservationer')}}</h2>
         @foreach($reservations as $reservation)
-            <div class="reservation" style="margin: 0 32px 1.75rem 32px;">
-                <h3>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</h3>
-                <div class="row align-items-center">
-                    <span style="font-size: 4vw"><b>{{__('msg.tid')}}:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</span>
-                    <form class="ml-auto" method="post" action="{{ route("washing-reservations.destroy", [ "washing_reservation" => $reservation ]) }}">
-                        @csrf
-                        @method("delete")
-                        <input type="hidden" name="id" value="{{ $reservation->id }}">
-                        <button class="btn btn-sde-blue mb-0" type="submit" onclick="return confirm('Are you sure you want to remove this reservation?');">{{__('msg.fjern')}}</button>
-                    </form>
+            @if(date('Y-m-d H:i:s', strtotime('-1 hour')) < $reservation->time)
+                <div class="reservation" style="margin: 0 32px 1.75rem 32px;">
+                    <h3>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</h3>
+                    <div class="row align-items-center">
+                        <span style="font-size: 4vw"><b>{{__('msg.tid')}}:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</span>
+                        <form class="ml-auto" method="post" action="{{ route("washing-reservations.destroy", [ "washing_reservation" => $reservation ]) }}">
+                            @csrf
+                            @method("delete")
+                            <input type="hidden" name="id" value="{{ $reservation->id }}">
+                            <button class="btn btn-sde-blue mb-0" type="submit" onclick="return confirm('Are you sure you want to remove this reservation?');">{{__('msg.fjern')}}</button>
+                        </form>
+                    </div>
                 </div>
-            </div>
+                <?php
+                $washingreservations++;
+                ?>
+            @endif
         @endforeach
-        @if(count($reservations) < 1)
+        @if(count($reservations) < 1 || $washingreservations == 0)
             <p style="margin: 0 18px;">{{__('msg.duharingenreservationer')}}.</p>
         @else
             {{ $reservations->links() }}