nodebb-plugin-onekite-calendar 1.0.33 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog – calendar-onekite
 
+## 1.2.6
+- ACP : anti double action (verrou UI + boutons désactivés/spinner) sur valider/refuser (unitaire + batch)
+
+## 1.2.5
+- Mobile : bouton flottant « + Réserver »
+- Création : anti double-tap/click (verrou actions) + invalidation cache events + refetch léger
+- Calendrier : jours passés / aujourd’hui affichés comme non-sélectionnables (règle visuelle)
+- Popup réservation : raccourcis de durée (1j/2j/3j/7j) + recalcul total + mise à jour des matériels bloqués
+- ACP : actions en batch (valider/refuser une sélection) + compteur de sélection
+- API : idempotence sur valider/refuser + audit enrichi (refusedBy, cancelledByUsername)
+
 ## 1.0.3
 - Suppression du texte d’archivage dans le toast de purge (plus de « 0 archivés »)
 - Renommage du plugin : nodebb-plugin-onekite-calendar

package/lib/api.js

@@ -553,6 +553,11 @@ api.getReservationDetails = async function (req, res) {
   const r = await dbLayer.getReservation(rid);
   if (!r) return res.status(404).json({ error: 'not-found' });
 
+  // Idempotence: if already refused, return ok.
+  if (String(r.status) === 'refused') {
+    return res.json({ ok: true, status: 'refused' });
+  }
+
   const isOwner = String(r.uid) === String(uid);
   if (!isOwner && !canMod) return res.status(403).json({ error: 'not-allowed' });
 
@@ -881,7 +886,13 @@ api.approveReservation = async function (req, res) {
   const rid = req.params.rid;
   const r = await dbLayer.getReservation(rid);
   if (!r) return res.status(404).json({ error: 'not-found' });
-  if (r.status !== 'pending') return res.status(400).json({ error: 'bad-status' });
+  // Idempotence: if already approved (awaiting payment or paid), return ok.
+  if (r.status !== 'pending') {
+    if (['awaiting_payment', 'approved', 'paid'].includes(String(r.status))) {
+      return res.json({ ok: true, status: r.status });
+    }
+    return res.status(400).json({ error: 'bad-status' });
+  }
 
   r.status = 'awaiting_payment';
   // Backwards compatible: old clients sent `adminNote` to describe the pickup place.
@@ -994,6 +1005,14 @@ api.refuseReservation = async function (req, res) {
   r.status = 'refused';
   r.refusedAt = Date.now();
   r.refusedReason = String((req.body && (req.body.reason || req.body.refusedReason || req.body.refuseReason)) || '').trim();
+  try {
+    const refuser = await user.getUserFields(uid, ['username']);
+    r.refusedBy = uid;
+    r.refusedByUsername = refuser && refuser.username ? refuser.username : '';
+  } catch (e) {
+    r.refusedBy = uid;
+    r.refusedByUsername = '';
+  }
   await dbLayer.saveReservation(r);
 
   const requesterUid2 = parseInt(r.uid, 10);
@@ -1043,6 +1062,13 @@ api.cancelReservation = async function (req, res) {
   r.cancelledAt = Date.now();
   r.cancelledBy = uid;
 
+  try {
+    const canceller = await user.getUserFields(uid, ['username']);
+    r.cancelledByUsername = canceller && canceller.username ? canceller.username : '';
+  } catch (e) {
+    r.cancelledByUsername = '';
+  }
+
   await dbLayer.saveReservation(r);
 
   // Discord webhook (optional)
@@ -1058,6 +1084,7 @@ api.cancelReservation = async function (req, res) {
       status: r.status,
       cancelledAt: r.cancelledAt,
       cancelledBy: r.cancelledBy,
+      cancelledByUsername: r.cancelledByUsername || '',
     });
   } catch (e) {}
 
@@ -1074,8 +1101,8 @@ api.cancelReservation = async function (req, res) {
         itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
-        cancelledBy: canceller && canceller.username ? canceller.username : '',
-        cancelledByUrl: (canceller && canceller.username) ? `${normalizeBaseUrl(meta)}/user/${encodeURIComponent(String(canceller.username))}` : '',
+        cancelledBy: (r.cancelledByUsername || (canceller && canceller.username) || ''),
+        cancelledByUrl: ((r.cancelledByUsername || (canceller && canceller.username)) ? `${normalizeBaseUrl(meta)}/user/${encodeURIComponent(String(r.cancelledByUsername || canceller.username))}` : ''),
       });
     }
   } catch (e) {}

package/package.json

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

package/public/admin.js

@@ -6,6 +6,58 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
   // can open rich modals without embedding large JSON blobs into the DOM.
   const pendingCache = new Map();
 
