From 3e18809584b9f1e66edfd2a1aef5cbfd5a9ed434 Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 24 Aug 2020 14:25:50 +0200 Subject: [PATCH 1/3] v0.10.14e - Location site now reloads with the div instead of the whole page --- .../views/admin/locations/show.blade.php | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/skolehjem/resources/views/admin/locations/show.blade.php b/skolehjem/resources/views/admin/locations/show.blade.php index 5451d7e..43c8a97 100644 --- a/skolehjem/resources/views/admin/locations/show.blade.php +++ b/skolehjem/resources/views/admin/locations/show.blade.php @@ -12,41 +12,41 @@ Syddansk Erhvervsskole

Lokation: {{ $location->name }}

-
+
- @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
From 6569255d326784e471c2601b95dcdd9a87cec7ca Mon Sep 17 00:00:00 2001 From: Anders Date: Tue, 25 Aug 2020 08:15:25 +0200 Subject: [PATCH 2/3] v0.14.14f - Fixed text in about.index --- skolehjem/resources/lang/dk/msg.php | 2 ++ skolehjem/resources/lang/en/msg.php | 2 ++ skolehjem/resources/views/app/about/index.blade.php | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php index 8400730..1cb10fb 100644 --- a/skolehjem/resources/lang/dk/msg.php +++ b/skolehjem/resources/lang/dk/msg.php @@ -59,6 +59,8 @@ return[ "sedeltagere" => "Se deltagere", "af" => "Af", "programmedby" => "Programmeret af", + "omappen" => "Om appen", + "infoomappen" => "Denne app er udviklet til Odense erhvervskollegie.", "error" => "Fejl", "404" => "Denne side findes ikke.", "canceled" => "Aflyst" diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php index 0aa43e8..587823e 100644 --- a/skolehjem/resources/lang/en/msg.php +++ b/skolehjem/resources/lang/en/msg.php @@ -66,6 +66,8 @@ return[ "sedeltagere" => "See participants", "af" => "By", "programmedby" => "Programmed by", + "omappen" => "The App", + "infoomappen" => "The app is developed and designed for 'Odense erhvervskollegie'.", "error" => "Error", "404" => "This page doesn't exist.", "canceled" => "Canceled" diff --git a/skolehjem/resources/views/app/about/index.blade.php b/skolehjem/resources/views/app/about/index.blade.php index fdab4ff..3ed173a 100644 --- a/skolehjem/resources/views/app/about/index.blade.php +++ b/skolehjem/resources/views/app/about/index.blade.php @@ -8,8 +8,8 @@

{{ __('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 From e1a2fd87f720fdf584177cc2fb778a4693faf522 Mon Sep 17 00:00:00 2001 From: Anders Date: Tue, 25 Aug 2020 09:49:45 +0200 Subject: [PATCH 3/3] v0.14.14g - Fixed mails --- skolehjem/resources/views/app/about/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skolehjem/resources/views/app/about/index.blade.php b/skolehjem/resources/views/app/about/index.blade.php index 3ed173a..3f62ebd 100644 --- a/skolehjem/resources/views/app/about/index.blade.php +++ b/skolehjem/resources/views/app/about/index.blade.php @@ -13,8 +13,8 @@

{{__("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