vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anders
2020-08-17 15:10:52 +02:00
parent d19b9c1d1a 4a72493f9b
commit 58c6d08ca2
4 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/admin/index.blade.php
+4 -5
View File
@@ -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>
@@ -110,7 +108,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 +160,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 +179,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>
skolehjem/resources/views/admin/washing-reservations/index.blade.php
+3 -19
View File
@@ -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>