+  // Prevent double actions (double taps/clicks) in ACP.
+  // Keyed by action (eg. approve:RID, refuse:RID, batch:approve).
+  const actionLocks = new Set();
+
+  function setButtonsDisabled(btns, disabled) {
+    (btns || []).filter(Boolean).forEach((b) => {
+      try {
+        b.disabled = !!disabled;
+        b.classList.toggle('disabled', !!disabled);
+        b.setAttribute('aria-disabled', disabled ? 'true' : 'false');
+      } catch (e) {}
+    });
+  }
+
+  function setBtnBusy(btn, busy) {
+    if (!btn) return;
+    try {
+      if (busy) {
+        if (!btn.dataset.okcOrigHtml) btn.dataset.okcOrigHtml = btn.innerHTML;
+        btn.innerHTML = '<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true" style="margin-right:6px;"></span>' + btn.dataset.okcOrigHtml;
+      } else if (btn.dataset.okcOrigHtml) {
+        btn.innerHTML = btn.dataset.okcOrigHtml;
+      }
+    } catch (e) {}
+  }
+
+  async function withLock(lockKey, btns, fn) {
+    if (!lockKey) return await fn();
+    if (actionLocks.has(lockKey)) return;
+    actionLocks.add(lockKey);
+    setButtonsDisabled(btns, true);
+    // Only show a spinner on the primary button (first in list)
+    setBtnBusy(btns && btns[0], true);
+    try {
+      return await fn();
+    } finally {
+      setBtnBusy(btns && btns[0], false);
+      setButtonsDisabled(btns, false);
+      actionLocks.delete(lockKey);
+    }
+  }
+
+  function getActiveBootboxFooterButtons() {
+    try {
+      const modal = document.querySelector('.bootbox.modal.show');
+      if (!modal) return [];
+      return Array.from(modal.querySelectorAll('.modal-footer button'));
+    } catch (e) {
+      return [];
+    }
+  }
+
   function showAlert(type, msg) {
     // Deduplicate identical alerts that can be triggered multiple times
     // by NodeBB ACP save buttons/hooks across ajaxify navigations.
@@ -208,6 +260,17 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
       return;
     }
 
+    // Batch actions (low volume but handy on mobile / multiple requests)
+    const batchBar = document.createElement('div');
+    batchBar.className = 'd-flex flex-wrap gap-2 align-items-center mb-2';
+    batchBar.innerHTML = `
+      <button type="button" class="btn btn-outline-secondary btn-sm" data-action="toggle-all">Tout sélectionner</button>
+      <button type="button" class="btn btn-success btn-sm" data-action="approve-selected">Valider sélection</button>
+      <button type="button" class="btn btn-outline-danger btn-sm" data-action="refuse-selected">Refuser sélection</button>
+      <span class="text-muted" style="font-size:12px;">(<span id="onekite-selected-count">0</span> sélectionnée)</span>
+    `;
+    wrap.appendChild(batchBar);
+
     const fmtFR = (ts) => {
       const d = new Date(parseInt(ts, 10));
       const dd = String(d.getDate()).padStart(2, '0');
@@ -227,10 +290,15 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
       div.className = 'list-group-item onekite-pending-row';
       div.innerHTML = `
         <div class="d-flex justify-content-between align-items-start gap-2">
-          <div style="min-width: 0;">
+          <div style="min-width: 0;" class="d-flex gap-2">
+            <div style="padding-top: 2px;">
+              <input type="checkbox" class="form-check-input onekite-pending-select" data-rid="${escapeHtml(String(r.rid || ''))}" />
+            </div>
+            <div style="min-width:0;">
             <div><strong>${itemsHtml || escapeHtml(r.itemName || '')}</strong></div>
             <div class="text-muted" style="font-size: 12px;">Créée: ${escapeHtml(created)}</div>
             <div class="text-muted" style="font-size: 12px;">Période: ${escapeHtml(new Date(parseInt(r.start, 10)).toLocaleDateString('fr-FR'))} → ${escapeHtml(new Date(parseInt(r.end, 10)).toLocaleDateString('fr-FR'))}</div>
+            </div>
           </div>
           <div class="d-flex gap-2">
             <!-- IMPORTANT: type="button" to avoid submitting the settings form and resetting ACP tabs -->
@@ -241,6 +309,17 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
       `;
       wrap.appendChild(div);
     }
+
+    // Selected counter
+    try {
+      const countEl = document.getElementById('onekite-selected-count');
+      const refreshCount = () => {
+        const n = wrap.querySelectorAll('.onekite-pending-select:checked').length;
+        if (countEl) countEl.textContent = String(n);
+      };
+      wrap.querySelectorAll('.onekite-pending-select').forEach((cb) => cb.addEventListener('change', refreshCount));
+      refreshCount();
+    } catch (e) {}
   }
 
 
