diff --git a/public/js/pages/Calendar/View.js b/public/js/pages/Calendar/View.js index 04b427161..178a897ba 100644 --- a/public/js/pages/Calendar/View.js +++ b/public/js/pages/Calendar/View.js @@ -171,6 +171,17 @@ document.addEventListener('DOMContentLoaded', function () { return new Promise(resolve => setTimeout(resolve, ms)); } + const eventSources = []; + eventSources.push(userevents); + eventSources.push(otherevents); + if (visibleCalendars.includes(997)) { + eventSources.push(holiDays); + } + if (visibleCalendars.includes(998)) { + eventSources.push(birthdays); + } + + calendar = new FullCalendar.Calendar(calendarEl, { schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives', timeZone: 'UTC', @@ -333,14 +344,12 @@ document.addEventListener('DOMContentLoaded', function () { let accepted = data.data.accepted.accepted; if (accepted) { const accept = JSON.parse(accepted); - const datetime=new Date(accept.time * 1000); + const datetime = new Date(accept.time * 1000); const germanDateTime = datetime.toLocaleString('de-DE'); $('.accepted-status').addClass('fa-circle-check'); $('.accepted-status').prop('title', accept.user + ' (' + germanDateTime + ')'); $('.event-accepted').text('Akzeptiert'); - } - else - { + } else { $('.accepted-status').addClass('fa-circle-info'); $('.accepted-status').prop('title', 'Termin wurde noch nicht bestÃĪtigt'); $('.event-accepted').text('Offen'); @@ -613,7 +622,7 @@ document.addEventListener('DOMContentLoaded', function () { navLinks: 'true', events: [], height: 800, - eventSources: [userevents, otherevents, holiDays, birthdays], + eventSources: eventSources, resourceOrder: 'order', resources: resources, }); @@ -1734,7 +1743,13 @@ Xinon GMbH`; } }); - calendar.addEventSource(userevents) + calendar.addEventSource(userevents); + if (visibleCalendars.includes(998)) { + calendar.addEventSource(birthdays); + } + if (visibleCalendars.includes(997)) { + calendar.addEventSource(holiDays); + } } ; });