- @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)
+ @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 }}
+
-
+
@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 }}
-
-
-
- @endif
+ @endforeach
@endforeach
- @endforeach
- @if($i == 1)
-
Der er ingen vaskemaskine reservationer for i dag.
- @endif
+ @if($i == 1)
+
Der er ingen vaskemaskine reservationer for i dag.
+ @endif
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 @@
{{ __('msg.omkring') }}
Version:
1.0
-
Om appen:
-
Denne app er udviklet til Odense erhvervskollegie.
+
{{__("msg.omappen")}}:
+
{{__("msg.infoomappen")}}
{{__("msg.programmedby")}}:
Anders Rasmussen,anders164a@gmail.com
Frederik Milling Pytlick,frederikpyt@gmail.com
-
Vedran Zelen,vedr0021@gmail.com
+
Vedran Zelen,zelenvedran@gmail.com
Victor Neerholt,victorneerholt@gmail.com
-
Sebastian Davaris,seba4928@edu.sde.dk
+
Sebastian Davaris,sebastian@davaris.dk
@endsection