@@ -430,6 +509,24 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     const pendingWrap = document.getElementById('onekite-pending');
     if (pendingWrap && !pendingWrap.dataset.okcBound) {
       pendingWrap.dataset.okcBound = '1';
+
+      function selectedRids() {
+        return Array.from(pendingWrap.querySelectorAll('input.onekite-pending-select:checked'))
+          .map(cb => cb.getAttribute('data-rid'))
+          .filter(Boolean);
+      }
+
+      function refreshSelectedCount() {
+        const el = document.getElementById('onekite-selected-count');
+        if (el) el.textContent = String(selectedRids().length);
+      }
+
+      pendingWrap.addEventListener('change', (ev) => {
+        const cb = ev.target && ev.target.closest ? ev.target.closest('input.onekite-pending-select') : null;
+        if (!cb) return;
+        refreshSelectedCount();
+      });
+
       pendingWrap.addEventListener('click', async (ev) => {
         const btn = ev.target && ev.target.closest('button[data-action]');
         if (!btn) return;
@@ -441,10 +538,178 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
         } catch (e) {}
         const action = btn.getAttribute('data-action');
         const rid = btn.getAttribute('data-rid');
+
+        // Prevent accidental double-open of modals on mobile/trackpad double taps
+        if (rid && (action === 'approve' || action === 'refuse')) {
+          const openKey = `open:${action}:${rid}`;
+          if (actionLocks.has(openKey)) return;
+          actionLocks.add(openKey);
+          setTimeout(() => actionLocks.delete(openKey), 800);
+        }
+
+        // Batch actions (no rid)
+        if ((action === 'toggle-all' || action === 'approve-selected' || action === 'refuse-selected') && !rid) {
+          const batchBtns = Array.from(pendingWrap.querySelectorAll('button[data-action="toggle-all"], button[data-action="approve-selected"], button[data-action="refuse-selected"]'));
+          const allCbs = Array.from(pendingWrap.querySelectorAll('input.onekite-pending-select'));
+          if (action === 'toggle-all') {
+            const want = allCbs.some(cb => !cb.checked);
+            allCbs.forEach(cb => { cb.checked = want; });
+            refreshSelectedCount();
+            btn.textContent = want ? 'Tout désélectionner' : 'Tout sélectionner';
+            return;
+          }
+
+          const rids = selectedRids();
+          if (!rids.length) {
+            showAlert('error', 'Aucune demande sélectionnée.');
+            return;
+          }
+
+          if (action === 'refuse-selected') {
+            const html = `
+              <div class="mb-3">
+                <label class="form-label">Raison du refus (appliquée à toutes les demandes sélectionnées)</label>
+                <textarea class="form-control" id="onekite-refuse-reason" rows="3" placeholder="Ex: matériel indisponible, dates impossibles, dossier incomplet..."></textarea>
+              </div>
+            `;
+            await new Promise((resolve) => {
+              bootbox.dialog({
+                title: `Refuser ${rids.length} demande(s)`,
+                message: html,
+                buttons: {
+                  cancel: { label: 'Annuler', className: 'btn-secondary', callback: () => resolve(false) },
+                  ok: {
+                    label: 'Refuser',
+                    className: 'btn-danger',
+                    callback: async () => {
+                      await withLock(`batch:refuse`, batchBtns.concat(getActiveBootboxFooterButtons()), async () => {
+                        try {
+                          const reason = (document.getElementById('onekite-refuse-reason')?.value || '').trim();
+                          for (const rr of rids) {
+                            await refuse(rr, { reason });
+                          }
+                          showAlert('success', `${rids.length} demande(s) refusée(s).`);
+                          resolve(true);
+                        } catch (e) {
+                          showAlert('error', 'Refus impossible.');
+                          resolve(false);
+                        }
+                      });
+                      return false;
+                    },
+                  },
+                },
+              });
+            });
+            await refreshPending();
+            return;
+          }
+
+          if (action === 'approve-selected') {
+            const opts = timeOptions(5).map(t => `<option value="${t}" ${t === '07:00' ? 'selected' : ''}>${t}</option>`).join('');
+            const html = `
+              <div class="mb-3">
+                <label class="form-label">Adresse de récupération</label>
+                <div class="input-group">
+                  <input type="text" class="form-control" id="onekite-pickup-address" placeholder="Adresse complète" />
+                  <button class="btn btn-outline-secondary" type="button" id="onekite-geocode">Rechercher</button>
+                </div>
+                <div id="onekite-map" style="height:220px; border:1px solid #ddd; border-radius:6px; margin-top:0.5rem;"></div>
+                <div class="form-text" id="onekite-map-help">Vous pouvez déplacer le marqueur pour ajuster la position.</div>
+                <input type="hidden" id="onekite-pickup-lat" />
+                <input type="hidden" id="onekite-pickup-lon" />
+              </div>
+              <div class="mb-3">
+                <label class="form-label">Notes (facultatif)</label>
+                <textarea class="form-control" id="onekite-notes" rows="3" placeholder="Ex: code portail, personne à contacter, horaires..."></textarea>
+              </div>
+              <div class="mb-2">
+                <label class="form-label">Heure de récupération</label>
+                <select class="form-select" id="onekite-pickup-time">${opts}</select>
+              </div>
+              <div class="text-muted" style="font-size:12px;">Ces infos seront appliquées aux ${rids.length} demandes sélectionnées.</div>
+            `;
+            const dlg = bootbox.dialog({
+              title: `Valider ${rids.length} demande(s)` ,
+              message: html,
+              buttons: {
+                cancel: { label: 'Annuler', className: 'btn-secondary' },
+                ok: {
+                  label: 'Valider',
+                  className: 'btn-success',
+                  callback: async () => {
+                    await withLock(`batch:approve`, batchBtns.concat(getActiveBootboxFooterButtons()), async () => {
+                      try {
+                        const pickupAddress = (document.getElementById('onekite-pickup-address')?.value || '').trim();
+                        const notes = (document.getElementById('onekite-notes')?.value || '').trim();
+                        const pickupTime = (document.getElementById('onekite-pickup-time')?.value || '').trim();
+                        const pickupLat = (document.getElementById('onekite-pickup-lat')?.value || '').trim();
+                        const pickupLon = (document.getElementById('onekite-pickup-lon')?.value || '').trim();
+                        for (const rr of rids) {
+                          await approve(rr, { pickupAddress, notes, pickupTime, pickupLat, pickupLon });
+                        }
+                        showAlert('success', `${rids.length} demande(s) validée(s).`);
+                        await refreshPending();
+                      } catch (e) {
+                        showAlert('error', 'Validation impossible.');
+                      }
+                    });
+                  },
+                },
+              },
+            });
+
+            // Init Leaflet map once the modal is visible.
+            dlg.on('shown.bs.modal', async () => {
+              try {
+                const L = await loadLeaflet();
+                const mapEl = document.getElementById('onekite-map');
+                if (!mapEl) return;
+                const map = L.map(mapEl).setView([45.7640, 4.8357], 12);
+                L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+                  maxZoom: 19,
+                  attribution: '&copy; OpenStreetMap contributors',
+                }).addTo(map);
+                const marker = L.marker([45.7640, 4.8357], { draggable: true }).addTo(map);
+
+                function setLatLon(lat, lon) {
+                  const latEl = document.getElementById('onekite-pickup-lat');
+                  const lonEl = document.getElementById('onekite-pickup-lon');
+                  if (latEl) latEl.value = String(lat);
+                  if (lonEl) lonEl.value = String(lon);
+                }
+                setLatLon(45.7640, 4.8357);
+
+                marker.on('dragend', () => {
+                  const p = marker.getLatLng();
+                  setLatLon(p.lat, p.lng);
+                });
+
+                const btnGeocode = document.getElementById('onekite-geocode');
+                if (btnGeocode) {
+                  btnGeocode.addEventListener('click', async () => {
+                    try {
+                      const addr = (document.getElementById('onekite-pickup-address')?.value || '').trim();
+                      const hit = await geocodeAddress(addr);
+                      if (!hit) return;
+                      marker.setLatLng([hit.lat, hit.lon]);
+                      map.setView([hit.lat, hit.lon], 16);
+                      setLatLon(hit.lat, hit.lon);
+                    } catch (e) {}
+                  });
+                }
+                setTimeout(() => { try { map.invalidateSize(); } catch (e) {} }, 250);
+              } catch (e) {}
+            });
+            return;
+          }
+        }
+
         if (!rid) return;
 
         // Remove the row immediately on success for a snappier UX
         const rowEl = btn.closest('tr') || btn.closest('.onekite-pending-row');
