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

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

This commit is contained in:
Neerholt 2020-08-18 12:33:12 +02:00
parent d851354086 ddbc3b8b60
commit 70437aaffa
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
skolehjem/app/Http/Controllers/LocationController.php
View File

@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use App\Location;
use App\WashingMachine;
use App\WashingReservation;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@ -130,12 +131,21 @@ class LocationController extends Controller
*/
public function destroy($id)
{
$locations = Location::find($id);
$location = Location::find($id);
$washingMachines = WashingMachine::query()->where('location_id', '=', $id)->get();
$washingMachines = WashingMachine::query()->where('location_id', '=', $id);
$washingMachines->delete();
foreach ($washingMachines as $machine) {
$washingReservations = WashingReservation::query()->where('machine_id', '=', $machine->id)->get();
$locations->delete();
foreach ($washingReservations as $reservation)
{
$reservation->delete();
}
$machine->delete();
}
$location->delete();
return redirect()->route("locations.index");
}

1
skolehjem/public/js/da.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,d){"object"==typeof exports&&"undefined"!=typeof module&&"function"==typeof require?d(require("../moment")):"function"==typeof define&&define.amd?define(["../moment"],d):d(e.moment)}(this,function(e){"use strict";return e.defineLocale("da",{months:"januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"søn_man_tir_ons_tor_fre_lør".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd [d.] D. MMMM YYYY [kl.] HH:mm"},calendar:{sameDay:"[i dag kl.] LT",nextDay:"[i morgen kl.] LT",nextWeek:"på dddd [kl.] LT",lastDay:"[i går kl.] LT",lastWeek:"[i] dddd[s kl.] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s siden",s:"få sekunder",ss:"%d sekunder",m:"et minut",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dage",M:"en måned",MM:"%d måneder",y:"et år",yy:"%d år"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}})});

2
skolehjem/public/js/moment-with-locales.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

9
skolehjem/resources/views/app/vagttelefons/index.blade.php
View File

@ -7,7 +7,10 @@
<main style="justify-content: unset">
<img class="mt-3" src="{{ URL::asset('/images/icons/Vagttelefon-normal.svg') }}" alt="Vagttelefon" style="height: 16vw;">
<h1 class="text-center sde-blue mt-0">{{__('msg.vagttelefon')}}</h1>
<p class="mt-0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
<p class="mt-0 mb-0">Den kan bruges i dagtimerne til almindelig kontakt om ting vedrørende kollegiet.</p>
<p class="mt-0">(Det er også det nummer div. kontaktpersoner og vejledere ringer på)</p>
<p class="mt-0 mb-0">Ellers kan Vagttelefonen kontaktes, af eleverne, ”efter lukketid” dvs. 22.30 til 07.00.</p>
<p class="mt-0">I det tidsrum har nattevagten den på sig.</p>
<label class="toggle">
<input class="toggle__input" type="checkbox" name="accept" id="input" onclick="check()">
<span class="toggle__label sde-blue">
@ -25,10 +28,10 @@
var checkBox = document.getElementById("input");
var btn = document.getElementById("call");
if (checkBox.checked == true){
btn.href = "";
btn.href = "tel:+4524629450";
btn.classList.remove("btn-disabled");
} else {
btn.href = "tel:+4556304566";
btn.href = "";
btn.classList.add("btn-disabled");
}
}

4
skolehjem/resources/views/app/washing-reservations/create.blade.php
View File

@ -42,8 +42,8 @@
@endsection
@section("scripts")
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.27.0/moment-with-locales.min.js" integrity="sha512-qSnlnyh7EcD3vTqRoSP4LYsy2yVuqqmnkM9tW4dWo6xvAoxuVXyM36qZK54fyCmHoY1iKi9FJAUZrlPqmGNXFw==" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.27.0/locale/da.min.js" integrity="sha512-rybyYvSnwg3zAZ/vjTTMoh8tOK0Z6tC2XCzr9e27M0xr8WU40IGo6SOP7FXXCyWgMyd3wZ8ln2nY4ce1ysYUfw==" crossorigin="anonymous"></script>
<script src="{{ asset("/js/moment-with-locales.min.js") }}"></script>
<script src="{{ asset("/js/da.min.js") }}"></script>
<script>
function generateCalendar(weekOffset = 0) {
const week = (moment().week() + weekOffset);