nodebb-plugin-onekite-calendar 2.0.0 → 2.0.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog – calendar-onekite
 
+## 1.2.9
+- Modale réservation : retour du grisé des matériels indisponibles (API events expose à nouveau itemIds)
+
+## 1.2.8
+- Popup réservation : correction « Durée rapide » (la période envoyée correspond bien à la durée sélectionnée)
+
+## 1.2.7
+- UI : suppression du bouton flottant mobile « + Réserver »
+- Client : nettoyage du code associé (suppression du bloc FAB)
+
 ## 1.2.6
 - ACP : anti double action (verrou UI + boutons désactivés/spinner) sur valider/refuser (unitaire + batch)
 

package/lib/api.js

@@ -468,6 +468,10 @@ api.getEvents = async function (req, res) {
           rid: p.rid,
           status: p.status,
           uid: p.uid,
+          // Needed client-side to gray out unavailable items in the reservation modal.
+          // Not sensitive: it is already visible in event titles and prevents double booking.
+          itemIds: Array.isArray(p.itemIds) ? p.itemIds.map(String) : [],
+          itemIdLine: p.itemIdLine ? String(p.itemIdLine) : '',
           canModerate: canMod,
           ...(widgetMode ? { reservedByUsername: String(r.username || '') } : {}),
         },

package/package.json

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

package/public/client.js

@@ -923,7 +923,9 @@ function toDatetimeLocalValue(date) {
               const itemNames = cbs.map(cb => cb.getAttribute('data-name'));
               const sum = cbs.reduce((acc, cb) => acc + (parseFloat(cb.getAttribute('data-price') || '0') || 0), 0);
               const total = (sum / 100) * days;
-              resolve({ itemIds, itemNames, total, days });
+              // Return the effective end date (exclusive) because duration shortcuts can
+              // change the range without updating the original FullCalendar selection.
+              resolve({ itemIds, itemNames, total, days, endDate: toLocalYmd(end) });
             },
           },
         },
@@ -1258,7 +1260,10 @@ function toDatetimeLocalValue(date) {
         }
         // Send date strings (no hours) so reservations are day-based.
         const startDate = toLocalYmd(info.start);
-        const endDate = toLocalYmd(info.end);
+        // NOTE: FullCalendar's `info.end` reflects the original selection.
+        // If the user used "Durée rapide", the effective end date is held
+        // inside the dialog (returned as `chosen.endDate`).
+        const endDate = (chosen && chosen.endDate) ? String(chosen.endDate) : toLocalYmd(info.end);
         await requestReservation({
           start: startDate,
           end: endDate,
@@ -1826,40 +1831,6 @@ function toDatetimeLocalValue(date) {
 
     refreshDesktopModeButton();
 
-    // Mobile: floating action button to create a reservation quickly
-    try {
-      const fabId = 'onekite-fab-create';
-      const existing = document.getElementById(fabId);
-      if (existing) existing.remove();
-      if (isMobileNow()) {
-        const fab = document.createElement('button');
-        fab.id = fabId;
-        fab.type = 'button';
-        fab.className = 'btn btn-primary shadow';
-        fab.textContent = '+ Réserver';
-        fab.style.position = 'fixed';
-        fab.style.right = '14px';
-        fab.style.bottom = '14px';
-        fab.style.zIndex = '1050';
-        fab.style.borderRadius = '999px';
-        fab.style.padding = '12px 16px';
-        fab.addEventListener('click', async () => {
-          try {
-            if (isDialogOpen) return;
-            if (!lockAction('fab', 900)) return;
-            const start = new Date();
-            start.setHours(0, 0, 0, 0);
-            start.setDate(start.getDate() + 1);
-            const end = new Date(start);
-            end.setDate(end.getDate() + 1);
-            await handleCreateFromSelection({ start, end, allDay: true });
-          } catch (e) {}
-        });
-        document.body.appendChild(fab);
-      }
-    } catch (e) {}
-
-
     // Mobile controls: view (month/week) + mode (reservation/event) without bloating the header.
     try {
       const controlsId = 'onekite-mobile-controls';