+        const rowBtns = rowEl ? Array.from(rowEl.querySelectorAll('button[data-action="approve"],button[data-action="refuse"]')) : [btn];
 
         try {
           if (action === 'refuse') {
@@ -464,16 +729,18 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
                     label: 'Refuser',
                     className: 'btn-danger',
                     callback: async () => {
-                      try {
-                        const reason = (document.getElementById('onekite-refuse-reason')?.value || '').trim();
-                        await refuse(rid, { reason });
-                        if (rowEl && rowEl.parentNode) rowEl.parentNode.removeChild(rowEl);
-                        showAlert('success', 'Demande refusée.');
-                        resolve(true);
-                      } catch (e) {
-                        showAlert('error', 'Refus impossible.');
-                        resolve(false);
-                      }
+                      await withLock(`refuse:${rid}`, rowBtns.concat(getActiveBootboxFooterButtons()), async () => {
+                        try {
+                          const reason = (document.getElementById('onekite-refuse-reason')?.value || '').trim();
+                          await refuse(rid, { reason });
+                          if (rowEl && rowEl.parentNode) rowEl.parentNode.removeChild(rowEl);
+                          showAlert('success', 'Demande refusée.');
+                          resolve(true);
+                        } catch (e) {
+                          showAlert('error', 'Refus impossible.');
+                          resolve(false);
+                        }
+                      });
                       return false;
                     },
                   },
@@ -530,19 +797,21 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
                   label: 'Valider',
                   className: 'btn-success',
                   callback: async () => {
-                    try {
-                      const pickupAddress = (document.getElementById('onekite-pickup-address')?.value || '').trim();
-                      const notes = (document.getElementById('onekite-notes')?.value || '').trim();
-                      const pickupTime = (document.getElementById('onekite-pickup-time')?.value || '').trim();
-                      const pickupLat = (document.getElementById('onekite-pickup-lat')?.value || '').trim();
-                      const pickupLon = (document.getElementById('onekite-pickup-lon')?.value || '').trim();
-                      await approve(rid, { pickupAddress, notes, pickupTime, pickupLat, pickupLon });
-                      if (rowEl && rowEl.parentNode) rowEl.parentNode.removeChild(rowEl);
-                      showAlert('success', 'Demande validée.');
-                      await refreshPending();
-                    } catch (e) {
-                      showAlert('error', 'Validation impossible.');
-                    }
+                    await withLock(`approve:${rid}`, rowBtns.concat(getActiveBootboxFooterButtons()), async () => {
+                      try {
+                        const pickupAddress = (document.getElementById('onekite-pickup-address')?.value || '').trim();
+                        const notes = (document.getElementById('onekite-notes')?.value || '').trim();
+                        const pickupTime = (document.getElementById('onekite-pickup-time')?.value || '').trim();
+                        const pickupLat = (document.getElementById('onekite-pickup-lat')?.value || '').trim();
+                        const pickupLon = (document.getElementById('onekite-pickup-lon')?.value || '').trim();
+                        await approve(rid, { pickupAddress, notes, pickupTime, pickupLat, pickupLon });
+                        if (rowEl && rowEl.parentNode) rowEl.parentNode.removeChild(rowEl);
+                        showAlert('success', 'Demande validée.');
+                        await refreshPending();
+                      } catch (e) {
+                        showAlert('error', 'Validation impossible.');
+                      }
+                    });
                     return false;
                   },
                 },

package/public/client.js

@@ -25,6 +25,22 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           text-overflow: clip;
           white-space: nowrap;
         }
