Org: Displays holidays in occupancy view

TYPE: Feature
LINK: OGC-3255

Author: Daverball

setup.cfg

@@ -114,7 +114,8 @@ install_requires =
     pdfdocument
     pdfrw2
     pdftotext
-    pglast
+    # FIXME: pglast 8 fails to build on CI
+    pglast<8
     phonenumbers
     polib
     psycopg[c]

src/onegov/org/assets/js/occupancycalendar.jsx

@@ -26,6 +26,11 @@ oc.defaultOptions = {
     */
     editable: false,
 
+    /*
+        True if the calendar includes holidays
+    */
+    showHolidays: false,
+
     /*
         Url which returns all available resources in the following format:
         {
@@ -95,7 +100,8 @@ oc.getFullcalendarOptions = function(ocExtendOptions) {
     // the fullcalendar default options
     var options = {
         fc: {
-            allDaySlot: false,
+            allDaySlot: ocOptions.showHolidays,
+            allDayContent: '',
             height: 'auto',
             events: ocOptions.feed,
             slotEventOverlap: false,
@@ -174,6 +180,9 @@ oc.getFullcalendarOptions = function(ocExtendOptions) {
         fcOptions.selectMirror = true;
         fcOptions.unselectCancel = '.popup';
         fcOptions.selectOverlap = function(event) {
+            if (event.extendedProps.kind === 'holiday') {
+                return true;
+            }
             if (event.display === 'background') {
                 oc.overlappingEvents[event.id] = event;
                 return true;
@@ -183,6 +192,9 @@ oc.getFullcalendarOptions = function(ocExtendOptions) {
             }
         };
         fcOptions.selectAllow = function(info) {
+            if (info.allDay) {
+                return false;
+            }
             // we only know what to do if we overlap a single valid allocation
             // we only allow to add blockers in the future
             var keys = Object.keys(oc.overlappingEvents);
@@ -236,14 +248,19 @@ oc.getFullcalendarOptions = function(ocExtendOptions) {
 
         // edit events on drag&drop, resize
         fcOptions.eventOverlap = function(stillEvent, movingEvent) {
-            if (stillEvent.extendedProps.resource !== movingEvent.extendedProps.resource) {
-                // NOTE: This doesn't take into account the hierarchy, so it is a little bit
-                //       too permissive right now. But the backend still covers us.
+            if (stillEvent.display === 'background' || stillEvent.extendedProps.kind === 'holiday') {
                 return true;
             }
-            return stillEvent.display === 'background';
+            // NOTE: This doesn't take into account the hierarchy, so it is a little bit
+            //       too permissive right now. But the backend still covers us.
+            return stillEvent.extendedProps.resource !== movingEvent.extendedProps.resource;
         };
 
+        // disallow dropping events into the allDay slot
+        fcOptions.eventAllow = function(dropInfo, draggedEvent) {
+            return !dropInfo.allDay;
+        }
+
         fcOptions.eventDrop = fcOptions.eventResize = function(info) {
             var event = info.event;
             var url = new Url(event.extendedProps.editurl);
@@ -340,6 +357,9 @@ oc.getFullcalendarOptions = function(ocExtendOptions) {
         var changed = false;
         for (var i = 0; i < events.length; i++) {
             var event = events[i];
+            if (event.extendedProps.kind === 'holiday') {
+                continue;
+            }
             // snap to the start of the hour
             var start = moment(event.start).startOf('hour').format('HH:mm');
             if (start < minTime) {

src/onegov/org/assets/js/occupancycalendar_custom.js

@@ -5,6 +5,7 @@ var setupOccupancyCalendar = function(calendar) {
         minTime: calendar.data('min-time'),
         maxTime: calendar.data('min-time'),
         editable: calendar.data('editable'),
+        showHolidays: calendar.data('show-holidays') || false,
         view: calendar.data('view'),
         date: calendar.data('date'),
         highlights_min: calendar.data('highlights-min'),

src/onegov/org/templates/resource_occupancy.pt

@@ -16,6 +16,7 @@
             data-resource-active="${resource.name}"
             data-stats-url="${stats_url|None}"
             data-pdf-url="${pdf_url|None}"
+            data-show-holidays="${(request.app.org.holidays or request.app.org.has_school_holidays) and 'true' or 'false'}"
         ></div>
 
         <div class="clearfix"></div>

src/onegov/org/views/resource.py

@@ -1407,6 +1407,11 @@ def view_occupancy_json(self: Resource, request: OrgRequest) -> JSON_ro:
 
     blocking_resources = self.blocking_resources()
     return *(
+        holiday.as_dict()
+        for holiday in utils.HolidayEventInfo.from_request(
+            request, start.date(), end.date()
+        )
+    ), *(
         res.as_dict()
         for res in utils.ReservationEventInfo.from_reservations(
             request,

src/onegov/town6/templates/resource_occupancy.pt

@@ -16,6 +16,7 @@
             data-resource-active="${resource.name}"
             data-stats-url="${stats_url|None}"
             data-pdf-url="${pdf_url|None}"
+            data-show-holidays="${(request.app.org.holidays or request.app.org.has_school_holidays) and 'true' or 'false'}"
         ></div>
 
     </tal:b>