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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2020-08-31 10:57:31 +02:00
parent 7b157fcd90 59bd705d89
commit 10bd0c021c
1 changed files with 8 additions and 5 deletions
skolehjem/resources/views/app/washing-reservations
create.blade.php

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

@ -86,8 +86,6 @@
let date = moment().locale("da").day(weekDay).week(week);
var datetext = moment().locale("da").day(weekDay).week(week).year() + "-" + prependZero((moment().locale("da").day(weekDay).week(week).month() + 1)) + "-" + prependZero(moment().locale("da").day(weekDay).week(week).date());
let dayHolder = document.createElement("div");
dayHolder.classList.add("calendar-table__col");
@ -95,6 +93,11 @@
day.classList.add("calendar-table__item");
day.innerText = date.date();
//If any date is selected, Add selected class to the selected day
if(momentDate !== null)
if(date.diff(momentDate, 'hours') == 0)
dayHolder.classList.add("selected");
dayHolder.appendChild(day);
//If date hasn't already happened
@ -175,7 +178,7 @@
fillMachines(data["washingmachines"], machine_id);
//Fill events (times) and remove unavailable_times
fillTimes(data["unavailable_times"], datetext);
fillTimes(data["unavailable_times"], datetext, date);
});
}
@ -281,7 +284,7 @@
}
//Fill events (times) and remove unavailable_times
function fillTimes(unavailable_times, datetext) {
function fillTimes(unavailable_times, datetext, date) {
var element;
//If a events (times) select exists, set element to the select element
@ -311,7 +314,7 @@
//Add times 8:00-20:00
for (let hour = 8; hour < 20; hour++) {
if(hour < new Date().getHours())
if(hour < new Date().getHours() && moment().locale("da").diff(date, 'hours') == 0)
continue;
let value = datetext + " " + prependZero(hour) + ":00:00";