nodebb-plugin-calendar-onekite 11.2.11 → 11.2.13

package/package.json

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

package/public/client.js

@@ -101,17 +101,25 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     let seStart = new Date(start);
     let seEnd = new Date(end);
 
-    const isAllDayClick = selectionInfo && (selectionInfo.allDay || (
+    const msSpan = seEnd.getTime() - seStart.getTime();
+    const isAllDaySelection = selectionInfo && (selectionInfo.allDay || (
       seStart.getHours() === 0 && seStart.getMinutes() === 0 &&
-      seEnd.getHours() === 0 && seEnd.getMinutes() === 0 &&
-      Math.abs(seEnd.getTime() - seStart.getTime() - 24 * 60 * 60 * 1000) < 1000
+      seEnd.getHours() === 0 && seEnd.getMinutes() === 0
     ));
 
-    if (isAllDayClick) {
+    const isSingleDayAllDay = isAllDaySelection && msSpan <= (24 * 60 * 60 * 1000 + 1500);
+
+    if (isSingleDayAllDay) {
       // Keep same day; default start at 07:00 and end at 23:59
       seStart.setHours(7, 0, 0, 0);
       seEnd = new Date(seStart);
       seEnd.setHours(23, 59, 0, 0);
+    } else if (isAllDaySelection) {
+      // Multi-day all-day selection: start at 07:00 on first day, end at 23:59 on last day
+      seStart.setHours(7, 0, 0, 0);
+      const lastDay = new Date(seEnd.getTime() - 24 * 60 * 60 * 1000);
+      seEnd = new Date(lastDay);
+      seEnd.setHours(23, 59, 0, 0);
     } else {
       seStart = roundTo5Minutes(seStart);
       seEnd = roundTo5Minutes(seEnd);
@@ -783,6 +791,8 @@ function toDatetimeLocalValue(date) {
 
     // Current creation mode: reservation (location) or special (event)
     let mode = 'reservation';
+    // Avoid showing the "mode évènement" hint multiple times (desktop + mobile handlers)
+    let lastModeHintAt = 0;
         function refreshDesktopModeButton() {
           try {
             const btn = document.querySelector('#onekite-calendar .fc-newSpecial-button');
@@ -807,7 +817,11 @@ function toDatetimeLocalValue(date) {
           // Reset any pending selection/dialog state when switching modes
           try { if (mode === 'reservation') { calendar.unselect(); isDialogOpen = false; } } catch (e) {}
           if (mode === 'special') {
-            showAlert('info', 'Mode évènement : sélectionnez une date ou une plage');
+            const now = Date.now();
+            if (now - lastModeHintAt > 1200) {
+              lastModeHintAt = now;
+              showAlert('success', 'Mode évènement : sélectionnez une date ou une plage');
+            }
           }
           refreshDesktopModeButton();
           try {
@@ -904,9 +918,6 @@ function toDatetimeLocalValue(date) {
           text: 'Évènement',
           click: () => {
             setMode((mode === 'special') ? 'reservation' : 'special');
-            if (mode === 'special') {
-              showAlert('success', 'Mode évènement : sélectionne une plage (date/heure) sur le calendrier.');
-            }
           },
         },
       } : {},
@@ -935,6 +946,18 @@ function toDatetimeLocalValue(date) {
               el2.style.borderColor = '#8e44ad';
               el2.style.color = '#ffffff';
             }
+
+            // Improve readability: show a clock icon before the time and a dash after it.
+            // Example: "🕒 07:00 - Titre"
+            try {
+              const timeEl = arg.el && arg.el.querySelector && arg.el.querySelector('.fc-event-time');
+              if (timeEl && typeof timeEl.textContent === 'string') {
+                const t = timeEl.textContent.trim();
+                if (t && !t.startsWith('🕒')) {
+                  timeEl.textContent = `🕒 ${t} -`;
+                }
+              }
+            } catch (e2) {}
           }
         } catch (e) {}
       },
@@ -1487,9 +1510,6 @@ function toDatetimeLocalValue(date) {
           modeBtn.addEventListener('click', () => {
             setMode((mode === 'special') ? 'reservation' : 'special');
             refreshModeBtn();
-            if (mode === 'special') {
-              showAlert('success', 'Mode évènement : sélectionne une plage (date/heure) sur le calendrier.');
-            }
           });
           refreshModeBtn();
           controls.appendChild(modeBtn);