Commit 2a67f216 authored by Michael Koch's avatar Michael Koch
Browse files

Forgot some.

parent 9df14fd6
......@@ -312,7 +312,7 @@ function fillLandingCalendar() {
_calendars.landing.batchRendering(() => {
$.each(_events.confirmed, (i, e) => {
_calendars.landing.addEvent({
title: e.room.shortname.substring(0,3).toUpperCase() + " - " + e.subject + " (" + e.contact.name + ")",
title: e.room.room_type === 5 ? 'StudySpace - ' + e.contact.name : e.room.shortname.substring(0,3).toUpperCase() + " - " + e.subject + " (" + e.contact.name + ")",
start: dayjs(e.event.from).$d,
end: dayjs(e.event.to).$d,
color: e.room.calendar_color_confirmed,
......@@ -324,20 +324,22 @@ function fillLandingCalendar() {
reservation: e
}
});
_calendars.landing.addEvent({
title: '',
start: dayjs(e.preparation.from).$d,
end: dayjs(e.preparation.to).$d,
color: e.room.calendar_color_confirmed,
textColor: _isColorLight(e.room.calendar_color_confirmed) ? '#000000' : '#ffffff',
rendering: 'background',
extendedProps: {
confirmed: true,
timeslot: 'preparation',
room: e.room,
reservation: e
}
});
if (_validateDate(e.preparation.from)) {
_calendars.landing.addEvent({
title: '',
start: dayjs(e.preparation.from).$d,
end: dayjs(e.preparation.to).$d,
color: e.room.calendar_color_confirmed,
textColor: _isColorLight(e.room.calendar_color_confirmed) ? '#000000' : '#ffffff',
rendering: 'background',
extendedProps: {
confirmed: true,
timeslot: 'preparation',
room: e.room,
reservation: e
}
});
}
});
});
......@@ -473,20 +475,22 @@ function fillFrontendCalendar() {
reservation: e
}
});
_calendars.frontend.addEvent({
title: '',
start: dayjs(e.preparation.from).$d,
end: dayjs(e.preparation.to).$d,
color: e.room.calendar_color_confirmed,
textColor: _isColorLight(e.room.calendar_color_confirmed) ? '#000000' : '#ffffff',
rendering: 'background',
extendedProps: {
confirmed: true,
timeslot: 'preparation',
room: e.room,
reservation: e
}
});
if (_validateDate(e.preparation.from)) {
_calendars.frontend.addEvent({
title: '',
start: dayjs(e.preparation.from).$d,
end: dayjs(e.preparation.to).$d,
color: e.room.calendar_color_confirmed,
textColor: _isColorLight(e.room.calendar_color_confirmed) ? '#000000' : '#ffffff',
rendering: 'background',
extendedProps: {
confirmed: true,
timeslot: 'preparation',
room: e.room,
reservation: e
}
});
}
});
asyncs_done++;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment