nodebb-plugin-calendar-onekite 11.2.7 → 11.2.9

package/lib/api.js

@@ -387,7 +387,7 @@ api.getItems = async function (req, res) {
     clientSecret: settings.helloassoClientSecret,
   });
     if (!token) {
-      console.warn('[calendar-onekite] HelloAsso access token not obtained (approve API)', { rid });
+      console.warn('[calendar-onekite] HelloAsso access token not obtained (items API)', { uid: req.uid || 0 });
     }
 
   if (!token) {

package/package.json

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

package/public/client.js

@@ -64,8 +64,17 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     return `${pad2(d.getHours())}:${pad2(d.getMinutes())}`;
   }
 
-  function buildLocalDatetime(dateStr, timeStr) {
-    return `${dateStr}T${timeStr}`;
+  // Build an ISO datetime *with timezone* from local date/time inputs.
+  // This avoids ambiguity when the server runs in UTC and prevents
+  // "single-day" events (07:00→23:59 local) from spilling into the next day
+  // when rendered back to the browser.
+  function buildLocalIso(dateStr, timeStr) {
+    try {
+      const d = new Date(`${dateStr}T${timeStr}`);
+      return d.toISOString();
+    } catch (e) {
+      return `${dateStr}T${timeStr}`;
+    }
   }
 
   function seTimeOptions(selected, include2359) {
@@ -124,22 +133,22 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       <div class="row g-2">
         <div class="col-12 col-md-6">
           <label class="form-label">Début</label>
-          <div class="row g-2">
-            <div class="col-7">
+          <div class="row g-2 align-items-end">
+            <div class="col-12 col-sm-8">
               <input type="date" class="form-control" id="onekite-se-start-date" value="${escapeHtml(toDateInputValue(seStart))}" />
             </div>
-            <div class="col-5">
+            <div class="col-12 col-sm-4">
               <select class="form-select onekite-time-select" id="onekite-se-start-time">${seTimeOptions(seStartTime, false)}</select>
             </div>
           </div>
         </div>
         <div class="col-12 col-md-6">
           <label class="form-label">Fin</label>
-          <div class="row g-2">
-            <div class="col-7">
+          <div class="row g-2 align-items-end">
+            <div class="col-12 col-sm-8">
               <input type="date" class="form-control" id="onekite-se-end-date" value="${escapeHtml(toDateInputValue(seEnd))}" />
             </div>
-            <div class="col-5">
+            <div class="col-12 col-sm-4">
               <select class="form-select onekite-time-select" id="onekite-se-end-time">${seTimeOptions(seEndTime, true)}</select>
             </div>
           </div>
@@ -180,8 +189,8 @@ 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) ? buildLocalDatetime(sd, st) : '';
-              const endVal = (ed && et) ? buildLocalDatetime(ed, et) : '';
+              const startVal = (sd && st) ? buildLocalIso(sd, st) : '';
+              const 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();
@@ -778,13 +787,25 @@ function toDatetimeLocalValue(date) {
             const btn = document.querySelector('#onekite-calendar .fc-newSpecial-button');
             if (!btn) return;
             const isSpecial = mode === 'special';
-            btn.textContent = isSpecial ? 'Évènement ✓' : 'Évènement';
+            const label = isSpecial ? 'Évènement ✓' : 'Évènement';
+            // FullCalendar wraps text in a span.fc-button-text. Replacing the entire
+            // button textContent can confuse its rerendering and lead to duplicated
+            // labels ("EvenementEvenement").
+            const span = btn.querySelector('.fc-button-text');
+            if (span) {
+              span.textContent = label;
+            } else {
+              btn.textContent = label;
+            }
             btn.classList.toggle('onekite-active', isSpecial);
           } catch (e) {}
         }
 
         function setMode(next) {
           mode = next;
+          if (mode === 'special') {
+            showAlert('info', 'Mode évènement : sélectionnez une date ou une plage');
+          }
           refreshDesktopModeButton();
           try {
             const mb = document.querySelector('#onekite-mobile-controls .onekite-mode-btn');
@@ -899,6 +920,21 @@ function toDatetimeLocalValue(date) {
           failureCallback(e);
         }
       },
+      eventDidMount: function (arg) {
+        try {
+          const ev = arg && arg.event;
+          if (!ev) return;
+          if (ev.extendedProps && ev.extendedProps.type === 'special') {
+            // Some themes override FC event colors. Force ours for special events.
+            const el2 = arg.el;
+            if (el2 && el2.style) {
+              el2.style.backgroundColor = '#8e44ad';
+              el2.style.borderColor = '#8e44ad';
+              el2.style.color = '#ffffff';
+            }
+          }
+        } catch (e) {}
+      },
       select: async function (info) {
         if (isDialogOpen) {
           return;
@@ -997,9 +1033,12 @@ function toDatetimeLocalValue(date) {
           }
           isDialogOpen = true;
           try {
-            // Default to a same-day event: 00:00 -> 23:59
-            const end = new Date(start.getTime() + (23 * 60 + 59) * 60 * 1000);
-            const payload = await openSpecialEventDialog({ start, end, allDay: true });
+            // Default to a same-day event in local time: 07:00 -> 23:59
+            const start2 = new Date(start);
+            start2.setHours(7, 0, 0, 0);
+            const end2 = new Date(start);
+            end2.setHours(23, 59, 0, 0);
+            const payload = await openSpecialEventDialog({ start: start2, end: end2, allDay: false });
             setMode('reservation');
             if (!payload) {
               isDialogOpen = false;