+
+        /* Mobile: ensure taps reach FullCalendar (Safari/Chrome) */
+        .fc {
+          touch-action: manipulation;
+        }
+
+        /* Show days that cannot be selected for new reservations (today & past) */
+        .fc .onekite-day-disabled {
+          background: rgba(0, 0, 0, 0.03);
+        }
+        .fc .onekite-day-disabled .fc-daygrid-day-number {
+          opacity: 0.5;
+        }
+        .fc .onekite-day-disabled:hover {
+          cursor: not-allowed;
+        }
       `;
       document.head.appendChild(style);
     } catch (e) {
@@ -36,6 +52,17 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   // interactions or quick re-renders.
   let isDialogOpen = false;
 
+  // Prevent double taps/clicks on actions that trigger network calls (mobile especially).
+  const actionLocks = new Map(); // key -> ts
+  function lockAction(key, ms) {
+    const ttl = Math.max(0, parseInt(ms, 10) || 900);
+    const now = Date.now();
+    const last = actionLocks.get(key) || 0;
+    if (now - last < ttl) return false;
+    actionLocks.set(key, now);
+    return true;
+  }
+
   // Avoid duplicate toasts when the same validation fails both client-side and
   // server-side (e.g. "today or past" date rule).
   let lastDateRuleToastAt = 0;
@@ -441,6 +468,16 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   // Simple in-memory cache for JSON endpoints (used for events prefetch + ETag).
   const jsonCache = new Map(); // url -> { etag, data, ts }
 
+  function invalidateEventsCache() {
+    try { jsonCache.clear(); } catch (e) {}
+    try {
+      if (window.__onekiteEventsAbort) {
+        window.__onekiteEventsAbort.abort();
+        window.__onekiteEventsAbort = null;
+      }
+    } catch (e) {}
+  }
+
   function scheduleRefetch(cal) {
     try {
       if (!cal || typeof cal.refetchEvents !== 'function') return;
@@ -777,16 +814,19 @@ function toDatetimeLocalValue(date) {
 
   async function openReservationDialog(selectionInfo, items) {
     const start = selectionInfo.start;
-    const end = selectionInfo.end;
+    let end = selectionInfo.end;
 
     // days (end is exclusive in FullCalendar)
     const msPerDay = 24 * 60 * 60 * 1000;
-    const days = Math.max(1, Math.round((end.getTime() - start.getTime()) / msPerDay));
+    let days = Math.max(1, Math.round((end.getTime() - start.getTime()) / msPerDay));
 
     // Fetch existing events overlapping the selection to disable already reserved items.
     let blocked = new Set();
     try {
-      const qs = new URLSearchParams({ start: selectionInfo.startStr, end: selectionInfo.endStr });
+      const qs = new URLSearchParams({
+        start: (selectionInfo.startStr || (start instanceof Date ? start.toISOString() : String(start))),
+        end: (selectionInfo.endStr || (end instanceof Date ? end.toISOString() : String(end))),
+      });
       const evs = await fetchJson(`/api/v3/plugins/calendar-onekite/events?${qs.toString()}`);
       (evs || []).forEach((ev) => {
         const st = (ev.extendedProps && ev.extendedProps.status) || '';
@@ -810,9 +850,9 @@ function toDatetimeLocalValue(date) {
       const priceTxt = fmtPrice(it.price || 0);
       const safeName = String(it.name).replace(/</g, '&lt;').replace(/>/g, '&gt;');
       return `
-        <div class="d-flex align-items-center py-1 ${disabled ? 'opacity-50' : ''}" style="border-bottom: 1px solid var(--bs-border-color, #ddd);">
+        <div class="d-flex align-items-center py-1 ${disabled ? 'opacity-50' : ''}" data-itemid="${id}" style="border-bottom: 1px solid var(--bs-border-color, #ddd);">
           <div style="width: 26px;">
-            ${disabled ? '' : `<input type="checkbox" class="form-check-input onekite-item-cb" data-id="${id}" data-name="${safeName}" data-price="${String(it.price || 0)}">`}
+            <input type="checkbox" class="form-check-input onekite-item-cb" data-id="${id}" data-name="${safeName}" data-price="${String(it.price || 0)}" ${disabled ? 'disabled' : ''}>
           </div>
           <div class="flex-grow-1">
             <div><strong>${safeName}</strong></div>
