nodebb-plugin-onekite-calendar 2.0.6 → 2.0.8

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog – calendar-onekite
 
+## 1.2.15
+- Réservations (Durée rapide) : génération des évènements all-day basée sur startDate/endDate (YYYY-MM-DD) quand disponibles, pour éviter tout décalage lié à toISOString() (UTC) et empêcher un grisé « non disponible » le jour suivant.
+
+## 1.2.14
+- Réservations : correction d’un faux chevauchement (problème 1h) quand FullCalendar envoie des bornes all-day à minuit UTC (Z / +00:00) — le lendemain n’est plus marqué « non disponible ».
+
 ## 1.2.13
 - ACP (mode sombre) : correction de la visibilité de la liste d’autocomplete d’adresse (couleurs via variables Bootstrap)
 

package/lib/api.js

@@ -214,6 +214,20 @@ function toTs(v) {
   const s = String(v).trim();
   if (/^[0-9]+$/.test(s)) return parseInt(s, 10);
 
+  // IMPORTANT (all-day boundaries / FullCalendar):
+  // Depending on FullCalendar config (or how dates are built), all-day range
+  // boundaries can arrive as an ISO string at **midnight UTC** (Z or +00:00).
+  // Example: 2026-01-11T00:00:00.000Z
+  // In Europe/Paris this is 01:00 local, which makes consecutive all-day ranges
+  // appear to overlap by 1 hour and wrongly marks the next day as unavailable.
+  // When we detect a midnight-UTC boundary, we treat it as a calendar date and
+  // convert to **local midnight** for overlap computations.
+  const mUtcMidnight = /^((\d{4}-\d{2}-\d{2}))T00:00:00(?:\.\d{1,3})?(?:Z|\+00:00)$/.exec(s);
+  if (mUtcMidnight && mUtcMidnight[1]) {
+    const dLocal = new Date(mUtcMidnight[1] + 'T00:00:00');
+    return dLocal.getTime();
+  }
+
   // IMPORTANT: Date-only strings like "2026-01-09" are interpreted as UTC by JS Date(),
   // which can create 1h overlaps in Europe/Paris (and other TZs) between consecutive days.
   // We treat date-only inputs as local-midnight by appending a time component.
@@ -342,8 +356,22 @@ function eventsFor(resv) {
   const status = resv.status;
   const icons = { pending: '⏳', awaiting_payment: '💳', paid: '✅' };
   const colors = { pending: '#f39c12', awaiting_payment: '#d35400', paid: '#27ae60' };
-  const startIsoDate = new Date(parseInt(resv.start, 10)).toISOString().slice(0, 10);
-  const endIsoDate = new Date(parseInt(resv.end, 10)).toISOString().slice(0, 10);
+  // IMPORTANT:
+  // Prefer stored date-only strings when available.
+  //
+  // Rationale: when reservations are stored as local-midnight timestamps (because
+  // the client sends YYYY-MM-DD), converting those timestamps with toISOString()
+  // shifts the date in Europe/Paris (UTC+1/+2) and can make ranges appear to
+  // overlap the following day in some UI flows (notably "Durée rapide").
+  //
+  // FullCalendar expects `end` to be EXCLUSIVE for all-day ranges, so we keep
+  // using the stored endDate as-is.
+  const startIsoDate = (resv.startDate && /^\d{4}-\d{2}-\d{2}$/.test(String(resv.startDate)))
+    ? String(resv.startDate)
+    : new Date(parseInt(resv.start, 10)).toISOString().slice(0, 10);
+  const endIsoDate = (resv.endDate && /^\d{4}-\d{2}-\d{2}$/.test(String(resv.endDate)))
+    ? String(resv.endDate)
+    : new Date(parseInt(resv.end, 10)).toISOString().slice(0, 10);
 
   const itemIds = Array.isArray(resv.itemIds) ? resv.itemIds : (resv.itemId ? [resv.itemId] : []);
   const itemNames = Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "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.6"
+  "version": "2.0.8"
 }