Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
This commit is contained in:
@@ -11,41 +11,47 @@
|
||||
@yield("header")
|
||||
<main class="row">
|
||||
<div class="col nav" style="background-color: #333333;">
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route('users.index') }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Brugere</span></a></h3>
|
||||
<div class="segment" style="height: 60px;">
|
||||
<div class="text-white row align-items-center" style="margin-left: -1rem; margin-top: 0; margin-bottom: 0; font-size: 1.15rem; height: calc(100% - 2rem); padding: 1rem 2rem; width: calc(100% - 3rem); background-color: #333333 !important;">
|
||||
<a href="javascript:void(0)" id="open" style="padding: 0; margin-left: auto; display: none;" onclick="openNav()" class="open-btn text-white"><i class="fa fa-bars"></i></a>
|
||||
<a href="javascript:void(0)" id="close" style="padding: 0; margin-left: auto;" onclick="closeNav()" class="close-btn text-white"><i class="fa fa-times"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route("roles.index") }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Roller</span></a></h3>
|
||||
<h3 class="text-white"><a href="{{ route('users.index') }}" class="text-white"><img src="{{asset("/images/icons/users-hvid.svg")}}" class="fa"><span style="margin-left: 4px;">Brugere</span></a></h3>
|
||||
</div>
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route("news.index")}}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Nyheder</span></a></h3>
|
||||
<h3 class="text-white"><a href="{{ route("roles.index") }}" class="text-white"><img src="{{asset("/images/icons/role.svg")}}" class="fa"><span style="margin-left: 4px;">Roller</span></a></h3>
|
||||
</div>
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route("menu-plans.index")}}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Menuplan</span></a></h3>
|
||||
<h3 class="text-white"><a href="{{ route("news.index")}}" class="text-white"><img src="{{asset("/images/icons/news.svg")}}" class="fa"><span style="margin-left: 4px;">Nyheder</span></a></h3>
|
||||
</div>
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route("events.index") }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Aktiviteter</span></a></h3>
|
||||
<h3 class="text-white"><a href="{{ route("menu-plans.index")}}" class="text-white"><img src="{{asset("/images/icons/Menuplan.svg")}}" class="fa"><span style="margin-left: 4px;">Menuplan</span></a></h3>
|
||||
</div>
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route("locations.index") }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Lokationer</span></a></h3>
|
||||
<h3 class="text-white"><a href="{{ route("events.index") }}" class="text-white"><img src="{{asset("/images/icons/Aktiviteter.svg")}}" class="fa"><span style="margin-left: 4px;">Aktiviteter</span></a></h3>
|
||||
</div>
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route("washing-machines.index") }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Vaskemaskiner</span></a></h3>
|
||||
<h3 class="text-white"><a href="{{ route("locations.index") }}" class="text-white"><img src="{{asset("/images/icons/location.svg")}}" class="fa"><span style="margin-left: 4px;">Lokationer</span></a></h3>
|
||||
</div>
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route("washing-reservations.index") }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Reservationer</span></a></h3>
|
||||
<h3 class="text-white"><a href="{{ route("washing-machines.index") }}" class="text-white"><img src="{{asset("/images/icons/wash.svg")}}" class="fa"><span style="margin-left: 4px;">Vaskemaskiner</span></a></h3>
|
||||
</div>
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route("contacts.index") }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Kontakter</span></a></h3>
|
||||
<h3 class="text-white"><a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{asset("/images/icons/wash_res.svg")}}" class="fa"><span style="margin-left: 4px;">Reservationer</span></a></h3>
|
||||
</div>
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route('guides.index') }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Vejledning</span></a></h3>
|
||||
<h3 class="text-white"><a href="{{ route("contacts.index") }}" class="text-white"><img src="{{asset("/images/icons/phone.svg")}}" class="fa"><span style="margin-left: 4px;">Kontakter</span></a></h3>
|
||||
</div>
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route('feedbacks.index') }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Feedback</span></a></h3>
|
||||
<h3 class="text-white"><a href="{{ route('guides.index') }}" class="text-white"><img src="{{asset("/images/icons/Vejledninger.svg")}}" class="fa"><span style="margin-left: 4px;">Vejledning</span></a></h3>
|
||||
</div>
|
||||
<div class="segment">
|
||||
<h3 class="text-white"><a href="{{ route('feedbacks.index') }}" class="text-white"><img src="{{asset("/images/icons/feedback.svg")}}" class="fa"><span style="margin-left: 4px;">Feedback</span></a></h3>
|
||||
</div>
|
||||
</div>
|
||||
<div class="w-85" style="background-color: #cccccc;">
|
||||
<div class="w-85" style="transition: width .5s; background-color: #cccccc;">
|
||||
<div class="directorypath text-white">
|
||||
<a href="{{ route('root.index') }}" class="text-white">Home</a> / @yield("path")
|
||||
</div>
|
||||
@@ -57,6 +63,49 @@
|
||||
|
||||
<script src="{{ mix("/js/app.js") }}"></script>
|
||||
<script src="{{ asset("/js/jquery.are-you-sure.js") }}"></script>
|
||||
<script type="text/javascript">
|
||||
function openNav() {
|
||||
var open = document.getElementById("open");
|
||||
var close = document.getElementById("close");
|
||||
|
||||
close.style.display = "block";
|
||||
open.style.display = "none";
|
||||
|
||||
var nav = document.getElementsByClassName("nav")[0];
|
||||
nav.style.width = "";
|
||||
|
||||
var w85 = document.getElementsByClassName("w-85")[0];
|
||||
$(".w-85").css({ "width": "85%"});
|
||||
|
||||
$(".segment > h3").css({"margin-left": "", "width": ""});
|
||||
$(".segment > h3 > a").css({ "display": ""});
|
||||
$(".segment > h3 > a > span").css({"display": ""});
|
||||
|
||||
$(".segment > div").css({"margin-left": "-1rem", "padding": "1rem 0rem 1rem 2rem", "width": "calc(100% - 3rem)"});
|
||||
$(".segment > div > a").css({"margin-left": "auto", "margin-right": ""});
|
||||
}
|
||||
|
||||
function closeNav() {
|
||||
var open = document.getElementById("open");
|
||||
var close = document.getElementById("close");
|
||||
|
||||
close.style.display = "none";
|
||||
open.style.display = "block";
|
||||
|
||||
var nav = document.getElementsByClassName("nav")[0];
|
||||
nav.style.width = "64px";
|
||||
|
||||
var w85 = document.getElementsByClassName("w-85")[0];
|
||||
$(".w-85").css({ "width": "calc(100% - 64px)"});
|
||||
|
||||
$(".segment > h3").css({"margin-left": "0", "width": "100%"});
|
||||
$(".segment > h3 > a").css({"display": "flex"});
|
||||
$(".segment > h3 > a > span").css({"display": "none"});
|
||||
|
||||
$(".segment > div").css({"margin-left": "0", "padding": "1rem 0", "width": "100%"});
|
||||
$(".segment > div > a").css({"margin-left": "auto", "margin-right": "auto"});
|
||||
}
|
||||
</script>
|
||||
@yield("scripts")
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
@endsection
|
||||
|
||||
@section("content")
|
||||
<?php
|
||||
date_default_timezone_set('Europe/Copenhagen');
|
||||
?>
|
||||
<table class="tbl mt-0">
|
||||
<tr>
|
||||
<th>Lokation</th>
|
||||
@@ -19,19 +22,21 @@
|
||||
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
|
||||
</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>
|
||||
<td><form method="post" action="{{ route('washing-reservations.destroy', ['washing_reservation' => $reservation]) }}" class="w-100 nostyle">
|
||||
@csrf
|
||||
@method("delete")
|
||||
@if(date('Y-m-d H:i:s', strtotime('-1 hour')) < $reservation->time)
|
||||
<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>
|
||||
<td><form method="post" action="{{ route('washing-reservations.destroy', ['washing_reservation' => $reservation]) }}" class="w-100 nostyle">
|
||||
@csrf
|
||||
@method("delete")
|
||||
|
||||
<button class="w-100 nostyle" onclick="return confirm('Are you sure you want to delete?');" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
<button class="w-100 nostyle" onclick="return confirm('Are you sure you want to delete?');" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
@endforeach
|
||||
</table>
|
||||
|
||||
|
||||
@@ -4,23 +4,32 @@
|
||||
@endsection
|
||||
|
||||
@section("content")
|
||||
<?php
|
||||
date_default_timezone_set('Europe/Copenhagen');
|
||||
$washingreservations = 0;
|
||||
?>
|
||||
<main style="min-height: calc(100% - 61.34px);">
|
||||
<h2 class="text-center sde-blue mb-0">{{__('msg.dinereservationer')}}</h2>
|
||||
@foreach($reservations as $reservation)
|
||||
<div class="reservation" style="margin: 0 32px 1.75rem 32px;">
|
||||
<h3>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</h3>
|
||||
<div class="row align-items-center">
|
||||
<span style="font-size: 4vw"><b>{{__('msg.tid')}}:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</span>
|
||||
<form class="ml-auto" method="post" action="{{ route("washing-reservations.destroy", [ "washing_reservation" => $reservation ]) }}">
|
||||
@csrf
|
||||
@method("delete")
|
||||
<input type="hidden" name="id" value="{{ $reservation->id }}">
|
||||
<button class="btn btn-sde-blue mb-0" type="submit" onclick="return confirm('Are you sure you want to remove this reservation?');">{{__('msg.fjern')}}</button>
|
||||
</form>
|
||||
@if(date('Y-m-d H:i:s', strtotime('-1 hour')) < $reservation->time)
|
||||
<div class="reservation" style="margin: 0 32px 1.75rem 32px;">
|
||||
<h3>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</h3>
|
||||
<div class="row align-items-center">
|
||||
<span style="font-size: 4vw"><b>{{__('msg.tid')}}:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</span>
|
||||
<form class="ml-auto" method="post" action="{{ route("washing-reservations.destroy", [ "washing_reservation" => $reservation ]) }}">
|
||||
@csrf
|
||||
@method("delete")
|
||||
<input type="hidden" name="id" value="{{ $reservation->id }}">
|
||||
<button class="btn btn-sde-blue mb-0" type="submit" onclick="return confirm('Are you sure you want to remove this reservation?');">{{__('msg.fjern')}}</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
$washingreservations++;
|
||||
?>
|
||||
@endif
|
||||
@endforeach
|
||||
@if(count($reservations) < 1)
|
||||
@if(count($reservations) < 1 || $washingreservations == 0)
|
||||
<p style="margin: 0 18px;">{{__('msg.duharingenreservationer')}}.</p>
|
||||
@else
|
||||
{{ $reservations->links() }}
|
||||
|
||||
Reference in New Issue
Block a user