@@ -822,8 +862,25 @@ function toDatetimeLocalValue(date) {
       `;
     }).join('');
 
+    const shortcutsHtml = (() => {
+      // Only show shortcuts when selection is a single day (common mobile flow)
+      if (days !== 1) return '';
+      return `
+        <div class="mb-2" id="onekite-duration-shortcuts">
+          <div class="text-muted" style="font-size:12px; margin-bottom:6px;">Durée rapide</div>
+          <div class="btn-group btn-group-sm" role="group">
+            <button type="button" class="btn btn-outline-secondary" data-days="1">1j</button>
+            <button type="button" class="btn btn-outline-secondary" data-days="2">2j</button>
+            <button type="button" class="btn btn-outline-secondary" data-days="3">3j</button>
+            <button type="button" class="btn btn-outline-secondary" data-days="7">7j</button>
+          </div>
+        </div>
+      `;
+    })();
+
     const messageHtml = `
-      <div class="mb-2"><strong>Période</strong><br>${formatDt(start)} → ${formatDt(end)} <span class="text-muted">(${days} jour${days > 1 ? 's' : ''})</span></div>
+      <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>
+      ${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;">
         ${rows}
@@ -875,6 +932,47 @@ function toDatetimeLocalValue(date) {
       // live total update
       setTimeout(() => {
         const totalEl = document.getElementById('onekite-total');
+        const periodEl = document.getElementById('onekite-period');
+        const daysEl = document.getElementById('onekite-days');
+
+        function rangeQuery(s, e) {
+          try {
+            const sIso = (s instanceof Date) ? s.toISOString() : new Date(s).toISOString();
+            const eIso = (e instanceof Date) ? e.toISOString() : new Date(e).toISOString();
+            return new URLSearchParams({ start: sIso, end: eIso }).toString();
+          } catch (err) {
+            return '';
+          }
+        }
+
+        async function refreshBlocked() {
+          try {
+            const qs = rangeQuery(start, end);
+            if (!qs) return;
+            const evs = await fetchJson(`/api/v3/plugins/calendar-onekite/events?${qs}`);
+            blocked = new Set();
+            (evs || []).forEach((ev) => {
+              const st = (ev.extendedProps && ev.extendedProps.status) || '';
+              if (!['pending', 'awaiting_payment', 'approved', 'paid'].includes(st)) return;
+              const ids = (ev.extendedProps && ev.extendedProps.itemIds) || (ev.extendedProps && ev.extendedProps.itemId ? [ev.extendedProps.itemId] : []);
+              ids.forEach((id) => blocked.add(String(id)));
+            });
+
+            document.querySelectorAll('#onekite-items [data-itemid]').forEach((row) => {
+              const iid = row.getAttribute('data-itemid');
+              const dis = blocked.has(String(iid));
+              row.classList.toggle('opacity-50', dis);
+              const cb = row.querySelector('input.onekite-item-cb');
+              if (cb) {
+                cb.disabled = dis;
+                if (dis) cb.checked = false;
+              }
+            });
+          } catch (e) {
+            // ignore
+          }
+        }
+
         function refreshTotal() {
           const cbs = Array.from(document.querySelectorAll('.onekite-item-cb')).filter(cb => cb.checked);
           const sum = cbs.reduce((acc, cb) => acc + (parseFloat(cb.getAttribute('data-price') || '0') || 0), 0);
@@ -885,6 +983,31 @@ function toDatetimeLocalValue(date) {
         }
         document.querySelectorAll('.onekite-item-cb').forEach(cb => cb.addEventListener('change', refreshTotal));
         refreshTotal();
+
+        // Duration shortcuts (single-day selections): update end/days + refresh blocked items
+        const shortcutsWrap = document.getElementById('onekite-duration-shortcuts');
+        if (shortcutsWrap) {
+          shortcutsWrap.addEventListener('click', async (ev) => {
+            const btn = ev.target && ev.target.closest ? ev.target.closest('button[data-days]') : null;
+            if (!btn) return;
+            const nd = parseInt(btn.getAttribute('data-days'), 10);
+            if (!Number.isFinite(nd) || nd < 1) return;
+            // end is exclusive -> add nd days to start
+            end = new Date(start);
+            end.setDate(end.getDate() + nd);
+            days = nd;
+            if (daysEl) {
+              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>`;
+            }
+            // Toggle active button
+            shortcutsWrap.querySelectorAll('button[data-days]').forEach((b) => b.classList.toggle('active', b === btn));
+            await refreshBlocked();
+            refreshTotal();
+          });
+        }
       }, 0);
     });
   }
@@ -1065,7 +1188,127 @@ function toDatetimeLocalValue(date) {
       right: (canCreateSpecial ? 'newSpecial ' : '') + 'dayGridMonth,timeGridWeek',
     };
 
-    const calendar = new FullCalendar.Calendar(el, {
+    let calendar;
+
+    // Unified handler for creation actions (reservations vs special events).
+    // On mobile, FullCalendar may emit `dateClick` but not `select` for a simple tap.
+    // We therefore support both without calling `calendar.select()` (which could
+    // double-trigger `select`).
+    async function handleCreateFromSelection(info) {
+      if (isDialogOpen) {
+        return;
+      }
+      // Avoid double-taps creating two dialogs / two requests.
+      if (!lockAction('create', 900)) {
+        return;
+      }
+      isDialogOpen = true;
+      try {
+        if (mode === 'special' && canCreateSpecial) {
+          const payload = await openSpecialEventDialog(info);
+          if (!payload) {
+            calendar.unselect();
+            isDialogOpen = false;
+            return;
+          }
+          await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
+            method: 'POST',
+            body: JSON.stringify(payload),
+          }).catch(async () => {
+            return await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
+              method: 'POST',
+              body: JSON.stringify(payload),
+            });
+          });
+          showAlert('success', 'Évènement créé.');
+          invalidateEventsCache();
+          scheduleRefetch(calendar);
+          calendar.unselect();
+          isDialogOpen = false;
+          return;
+        }
+
+        // Business rule: reservations cannot start today or in the past.
+        // (We validate again on the server, but this gives immediate feedback.)
+        try {
+          const startDateCheck = toLocalYmd(info.start);
+          const todayCheck = toLocalYmd(new Date());
+          if (startDateCheck <= todayCheck) {
+            lastDateRuleToastAt = Date.now();
+            showAlert('error', "Impossible de réserver pour aujourd’hui ou une date passée.");
+            calendar.unselect();
+            isDialogOpen = false;
+            return;
+          }
+        } catch (e) {
+          // ignore
+        }
+
+        if (!items || !items.length) {
+          showAlert('error', 'Aucun matériel disponible (items HelloAsso non chargés).');
+          calendar.unselect();
+          isDialogOpen = false;
+          return;
+        }
+        const chosen = await openReservationDialog(info, items);
+        if (!chosen || !chosen.itemIds || !chosen.itemIds.length) {
+          calendar.unselect();
+          isDialogOpen = false;
+          return;
+        }
+        // Send date strings (no hours) so reservations are day-based.
+        const startDate = toLocalYmd(info.start);
+        const endDate = toLocalYmd(info.end);
+        await requestReservation({
+          start: startDate,
+          end: endDate,
+          itemIds: chosen.itemIds,
+          itemNames: chosen.itemNames,
+          total: chosen.total,
+        });
+        showAlert('success', 'Demande envoyée (en attente de validation).');
+        invalidateEventsCache();
+        scheduleRefetch(calendar);
+        calendar.unselect();
+        isDialogOpen = false;
+      } catch (e) {
+        const code = String((e && (e.status || e.message)) || '');
+        const payload = e && e.payload ? e.payload : null;
+
+        if (code === '403') {
+          const msg = payload && (payload.message || payload.error || payload.msg) ? String(payload.message || payload.error || payload.msg) : '';
+          const c = payload && payload.code ? String(payload.code) : '';
+          if (c === 'NOT_MEMBER' || /adh(é|e)rent/i.test(msg) || /membership/i.test(msg)) {
+            showAlert('error', msg || 'Vous devez être adhérent pour pouvoir effectuer une réservation.');
+          } else {
+            showAlert('error', msg || 'Impossible de créer la demande : droits insuffisants (groupe).');
+          }
+        } else if (code === '409') {
+          showAlert('error', 'Impossible : au moins un matériel est déjà réservé ou en attente sur cette période.');
+        } else if (code === '400' && payload && (payload.error === 'date-too-soon' || payload.code === 'date-too-soon')) {
+          // If we already showed the client-side toast a moment ago, avoid a duplicate.
+          if (!lastDateRuleToastAt || (Date.now() - lastDateRuleToastAt) > 1500) {
+            showAlert('error', String(payload.message || "Impossible de réserver pour aujourd’hui ou une date passée."));
+          }
+        } else {
+          const msgRaw = payload && (payload.message || payload.error || payload.msg)
+            ? String(payload.message || payload.error || payload.msg)
+            : '';
+
+          // NodeBB can return a plain "not-logged-in" string when the user is not authenticated.
+          // We want a user-friendly message consistent with the membership requirement.
+          const msg = (/\bnot-logged-in\b/i.test(msgRaw) || /\[\[error:not-logged-in\]\]/i.test(msgRaw))
+            ? 'Vous devez être adhérent Onekite'
+            : msgRaw;
+
+          showAlert('error', msg || ((e && (e.status === 401 || e.status === 403)) ? 'Vous devez être adhérent Onekite' : 'Erreur lors de la création de la demande.'));
+        }
+        calendar.unselect();
+        isDialogOpen = false;
+      }
+    }
+
+    calendar = new FullCalendar.Calendar(el, {
       initialView: 'dayGridMonth',
       height: 'auto',
       contentHeight: 'auto',
@@ -1088,6 +1331,22 @@ function toDatetimeLocalValue(date) {
       displayEventTime: false,
       selectable: true,
       selectMirror: true,
+      // Mobile: make selection responsive on touch
+      longPressDelay: 300,
+      selectLongPressDelay: 300,
+      dayCellDidMount: function (arg) {
+        // Visually disable today and past days for reservation creation rules,
+        // without breaking event clicks.
+        try {
+          const cellDate = arg && arg.date ? new Date(arg.date) : null;
+          if (!cellDate) return;
+          const ymd = toLocalYmd(cellDate);
+          const today = toLocalYmd(new Date());
+          if (ymd <= today) {
+            arg.el.classList.add('onekite-day-disabled');
+          }
+        } catch (e) {}
+      },
       events: async function (info, successCallback, failureCallback) {
         try {
           // Abort previous in-flight events fetch to avoid "double refresh" effects.
@@ -1163,156 +1422,15 @@ function toDatetimeLocalValue(date) {
         } catch (e) {}
       },
       select: async function (info) {
-        if (isDialogOpen) {
-          return;
-        }
-        isDialogOpen = true;
-        try {
-          if (mode === 'special' && canCreateSpecial) {
-            const payload = await openSpecialEventDialog(info);
-            if (!payload) {
-              calendar.unselect();
-              isDialogOpen = false;
-              return;
-            }
-            await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
-              method: 'POST',
-              body: JSON.stringify(payload),
-            }).catch(async () => {
-              return await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
-                method: 'POST',
-                body: JSON.stringify(payload),
-              });
-            });
-            showAlert('success', 'Évènement créé.');
-            calendar.refetchEvents();
-            calendar.unselect();
-            isDialogOpen = false;
-            return;
-          }
-
-          // Business rule: reservations cannot start today or in the past.
-          // (We validate again on the server, but this gives immediate feedback.)
-          try {
-            const startDateCheck = toLocalYmd(info.start);
-            const todayCheck = toLocalYmd(new Date());
-            if (startDateCheck <= todayCheck) {
-              lastDateRuleToastAt = Date.now();
-              showAlert('error', "Impossible de réserver pour aujourd’hui ou une date passée.");
-              calendar.unselect();
-              isDialogOpen = false;
-              return;
-            }
-          } catch (e) {
-            // ignore
-          }
-
-          if (!items || !items.length) {
-            showAlert('error', 'Aucun matériel disponible (items HelloAsso non chargés).');
-            calendar.unselect();
-            isDialogOpen = false;
-            return;
-          }
-          const chosen = await openReservationDialog(info, items);
-          if (!chosen || !chosen.itemIds || !chosen.itemIds.length) {
-            calendar.unselect();
-            isDialogOpen = false;
-            return;
-          }
-          // Send date strings (no hours) so reservations are day-based.
-          const startDate = toLocalYmd(info.start);
-          const endDate = toLocalYmd(info.end);
-          await requestReservation({
-            start: startDate,
-            end: endDate,
-            itemIds: chosen.itemIds,
-            itemNames: chosen.itemNames,
-            total: chosen.total,
-          });
-          showAlert('success', 'Demande envoyée (en attente de validation).');
-          calendar.refetchEvents();
-          calendar.unselect();
-          isDialogOpen = false;
-        } catch (e) {
-          const code = String((e && (e.status || e.message)) || '');
-          const payload = e && e.payload ? e.payload : null;
-
-          if (code === '403') {
-            const msg = payload && (payload.message || payload.error || payload.msg) ? String(payload.message || payload.error || payload.msg) : '';
-            const c = payload && payload.code ? String(payload.code) : '';
-            if (c === 'NOT_MEMBER' || /adh(é|e)rent/i.test(msg) || /membership/i.test(msg)) {
-              showAlert('error', msg || 'Vous devez être adhérent pour pouvoir effectuer une réservation.');
-            } else {
-              showAlert('error', msg || 'Impossible de créer la demande : droits insuffisants (groupe).');
-            }
-          } else if (code === '409') {
-            showAlert('error', 'Impossible : au moins un matériel est déjà réservé ou en attente sur cette période.');
-          } else if (code === '400' && payload && (payload.error === 'date-too-soon' || payload.code === 'date-too-soon')) {
-            // If we already showed the client-side toast a moment ago, avoid a duplicate.
-            if (!lastDateRuleToastAt || (Date.now() - lastDateRuleToastAt) > 1500) {
-              showAlert('error', String(payload.message || "Impossible de réserver pour aujourd’hui ou une date passée."));
-            }
-          } else {
-            const msgRaw = payload && (payload.message || payload.error || payload.msg)
-              ? String(payload.message || payload.error || payload.msg)
-              : '';
-
-            // NodeBB can return a plain "not-logged-in" string when the user is not authenticated.
-            // We want a user-friendly message consistent with the membership requirement.
-            const msg = (/\bnot-logged-in\b/i.test(msgRaw) || /\[\[error:not-logged-in\]\]/i.test(msgRaw))
-              ? 'Vous devez être adhérent Onekite'
-              : msgRaw;
-
-            showAlert('error', msg || ((e && (e.status === 401 || e.status === 403)) ? 'Vous devez être adhérent Onekite' : 'Erreur lors de la création de la demande.'));
-          }
-          calendar.unselect();
-          isDialogOpen = false;
-        }
+        return await handleCreateFromSelection(info);
       },
       dateClick: async function (info) {
-        // One-day selection convenience
-        const start = info.date;
-
-        // In "special event" mode, a simple click should propose a one-day event (not two days in the modal)
-        if (mode === 'special' && canCreateSpecial) {
-          if (isDialogOpen) {
-            return;
-          }
-          isDialogOpen = true;
-          try {
-            // Default to a one-day block: 07:00 -> 07:00 (end rolled to +1 day on submit).
-            const start2 = new Date(start);
-            start2.setHours(7, 0, 0, 0);
-            const end2 = new Date(start);
-            end2.setHours(7, 0, 0, 0);
-            const payload = await openSpecialEventDialog({ start: start2, end: end2, allDay: false });
-            if (!payload) {
-              isDialogOpen = false;
-              return;
-            }
-            await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
-              method: 'POST',
-              body: JSON.stringify(payload),
-            }).catch(async () => {
-              return await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
-                method: 'POST',
-                body: JSON.stringify(payload),
-              });
-            });
-            showAlert('success', 'Évènement créé.');
-            calendar.refetchEvents();
-          } finally {
-            isDialogOpen = false;
-          }
-          return;
-        }
-
-        // IMPORTANT: Do not call `calendar.select()` here.
-        // On mobile (and depending on FullCalendar behavior), a simple day click can already
-        // trigger the `select` callback. Calling `calendar.select()` would fire `select` a second
-        // time, causing duplicate toasts and duplicate dialogs.
-        // We rely on FullCalendar's built-in selection on click.
-        return;
+        // For a simple tap/click on a day cell, create a 1-day selection.
+        // This restores mobile behavior (where `select` may not fire on tap).
+        const start = new Date(info.date);
+        const end = new Date(start);
+        end.setDate(end.getDate() + 1);
+        return await handleCreateFromSelection({ start: start, end: end, allDay: true });
       },
 
       eventClick: async function (info) {
@@ -1480,9 +1598,11 @@ function toDatetimeLocalValue(date) {
             className: 'btn-outline-warning',
             callback: async () => {
               try {
+                if (!lockAction(`cancel:${rid}`, 1200)) return false;
                 await cancelReservation(rid);
                 showAlert('success', 'Réservation annulée.');
-                calendar.refetchEvents();
+                invalidateEventsCache();
+                scheduleRefetch(calendar);
               } catch (e) {
                 showAlert('error', 'Annulation impossible.');
               }
@@ -1512,9 +1632,11 @@ function toDatetimeLocalValue(date) {
                       callback: async () => {
                         try {
                           const reason = (document.getElementById('onekite-refuse-reason')?.value || '').trim();
+                          if (!lockAction(`refuse:${rid}`, 1200)) return false;
                           await refuseReservation(rid, { reason });
                           showAlert('success', 'Demande refusée.');
-                          calendar.refetchEvents();
+                          invalidateEventsCache();
+                          scheduleRefetch(calendar);
                           resolve(true);
                         } catch (e) {
                           showAlert('error', 'Refus impossible.');
@@ -1584,9 +1706,11 @@ function toDatetimeLocalValue(date) {
                         const pickupTime = (document.getElementById('onekite-pickup-time')?.value || '').trim();
                         const pickupLat = (document.getElementById('onekite-pickup-lat')?.value || '').trim();
                         const pickupLon = (document.getElementById('onekite-pickup-lon')?.value || '').trim();
+                        if (!lockAction(`approve:${rid}`, 1200)) return false;
                         await approveReservation(rid, { pickupAddress, notes, pickupTime, pickupLat, pickupLon });
                         showAlert('success', 'Demande validée.');
-                        calendar.refetchEvents();
+                        invalidateEventsCache();
+                        scheduleRefetch(calendar);
                       } catch (e) {
                         showAlert('error', 'Validation impossible.');
                       }
@@ -1702,6 +1826,39 @@ 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 {