From 20d73c047ff2a82ba0d7457ed1a23361cf1f38c1 Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Mon, 3 Aug 2020 14:47:06 +0200
Subject: [PATCH] Fixed date and stuff

---
 skolehjem/resources/views/admin/events/create.blade.php         | 2 +-
 skolehjem/resources/views/admin/events/edit.blade.php           | 2 +-
 skolehjem/resources/views/admin/events/index.blade.php          | 2 +-
 .../resources/views/admin/washing-reservations/index.blade.php  | 2 +-
 skolehjem/resources/views/app/events/index.blade.php            | 2 +-
 skolehjem/resources/views/app/events/yourevents.blade.php       | 2 +-
 skolehjem/resources/views/app/users/index.blade.php             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php
index 4aaf61f..78c2df2 100644
--- a/skolehjem/resources/views/admin/events/create.blade.php
+++ b/skolehjem/resources/views/admin/events/create.blade.php
@@ -18,7 +18,7 @@
         <label for="description">Beskrivelse:</label>
         <input type="text" name="description" id="description" max="500" required>
         <label for="date">Aktivitet dato:</label>
-        <input type="date" name="date" id="date" required>
+        <input type="datetime-local" name="date" id="date" required>
         <input type="submit" class="btn btn-dark text-white" value="Opret">
     </form>
 
diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php
index 8356c41..0234b54 100644
--- a/skolehjem/resources/views/admin/events/edit.blade.php
+++ b/skolehjem/resources/views/admin/events/edit.blade.php
@@ -19,7 +19,7 @@
         <label for="description">Beskrivelse</label>
         <input value="{{$event->description}}" type="text" name="description" id="description" required>
         <label for="date">Beskrivelse</label>
-        <input value="{{$event->date}}" type="date" name="date" id="date" required>
+        <input value="{{$event->date}}" type="datetime-local" name="date" id="date" required>
 
         <input type="submit" class="btn btn-dark text-white" value="Rediger">
     </form>
diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php
index 02a44f3..414eec6 100644
--- a/skolehjem/resources/views/admin/events/index.blade.php
+++ b/skolehjem/resources/views/admin/events/index.blade.php
@@ -32,7 +32,7 @@
             <tr>
                 <td>{{ $event->name }}</td>
                 <td>{{ $event->description }}</td>
-                <td>{{ $event->date }}</td>
+                <td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</td>
                 <td><a href="{{ route("events.signups", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Update"></a></td>
                 <td><a href="{{ route("events.edit", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
                 <td><form method="post" action="{{ route("events.destroy", [ "event" => $event ]) }}" class="w-100 nostyle">
diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
index 47886c7..b44879d 100644
--- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php
+++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
@@ -38,7 +38,7 @@
         @foreach($reservations as $reservation)
         <tr>
             <td>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</td>
-            <td>{{ $reservation->time }}</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
diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php
index a39a82f..b38e477 100644
--- a/skolehjem/resources/views/app/events/index.blade.php
+++ b/skolehjem/resources/views/app/events/index.blade.php
@@ -10,7 +10,7 @@
             @foreach($events as $event)
                 <form method="get" action="{{ route("userevents.create") }}">
                     <h3 class="sde-blue bold text-center mb-0">{{$event->name}}</h3>
-                    <p class="text-center mt-0">{{$event->date}}</p>
+                    <p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
                     <p class="text-center">{{$event->description}}</p>
                     <input type="hidden" name="event_id" value="{{ $event->id }}">
                     {!! session()->get('error#' . $event->id) !!}
diff --git a/skolehjem/resources/views/app/events/yourevents.blade.php b/skolehjem/resources/views/app/events/yourevents.blade.php
index 32be557..ca5fb46 100644
--- a/skolehjem/resources/views/app/events/yourevents.blade.php
+++ b/skolehjem/resources/views/app/events/yourevents.blade.php
@@ -13,7 +13,7 @@
                     @csrf
                     @method("delete")
                     <h3 class="sde-blue bold text-center mb-0">{{$userevent->name}}</h3>
-                    <p class="text-center mt-0">{{$userevent->date}}</p>
+                    <p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
                     <p class="text-center">{{$userevent->description}}</p>
                     <button type="submit" class="btn text-center btn-sde-blue" onclick="return confirm('Are you sure you want to remove this event?');">Afmeld</button>
                 </form>
diff --git a/skolehjem/resources/views/app/users/index.blade.php b/skolehjem/resources/views/app/users/index.blade.php
index 7e5ff8a..0bd82b7 100644
--- a/skolehjem/resources/views/app/users/index.blade.php
+++ b/skolehjem/resources/views/app/users/index.blade.php
@@ -5,7 +5,7 @@
         <div class="d-flex col block-container mt-2">
             <a href="{{ route('menu-plans.index') }}" class="block text-center mb-1">Menuplan</a>
             <a href="{{ route('events.index') }}" class="block text-center mb-1">Aktiviteter</a>
-            <a href="{{ route('washing-reservations.index') }}" class="block text-center mb-1">Reservationer</a>
+            <a href="{{ route('washing-reservations.appindex') }}" class="block text-center mb-1">Reservationer</a>
             <a href="{{ route('contacts.index') }}" class="block text-center mb-1">Kontoret</a>
             <a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
         </div>