nodebb-plugin-onekite-calendar 2.0.15 → 2.0.16

package/CHANGELOG.md

@@ -114,3 +114,7 @@
 - Mobile: ajout d’un bouton flottant (FAB) sur la page calendrier uniquement.
 - Le FAB ouvre une mini-modale de sélection de dates (dd/mm/yyyy) puis ouvre la modale standard de réservation.
 - Le FAB est automatiquement retiré quand on navigue hors de la page calendrier.
+
+## 1.3.10
+- Widget : ne pas afficher le statut « Payée » pour les sorties gratuites (validateurs).
+- Modale réservation : affichage de la période corrigé (fin affichée inclusive, fin stockée exclusive).

package/lib/widgets.js

@@ -319,7 +319,15 @@ dateClick: function() { window.location.href = calUrl; },
             const k = String(s || '');
             return map[k] || '';
           });
-          const status = (String(ep.type || '') === 'reservation') ? statusLabel(ep.status) : '';
+          let status = (String(ep.type || '') === 'reservation') ? statusLabel(ep.status) : '';
+          // Do not display "Payée" for free validator rentals.
+          // Free rentals are marked with extendedProps.isFree === true.
+          try {
+            const isFree = !!(ep && (ep.isFree === true || String(ep.isFree) === 'true'));
+            if (isFree && String(ep.status) === 'paid') {
+              status = '';
+            }
+          } catch (e) {}
           const reservedBy = (String(ep.type || '') === 'reservation') ? String(ep.reservedByUsername || '') : '';
           const html = '' +
             '<div style="font-weight:600; margin-bottom:2px;">' + escapeHtml(title) + '</div>' +

package/package.json

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

package/pkg/package/CHANGELOG.md

@@ -110,3 +110,7 @@
 - Mobile: ajout d’un bouton flottant (FAB) sur la page calendrier uniquement.
 - Le FAB ouvre une mini-modale de sélection de dates (dd/mm/yyyy) puis ouvre la modale standard de réservation.
 - Le FAB est automatiquement retiré quand on navigue hors de la page calendrier.
+
+## 1.3.10
+- Widget : ne pas afficher le statut « Payée » pour les sorties gratuites (validateurs).
+- Modale réservation : affichage de la période corrigé (fin affichée inclusive, fin stockée exclusive).

package/pkg/package/lib/widgets.js

@@ -319,7 +319,15 @@ dateClick: function() { window.location.href = calUrl; },
             const k = String(s || '');
             return map[k] || '';
           });
-          const status = (String(ep.type || '') === 'reservation') ? statusLabel(ep.status) : '';
+          let status = (String(ep.type || '') === 'reservation') ? statusLabel(ep.status) : '';
+          // Do not display "Payée" for free validator rentals.
+          // Free rentals are marked with extendedProps.isFree === true.
+          try {
+            const isFree = !!(ep && (ep.isFree === true || String(ep.isFree) === 'true'));
+            if (isFree && String(ep.status) === 'paid') {
+              status = '';
+            }
+          } catch (e) {}
           const reservedBy = (String(ep.type || '') === 'reservation') ? String(ep.reservedByUsername || '') : '';
           const html = '' +
             '<div style="font-weight:600; margin-bottom:2px;">' + escapeHtml(title) + '</div>' +

package/pkg/package/package.json

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

package/pkg/package/public/client.js

@@ -967,8 +967,26 @@ function toDatetimeLocalValue(date) {
       `;
     })();
 
+    // UI display: end is stored/processed as EXCLUSIVE, but humans expect an inclusive end date.
+    function endInclusiveForDisplay(startDate, endExclusive) {
+      try {
+        const e = new Date(endExclusive);
+        // Subtract one day to display the last included day.
+        e.setDate(e.getDate() - 1);
+        // Guard: never display an end before start.
+        if (e < startDate) {
+          return new Date(startDate);
+        }
+        return e;
+      } catch (e) {
+        return new Date(startDate);
+      }
+    }
+
+    const endDisplay = endInclusiveForDisplay(start, end);
+
     const messageHtml = `
-      <div class="mb-2" id="onekite-period"><strong>Période</strong><br>${formatDt(start)} → ${formatDt(end)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span></div>
+      <div class="mb-2" id="onekite-period"><strong>Période</strong><br>${formatDt(start)} → ${formatDt(endDisplay)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span></div>
       ${shortcutsHtml}
       <div class="mb-2"><strong>Matériel</strong></div>
       <div id="onekite-items" class="mb-2" style="max-height: 320px; overflow: auto; border: 1px solid var(--bs-border-color, #ddd); border-radius: 6px; padding: 6px;">
@@ -1098,7 +1116,8 @@ function toDatetimeLocalValue(date) {
               daysEl.textContent = `(${days} jour${days > 1 ? 's' : ''})`;
             }
             if (periodEl) {
-              periodEl.innerHTML = `<strong>Période</strong><br>${formatDt(start)} → ${formatDt(end)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span>`;
+              const endDisp = endInclusiveForDisplay(start, end);
+              periodEl.innerHTML = `<strong>Période</strong><br>${formatDt(start)} → ${formatDt(endDisp)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span>`;
             }
             // Toggle active button
             shortcutsWrap.querySelectorAll('button[data-days]').forEach((b) => b.classList.toggle('active', b === btn));

package/plugin.json

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

package/public/client.js

@@ -967,8 +967,26 @@ function toDatetimeLocalValue(date) {
       `;
     })();
 
+    // UI display: end is stored/processed as EXCLUSIVE, but humans expect an inclusive end date.
+    function endInclusiveForDisplay(startDate, endExclusive) {
+      try {
+        const e = new Date(endExclusive);
+        // Subtract one day to display the last included day.
+        e.setDate(e.getDate() - 1);
+        // Guard: if something goes weird, never display an end before start.
+        if (e < startDate) {
+          return new Date(startDate);
+        }
+        return e;
+      } catch (e) {
+        return new Date(startDate);
+      }
+    }
+
+    const endDisplay = endInclusiveForDisplay(start, end);
+
     const messageHtml = `
-      <div class="mb-2" id="onekite-period"><strong>Période</strong><br>${formatDt(start)} → ${formatDt(end)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span></div>
+      <div class="mb-2" id="onekite-period"><strong>Période</strong><br>${formatDt(start)} → ${formatDt(endDisplay)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span></div>
       ${shortcutsHtml}
       <div class="mb-2"><strong>Matériel</strong></div>
       <div id="onekite-items" class="mb-2" style="max-height: 320px; overflow: auto; border: 1px solid var(--bs-border-color, #ddd); border-radius: 6px; padding: 6px;">
@@ -1098,7 +1116,8 @@ function toDatetimeLocalValue(date) {
               daysEl.textContent = `(${days} jour${days > 1 ? 's' : ''})`;
             }
             if (periodEl) {
-              periodEl.innerHTML = `<strong>Période</strong><br>${formatDt(start)} → ${formatDt(end)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span>`;
+              const endDisp = endInclusiveForDisplay(start, end);
+              periodEl.innerHTML = `<strong>Période</strong><br>${formatDt(start)} → ${formatDt(endDisp)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span>`;
             }
             // Toggle active button
             shortcutsWrap.querySelectorAll('button[data-days]').forEach((b) => b.classList.toggle('active', b === btn));