-
+
- @if(\Illuminate\Support\Facades\Request::route()->getName() == "users.index")
-
-
- @else
-
Brugere
- @else
-
-
- @endif
+
+
Brugere
- @endif
+
+
+
Brugere
- @if(\Illuminate\Support\Facades\Request::route()->getName() == "roles.index")
-
Brugere
Brugere
-
- @else
-
Roller
- @else
-
-
- @endif
+
Roller
- @endif
+
+
Roller
- @if(\Illuminate\Support\Facades\Request::route()->getName() == "news.index")
-
Roller
Roller
-
- @else
-
Nyheder
- @else
-
-
- @endif
+
Nyheder
- @endif
+
+
Nyheder
- @if(\Illuminate\Support\Facades\Request::route()->getName() == "menu-plans.index")
-
Nyheder
Nyheder
-
- @else
-
Menuplan
- @else
-
-
- @endif
+
Menuplan
- @endif
+
+
Menuplan
- @if(\Illuminate\Support\Facades\Request::route()->getName() == "events.index")
-
Menuplan
Menuplan
-
- @else
-
Aktiviteter
- @else
-
-
- @endif
+
Aktiviteter
- @endif
+
+
Aktiviteter
- @if(\Illuminate\Support\Facades\Request::route()->getName() == "locations.index")
-
Aktiviteter
Aktiviteter
-
- @else
-
Lokationer
- @else
-
-
- @endif
+
Lokationer
- @endif
+
+
Lokationer
- @if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-machines.index")
-
Lokationer
Lokationer
-
- @else
-
Vaskemaskiner
- @else
-
-
- @endif
+
Vaskemaskiner
- @endif
+
+
Vaskemaskiner
- @if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-reservations.index")
-
Vaskemaskiner
Vaskemaskiner
-
- @else
-
Reservationer
- @else
-
-
- @endif
+
Reservationer
- @endif
+
+
Reservationer
- @if(\Illuminate\Support\Facades\Request::route()->getName() == "contacts.index")
-
Reservationer
Reservationer
-
- @else
-
Kontakter
- @else
-
-
- @endif
+
Kontakter
- @endif
+
+
Kontakter
- @if(\Illuminate\Support\Facades\Request::route()->getName() == "guides.index")
-
Kontakter
Kontakter
-
- @else
-
Vejledning
- @else
-
-
- @endif
+
Vejledning
- @endif
+
+
Vejledning
- @if(\Illuminate\Support\Facades\Request::route()->getName() == "feedbacks.index")
-
Vejledning
Vejledning
-
- @else
-
+
+ $('.segment.active > .tooltip > h3 > a').click(function (e) {
+ e.preventDefault();
+ });
+
diff --git a/skolehjem/resources/views/admin/locations/show.blade.php b/skolehjem/resources/views/admin/locations/show.blade.php
index 43c8a97..d32860c 100644
--- a/skolehjem/resources/views/admin/locations/show.blade.php
+++ b/skolehjem/resources/views/admin/locations/show.blade.php
@@ -18,23 +18,23 @@
$i = 1;
?>
Feedback
- @else
-
@@ -172,11 +167,14 @@
@yield("content")
- @foreach(\App\WashingMachine::query()->where("location_id", "=", $location->id)->get() as $machine)
- @foreach(\App\WashingReservation::query()->where("machine_id", "=", $machine->id)->where("time", "LIKE", date("Y-m-d"). "%")->orderBy("time", "asc")->get() as $reservation)
- @if (date('Y-m-d H:i:s', strtotime('-1 hour')) < $reservation->time)
- @if($i % 3 == 1)
-
-
- @endif
-
-
-
+ {{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}
-
- Dato: {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y') }}
- Tid: {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('\k\l\. H:i') }} - {{ \App\User::query()->where("id", "=", $reservation->user_id)->first()->name_first }} {{ \App\User::query()->where("id", "=", $reservation->user_id)->first()->name_last }}
-
+ @foreach(\App\WashingReservation::query()->join('washing_machines', 'washing_machines.id', '=', 'washing_reservations.machine_id')->where("location_id", "=", $location->id)->where("time", "LIKE", date("Y-m-d"). "%")->orderBy("time", "asc")->get() as $reservation)
+ @if (date('Y-m-d H:i:s', strtotime('-1 hour')) < $reservation->time)
+ @if($i % 3 == 1)
@endif
- @endforeach
+
+
+
+ @else
+ {{ \App\WashingReservation::query()->join('washing_machines', 'washing_machines.id', '=', 'washing_reservations.machine_id')->where("location_id", "=", $location->id)->where('time', '<', date('Y-m-d H:i:s'). '%')->delete() }}
+ @endif
@endforeach
@if($i == 1)
Der er ingen vaskemaskine reservationer for i dag.
@@ -46,8 +46,8 @@
@yield("scripts")
diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php
index 8e1844b..9be1d94 100644
--- a/skolehjem/resources/views/admin/washing-machines/index.blade.php
+++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php
@@ -49,7 +49,7 @@
console.log($value);
$.ajax({
type: 'get',
- url: '{{route('locations.search')}}',
+ url: '{{route('washing-machines.search')}}',
data: {'option':$value},
success:function (data) {
console.log($value);
diff --git a/skolehjem/resources/views/app/about/index.blade.php b/skolehjem/resources/views/app/about/index.blade.php
index fdab4ff..3f62ebd 100644
--- a/skolehjem/resources/views/app/about/index.blade.php
+++ b/skolehjem/resources/views/app/about/index.blade.php
@@ -8,13 +8,13 @@
{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}
+
+ Dato: {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y') }}
+ Tid: {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('\k\l\. H:i') }} - {{ \App\User::query()->where("id", "=", $reservation->user_id)->first()->name_first }} {{ \App\User::query()->where("id", "=", $reservation->user_id)->first()->name_last }}
+
+ {{ __('msg.omkring') }}
Version:
1.0
-Om appen:
-Denne app er udviklet til Odense erhvervskollegie.
+{{__("msg.omappen")}}:
+{{__("msg.infoomappen")}}