nodebb-plugin-onekite-calendar 2.0.9 → 2.0.11

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog – calendar-onekite
 
+## 1.2.18
+- API events + anti double booking : les tests de chevauchement utilisent désormais en priorité startDate/endDate (YYYY-MM-DD) quand disponibles (logique calendaire pure, endDate exclusive). Cela supprime définitivement les faux chevauchements liés aux timestamps/fuseaux/DST, notamment sur mobile et « Durée rapide ».
+
+## 1.2.17
+- Modale réservation : la requête de disponibilité initiale utilise aussi des dates calendaires (YYYY-MM-DD) au lieu de startStr/endStr/toISOString(), ce qui corrige le grisé erroné (mobile + durée rapide).
+
 ## 1.2.16
 - Modale réservation (Durée rapide) : correction du grisé erroné des matériels réservés la veille. Les requêtes de disponibilité utilisent désormais des dates calendaires (YYYY-MM-DD) au lieu de toISOString() (UTC), pour éviter tout faux chevauchement lié au fuseau/DST.
 

package/lib/api.js

@@ -445,8 +445,17 @@ function computeEtag(payload) {
 }
 
 api.getEvents = async function (req, res) {
-  const startTs = toTs(req.query.start) || 0;
-  const endTs = toTs(req.query.end) || (Date.now() + 365 * 24 * 3600 * 1000);
+  const qStartRaw = (req && req.query && req.query.start !== undefined) ? String(req.query.start).trim() : '';
+  const qEndRaw = (req && req.query && req.query.end !== undefined) ? String(req.query.end).trim() : '';
+
+  // If the client provides date-only strings (YYYY-MM-DD), prefer purely calendar-based
+  // overlap checks. This avoids any dependency on server timezone, user timezone, DST,
+  // or how JS Date() parses inputs.
+  const qStartYmd = (/^\d{4}-\d{2}-\d{2}$/.test(qStartRaw)) ? qStartRaw : null;
+  const qEndYmd = (/^\d{4}-\d{2}-\d{2}$/.test(qEndRaw)) ? qEndRaw : null;
+
+  const startTs = toTs(qStartRaw) || 0;
+  const endTs = toTs(qEndRaw) || (Date.now() + 365 * 24 * 3600 * 1000);
 
   const settings = await meta.settings.get('calendar-onekite');
   const canMod = req.uid ? await canValidate(req.uid, settings) : false;
@@ -494,9 +503,19 @@ api.getEvents = async function (req, res) {
     }
     // Only show active statuses
     if (!['pending', 'awaiting_payment', 'paid'].includes(r.status)) continue;
-    const rStart = parseInt(r.start, 10);
-    const rEnd = parseInt(r.end, 10);
-    if (!(rStart < endTs && startTs < rEnd)) continue; // overlap check
+    // Overlap check
+    // Prefer date-only strings (YYYY-MM-DD) for 100% reliable calendar-day logic.
+    const rStartYmd = (r.startDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.startDate))) ? String(r.startDate) : null;
+    const rEndYmd = (r.endDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.endDate))) ? String(r.endDate) : null;
+
+    if (qStartYmd && qEndYmd && rStartYmd && rEndYmd) {
+      // endDate is EXCLUSIVE (FullCalendar rule): overlap iff aStart < bEnd && bStart < aEnd
+      if (!(rStartYmd < qEndYmd && qStartYmd < rEndYmd)) continue;
+    } else {
+      const rStart = parseInt(r.start, 10);
+      const rEnd = parseInt(r.end, 10);
+      if (!(rStart < endTs && startTs < rEnd)) continue;
+    }
     const evs = eventsFor(r);
     for (const ev of evs) {
       const p = ev.extendedProps || {};
@@ -822,9 +841,16 @@ api.createReservation = async function (req, res) {
   const existingRows = await dbLayer.getReservations(candidateIds);
   for (const existing of (existingRows || [])) {
     if (!existing || !blocking.has(existing.status)) continue;
-    const exStart = parseInt(existing.start, 10);
-    const exEnd = parseInt(existing.end, 10);
-    if (!(exStart < end && start < exEnd)) continue;
+    const exStartYmd = (existing.startDate && /^\d{4}-\d{2}-\d{2}$/.test(String(existing.startDate))) ? String(existing.startDate) : null;
+    const exEndYmd = (existing.endDate && /^\d{4}-\d{2}-\d{2}$/.test(String(existing.endDate))) ? String(existing.endDate) : null;
+    if (startDate && endDate && exStartYmd && exEndYmd) {
+      // endDate is EXCLUSIVE: overlap iff aStart < bEnd && bStart < aEnd
+      if (!(exStartYmd < endDate && startDate < exEndYmd)) continue;
+    } else {
+      const exStart = parseInt(existing.start, 10);
+      const exEnd = parseInt(existing.end, 10);
+      if (!(exStart < end && start < exEnd)) continue;
+    }
     const exItemIds = Array.isArray(existing.itemIds) ? existing.itemIds : (existing.itemId ? [existing.itemId] : []);
     const shared = exItemIds.filter(x => itemIds.includes(String(x)));
     if (shared.length) {

package/package.json

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

package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "2.0.9"
+  "version": "2.0.11"
 }

package/public/client.js

@@ -837,6 +837,13 @@ function toDatetimeLocalValue(date) {
     const start = selectionInfo.start;
     let end = selectionInfo.end;
 
+    // In some FullCalendar flows (notably on mobile), selectionInfo.end can be undefined.
+    // For all-day bookings, end is always treated as EXCLUSIVE.
+    if (!end) {
+      end = new Date(start);
+      end.setDate(end.getDate() + 1);
+    }
+
     // Days (end is exclusive in FullCalendar) — compute in calendar days only
     // (no dependency on hours, timezone or DST).
     let days = calendarDaysExclusive(start, end);
@@ -844,9 +851,13 @@ function toDatetimeLocalValue(date) {
     // Fetch existing events overlapping the selection to disable already reserved items.
     let blocked = new Set();
     try {
+      // IMPORTANT: never use toISOString() for availability checks.
+      // Local midnight in Europe/Paris becomes 23:00Z/22:00Z depending on DST, which makes
+      // consecutive all-day ranges appear to overlap and wrongly greys out items.
+      // Always query using calendar dates (YYYY-MM-DD) with end exclusive.
       const qs = new URLSearchParams({
-        start: (selectionInfo.startStr || (start instanceof Date ? start.toISOString() : String(start))),
-        end: (selectionInfo.endStr || (end instanceof Date ? end.toISOString() : String(end))),
+        start: toLocalYmd(start),
+        end: toLocalYmd(end),
       });
       const evs = await fetchJson(`/api/v3/plugins/calendar-onekite/events?${qs.toString()}`);
       (evs || []).forEach((ev) => {