nodebb-plugin-calendar-onekite 11.2.19 → 11.2.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.2.19",
+  "version": "11.2.21",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -95,11 +95,15 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
 
   async function openSpecialEventDialog(selectionInfo) {
     const start = selectionInfo.start;
+    // FullCalendar can omit `end` for certain interactions. Also, for all-day
+    // selections, `end` is exclusive (next day at 00:00). We normalise below
+    // so a single-day click always defaults to a single-day range.
     const end = selectionInfo.end;
 
     // Prefer event times starting at 07:00 for day-clicks (all-day selections).
     let seStart = new Date(start);
-    let seEnd = new Date(end);
+    // If `end` is missing, start with the same day.
+    let seEnd = end ? new Date(end) : new Date(seStart);
 
     const msSpan = seEnd.getTime() - seStart.getTime();
     const isAllDaySelection = selectionInfo && (selectionInfo.allDay || (
@@ -107,19 +111,25 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       seEnd.getHours() === 0 && seEnd.getMinutes() === 0
     ));
 
-    const isSingleDayAllDay = isAllDaySelection && msSpan <= (24 * 60 * 60 * 1000 + 1500);
+    // For all-day selections, the simplest robust check is:
+    // does (end - 1ms) fall on the same calendar day as start?
+    const endMinus1 = isAllDaySelection ? new Date(seEnd.getTime() - 1) : null;
+    const isSingleDayAllDay = isAllDaySelection && (!end || (endMinus1 && toDateInputValue(seStart) === toDateInputValue(endMinus1)));
 
     if (isSingleDayAllDay) {
-      // Keep same day; default start at 07:00 and end at 23:59
+      // Keep same day; default to a "one day" block (07:00 → 07:00).
+      // We keep end date equal to start date in the modal. On submit,
+      // if end <= start we automatically roll end by +1 day.
       seStart.setHours(7, 0, 0, 0);
       seEnd = new Date(seStart);
-      seEnd.setHours(23, 59, 0, 0);
+      seEnd.setHours(7, 0, 0, 0);
     } else if (isAllDaySelection) {
-      // Multi-day all-day selection: start at 07:00 on first day, end at 23:59 on last day
+      // Multi-day all-day selection: start at 07:00 on first day, end at 07:00 on last day
+      // (end date shown is the last selected day; submit logic will roll if needed).
       seStart.setHours(7, 0, 0, 0);
-      const lastDay = new Date(seEnd.getTime() - 24 * 60 * 60 * 1000);
+      const lastDay = endMinus1 ? new Date(endMinus1) : new Date(seEnd);
       seEnd = new Date(lastDay);
-      seEnd.setHours(23, 59, 0, 0);
+      seEnd.setHours(7, 0, 0, 0);
     } else {
       seStart = roundTo5Minutes(seStart);
       seEnd = roundTo5Minutes(seEnd);
@@ -180,6 +190,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     `;
 
     return await new Promise((resolve) => {
+      let resolved = false;
       const dialog = bootbox.dialog({
         title: 'Créer un évènement',
         message: html,
@@ -187,7 +198,10 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           cancel: {
             label: 'Annuler',
             className: 'btn-secondary',
-            callback: () => resolve(null),
+            callback: () => {
+              resolved = true;
+              resolve(null);
+            },
           },
           ok: {
             label: 'Créer',
@@ -198,12 +212,35 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
               const st = (document.getElementById('onekite-se-start-time')?.value || '').trim();
               const ed = (document.getElementById('onekite-se-end-date')?.value || '').trim();
               const et = (document.getElementById('onekite-se-end-time')?.value || '').trim();
-              const startVal = (sd && st) ? buildLocalIso(sd, st) : '';
-              const endVal = (ed && et) ? buildLocalIso(ed, et) : '';
+              // If the user keeps the same day but chooses an end time earlier than
+              // (or equal to) the start time (default 07:00 → 07:00), interpret
+              // it as an overnight/24h range and roll the end date by +1 day.
+              let startVal = '';
+              let endVal = '';
+              try {
+                if (sd && st) {
+                  const startDt = new Date(`${sd}T${st}`);
+                  startVal = startDt.toISOString();
+                  if (ed && et) {
+                    let endDt = new Date(`${ed}T${et}`);
+                    if (!isNaN(startDt) && !isNaN(endDt) && endDt.getTime() <= startDt.getTime()) {
+                      // Only auto-roll when user kept the same end date.
+                      if (ed === sd) {
+                        endDt = new Date(endDt.getTime() + 24 * 60 * 60 * 1000);
+                      }
+                    }
+                    endVal = endDt.toISOString();
+                  }
+                }
+              } catch (e) {
+                startVal = (sd && st) ? buildLocalIso(sd, st) : '';
+                endVal = (ed && et) ? buildLocalIso(ed, et) : '';
+              }
               const address = (document.getElementById('onekite-se-address')?.value || '').trim();
               const notes = (document.getElementById('onekite-se-notes')?.value || '').trim();
               const lat = (document.getElementById('onekite-se-lat')?.value || '').trim();
               const lon = (document.getElementById('onekite-se-lon')?.value || '').trim();
+              resolved = true;
               resolve({ title, start: startVal, end: endVal, address, notes, lat, lon });
               return true;
             },
@@ -211,6 +248,19 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         },
       });
 
+      // If the modal is closed via ESC, backdrop click, or the "X" button,
+      // Bootbox does not trigger our cancel callback. Ensure we always resolve
+      // and release the global lock.
+      try {
+        dialog.on('hidden.bs.modal', () => {
+          if (resolved) return;
+          resolved = true;
+          resolve(null);
+        });
+      } catch (e) {
+        // ignore
+      }
+
       // init leaflet
       dialog.on('shown.bs.modal', () => {
       setTimeout(async () => {
@@ -222,7 +272,6 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           const map = L.map(mapEl).setView([46.5, 2.5], 5);
           L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { maxZoom: 19, attribution: '&copy; OpenStreetMap' }).addTo(map);
           setTimeout(() => { try { map.invalidateSize(); } catch (e) {} }, 100);
-        setTimeout(() => { try { map.invalidateSize(); } catch (e) {} }, 100);
           let marker = null;
           function setMarker(lat, lon) {
             if (marker) map.removeLayer(marker);
@@ -937,6 +986,10 @@ function toDatetimeLocalValue(date) {
           const mapped = (Array.isArray(data) ? data : []).map((ev) => {
             try {
               if (ev && ev.extendedProps && ev.extendedProps.type === 'special' && ev.start && ev.end) {
+                // Force the same visual layout as reservations in month view
+                // (avoid the "dot" layout which introduces a leading gap).
+                ev.display = 'block';
+
                 const s = new Date(ev.start);
                 const e = new Date(ev.end);
                 const ts = `${pad2(s.getHours())}:${pad2(s.getMinutes())}`;
@@ -980,7 +1033,6 @@ function toDatetimeLocalValue(date) {
         try {
           if (mode === 'special' && canCreateSpecial) {
             const payload = await openSpecialEventDialog(info);
-            setMode('reservation');
             if (!payload) {
               calendar.unselect();
               isDialogOpen = false;
@@ -996,6 +1048,7 @@ function toDatetimeLocalValue(date) {
               });
             });
             showAlert('success', 'Évènement créé.');
+            setMode('reservation');
             calendar.refetchEvents();
             calendar.unselect();
             isDialogOpen = false;
@@ -1070,13 +1123,12 @@ function toDatetimeLocalValue(date) {
           }
           isDialogOpen = true;
           try {
-            // Default to a same-day event in local time: 07:00 -> 23:59
+            // Default to a one-day block: 07:00 -> 07:00 (end rolled to +1 day on submit).
             const start2 = new Date(start);
             start2.setHours(7, 0, 0, 0);
             const end2 = new Date(start);
-            end2.setHours(23, 59, 0, 0);
+            end2.setHours(7, 0, 0, 0);
             const payload = await openSpecialEventDialog({ start: start2, end: end2, allDay: false });
-            setMode('reservation');
             if (!payload) {
               isDialogOpen = false;
               return;
@@ -1090,6 +1142,7 @@ function toDatetimeLocalValue(date) {
                 body: JSON.stringify(payload),
               });
             });
+            setMode('reservation');
             showAlert('success', 'Évènement créé.');
             calendar.refetchEvents();
           } finally {