From e6fbafb011ed6f6dff422e24f736e17a88674416 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Mon, 17 Aug 2020 15:06:35 +0200
Subject: [PATCH 1/2] v0.10.0i - :(
---
skolehjem/resources/views/admin/index.blade.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/skolehjem/resources/views/admin/index.blade.php b/skolehjem/resources/views/admin/index.blade.php
index 4273d0f..8e54e9b 100644
--- a/skolehjem/resources/views/admin/index.blade.php
+++ b/skolehjem/resources/views/admin/index.blade.php
@@ -110,7 +110,7 @@
@endif
<div class="container" style="margin-top: 8px;">
- <table style="border: 1px solid lightgrey">
+ <table style="border: 1px solid lightgrey; width: 100%;">
<tr>
<td> {!! \App\Helpers::closetags(substr(\App\Event::query()->orderByDesc("date")->first()->description, 0, 300) )!!}</td>
</tr>
@@ -162,8 +162,8 @@
</div>
<table class="tbl mt-1">
<tr>
- <th class="text-white text-center" style="background-color: lightseagreen;">Ugens Menuplan</th>
- <th class="text-white text-center" style="background-color: lightseagreen;"></th> <!--Maybe fix ?-->
+ <th class="text-white text-center" style="background-color: lightseagreen; border-right: unset;">Ugens Menuplan</th>
+ <th class="text-white text-center" style="background-color: lightseagreen; border-left: unset;"></th> <!--Maybe fix ?-->
</tr>
@if(\App\MenuPlan::query()->where("week", "=", date('W'))->first() !== null)
{{-- \App\MenuPlan::query()->where("week", "=", date('W'))->first() --}}
@@ -181,6 +181,7 @@
<td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday }}</td>
</tr>
@else
+ </table>
<p class="text-center">Der er ingen menuplan for denne uge</p>
@endif
</table>
From 983b02e00e93618a04bccdf102e1be13940df028 Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Mon, 17 Aug 2020 15:06:48 +0200
Subject: [PATCH 2/2] v0.10.1 - Added location on washing_reservations and
created a WashingMachineSeeder.php
---
skolehjem/database/seeds/DatabaseSeeder.php | 1 +
.../database/seeds/WashingMachineSeeder.php | 49 +++++++++++++++++++
.../resources/views/admin/index.blade.php | 4 +-
.../washing-reservations/index.blade.php | 22 ++-------
4 files changed, 54 insertions(+), 22 deletions(-)
create mode 100644 skolehjem/database/seeds/WashingMachineSeeder.php
diff --git a/skolehjem/database/seeds/DatabaseSeeder.php b/skolehjem/database/seeds/DatabaseSeeder.php
index 2ab2566..a5d9088 100644
--- a/skolehjem/database/seeds/DatabaseSeeder.php
+++ b/skolehjem/database/seeds/DatabaseSeeder.php
@@ -16,6 +16,7 @@ class DatabaseSeeder extends Seeder
$this->call(UserSeeder::class);
$this->call(ContactSeeder::class);
$this->call(LocationSeeder::class);
+ $this->call(WashingMachineSeeder::class);
$this->call(NewsTypeSeeder::class);
}
}
diff --git a/skolehjem/database/seeds/WashingMachineSeeder.php b/skolehjem/database/seeds/WashingMachineSeeder.php
new file mode 100644
index 0000000..638356e
--- /dev/null
+++ b/skolehjem/database/seeds/WashingMachineSeeder.php
@@ -0,0 +1,49 @@
+<?php
+
+use App\User;
+use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Log;
+
+class WashingMachineSeeder extends Seeder
+{
+ /**
+ * Run the database seeds.
+ *
+ * @return void
+ */
+ public function run()
+ {
+ $machines = [
+ [
+ "name" => "Vaskemaskine nr. 1",
+ "location_id" => 1
+ ],
+ [
+ "name" => "Vaskemaskine nr. 2",
+ "location_id" => 1
+ ],
+ [
+ "name" => "Vaskemaskine nr. 3",
+ "location_id" => 1
+ ],
+
+ [
+ "name" => "Vaskemaskine nr. 1",
+ "location_id" => 2
+ ],
+ [
+ "name" => "Vaskemaskine nr. 2",
+ "location_id" => 2
+ ],
+ ];
+
+ foreach ($machines as $machineData) {
+ $machine = new \App\WashingMachine();
+
+ $machine->name = $machineData["name"];
+ $machine->location_id = $machineData["location_id"];
+
+ $machine->save();
+ }
+ }
+}
diff --git a/skolehjem/resources/views/admin/index.blade.php b/skolehjem/resources/views/admin/index.blade.php
index dcc0e31..a603177 100644
--- a/skolehjem/resources/views/admin/index.blade.php
+++ b/skolehjem/resources/views/admin/index.blade.php
@@ -47,7 +47,6 @@
}
</style>
- {{-- Brugere --}}
<div class="card">
<div class="head" style="background-color: orange;">
<div>
@@ -68,7 +67,6 @@
</table>
</div>
- {{-- Aktiviteter --}}
<div class="card">
<div class="head" style="background-color: red;">
<div>
@@ -107,7 +105,7 @@
</div>
</div>
@else
- <p style="padding: 0 4px">Der er ingen aktiviteter</p>
+ <p style="padding: 0 4px; text-align: center">Der er ingen aktiviteter</p>
@endif
</div>
diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
index 8af142e..89b9b10 100644
--- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php
+++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
@@ -10,26 +10,9 @@
@endsection
@section("content")
- <div class="row align-items-center">
- <!--<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('washing-reservations.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Reservation</a>!-->
-
- <form method="post" action="{{ route("washing-reservations.store") }}">
- @csrf
- <input type="text" class="form-controller" id="search" name="search" placeholder="//TODO: Søg på vaskemaskine, tid, bruger"></input>
- </form>
-
-
- <input class="checkbox-inline" type="checkbox" name="checkbox" id="vaskemaskine" value="vaskemaskine">
- <label for="navn">Vaskemaskine</label>
- <input class="checkbox-inline" type="checkbox" name="checkbox" id="tidspunkt" value="tidspunkt">
- <label for="efternavn">Tidspunkt</label>
- <input class="checkbox-inline" type="checkbox" name="checkbox" id="bruger" value="bruger">
- <label for="email">Bruger</label>
-
-
- </div>
- <table class="tbl mt-2">
+ <table class="tbl mt-0">
<tr>
+ <th>Lokation</th>
<th>Vaskemaskine</th>
<th>Tidspunkt</th>
<th>Bruger</th>
@@ -37,6 +20,7 @@
</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>