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 @@
+ "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 4273d0f..6ba6fc4 100644
--- a/skolehjem/resources/views/admin/index.blade.php
+++ b/skolehjem/resources/views/admin/index.blade.php
@@ -47,7 +47,6 @@
}
- {{-- Brugere --}}
@@ -68,7 +67,6 @@
- {{-- Aktiviteter --}}
@@ -110,7 +108,7 @@
@endif
-
+
{!! \App\Helpers::closetags(substr(\App\Event::query()->orderByDesc("date")->first()->description, 0, 300) )!!} |
@@ -162,8 +160,8 @@
- Ugens Menuplan |
- |
+ Ugens Menuplan |
+ |
@if(\App\MenuPlan::query()->where("week", "=", date('W'))->first() !== null)
{{-- \App\MenuPlan::query()->where("week", "=", date('W'))->first() --}}
@@ -181,6 +179,7 @@
{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday }} |
@else
+
Der er ingen menuplan for denne uge
@endif
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")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Lokation |
Vaskemaskine |
Tidspunkt |
Bruger |
@@ -37,6 +20,7 @@
@foreach($reservations as $reservation)
+ {{ \App\Location::query()->find(\App\WashingMachine::query()->find($reservation->machine_id)->location_id)->name }} |
{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }} |
{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }} |
{{ ucfirst(\App\User::query()->find($reservation->user_id)->name_first) }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_last) }} |