nodebb-plugin-onekite-calendar 2.0.41 → 2.0.43

package/public/client.js

@@ -208,12 +208,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     return opts.join('');
   }
 
-  async function openSpecialEventDialog(selectionInfo, opts) {
-    const options = opts || {};
-    const kind = (String(options.kind || 'event').trim().toLowerCase() === 'outing') ? 'outing' : 'event';
-    const dialogTitle = String(options.dialogTitle || (kind === 'outing' ? 'Créer une prévision de sortie' : 'Créer un évènement'));
-    const defaultTitle = String(options.defaultTitle || (kind === 'outing' ? 'Sortie' : 'Évènement'));
-
+  async function openSpecialEventDialog(selectionInfo) {
     const start = selectionInfo.start;
     // FullCalendar can omit `end` for certain interactions. Also, for all-day
     // selections, `end` is exclusive (next day at 00:00). We normalise below
@@ -267,7 +262,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     const html = `
       <div class="mb-3">
         <label class="form-label">Titre</label>
-        <input type="text" class="form-control" id="onekite-se-title" placeholder="Ex: ..." value="${escapeHtml(defaultTitle)}" />
+        <input type="text" class="form-control" id="onekite-se-title" placeholder="Ex: ..." />
       </div>
       <div class="row g-2">
         <div class="col-12 col-md-6">
@@ -312,7 +307,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     return await new Promise((resolve) => {
       let resolved = false;
       const dialog = bootbox.dialog({
-        title: dialogTitle,
+        title: 'Créer un évènement',
         message: html,
         buttons: {
           cancel: {
@@ -361,7 +356,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
               const lat = (document.getElementById('onekite-se-lat')?.value || '').trim();
               const lon = (document.getElementById('onekite-se-lon')?.value || '').trim();
               resolved = true;
-              resolve({ kind, title, start: startVal, end: endVal, address, notes, lat, lon });
+              resolve({ title, start: startVal, end: endVal, address, notes, lat, lon });
               return true;
             },
           },
@@ -432,6 +427,17 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     });
   }
 
+
+
+  async function openOutingDialog(selectionInfo) {
+    // Same UI as special events, but saved as "Sorties" (prévisions).
+    const payload = await openSpecialEventDialog(selectionInfo);
+    if (!payload) return null;
+    // Default title if empty
+    if (!payload.title) payload.title = 'Prévision de sortie';
+    return payload;
+  }
+
   async function openMapViewer(title, address, lat, lon) {
     const mapId = `onekite-map-view-${Date.now()}-${Math.floor(Math.random()*10000)}`;
     const safeAddr = (address || '').trim();
@@ -1163,97 +1169,7 @@ function toDatetimeLocalValue(date) {
     const canCreateSpecial = !!caps.canCreateSpecial;
     const canDeleteSpecial = !!caps.canDeleteSpecial;
 
-    // Current creation mode: reservation (location) or special (event).
-    // Persist the user's last choice so actions (create/approve/refuse/refetch) don't reset it.
-    const modeStorageKey = (() => {
-      try {
-        const uid = (typeof app !== 'undefined' && app && app.user && (app.user.uid || app.user.uid === 0)) ? String(app.user.uid)
-          : (window.ajaxify && window.ajaxify.data && (window.ajaxify.data.uid || window.ajaxify.data.uid === 0)) ? String(window.ajaxify.data.uid)
-          : '0';
-        return `onekiteCalendarMode:${uid}`;
-      } catch (e) {
-        return 'onekiteCalendarMode:0';
-      }
-    })();
-
-    function loadSavedMode() {
-      try {
-        const v = (window.localStorage && window.localStorage.getItem(modeStorageKey)) || '';
-        return (v === 'special' || v === 'reservation') ? v : 'reservation';
-      } catch (e) {
-        return 'reservation';
-      }
-    }
-
-    function saveMode(v) {
-      try {
-        if (!window.localStorage) return;
-        window.localStorage.setItem(modeStorageKey, v);
-      } catch (e) {
-        // ignore
-      }
-    }
-
-    let mode = loadSavedMode();
-    // Avoid showing the "mode évènement" hint multiple times (desktop + mobile handlers)
-    let lastModeHintAt = 0;
-
-    function refreshDesktopModeButton() {
-      try {
-        const btn = document.querySelector('#onekite-calendar .fc-newSpecial-button');
-        if (!btn) return;
-
-        const isSpecial = mode === 'special';
-        const label = isSpecial ? 'Évènement ✓' : 'Évènement';
-
-        // Ensure a single canonical .fc-button-text (prevents "ÉvènementÉvènement" after rerenders)
-        let span = btn.querySelector('.fc-button-text');
-        if (!span) {
-          span = document.createElement('span');
-          span.className = 'fc-button-text';
-          // Remove stray text nodes before inserting span
-          [...btn.childNodes].forEach((n) => {
-            if (n && n.nodeType === Node.TEXT_NODE) n.remove();
-          });
-          btn.appendChild(span);
-        } else {
-          // Remove any stray text nodes beside the span
-          [...btn.childNodes].forEach((n) => {
-            if (n && n.nodeType === Node.TEXT_NODE && n.textContent.trim()) n.remove();
-          });
-        }
-
-        span.textContent = label;
-        btn.classList.toggle('onekite-active', isSpecial);
-      } catch (e) {}
-    }
-
-    function setMode(next, opts) {
-      if (next !== 'reservation' && next !== 'special') return;
-      mode = next;
-      saveMode(mode);
-
-      // Reset any pending selection/dialog state when switching modes
-      try { if (mode === 'reservation') { calendar.unselect(); isDialogOpen = false; } } catch (e) {}
-
-      const silent = !!(opts && opts.silent);
-      if (!silent && mode === 'special') {
-        const now = Date.now();
-        if (now - lastModeHintAt > 1200) {
-          lastModeHintAt = now;
-          showAlert('success', 'Mode évènement : sélectionnez une date ou une plage');
-        }
-      }
-      refreshDesktopModeButton();
-      try {
-        const mb = document.querySelector('#onekite-mobile-controls .onekite-mode-btn');
-        if (mb) {
-          const isSpecial = mode === 'special';
-          mb.textContent = isSpecial ? 'Mode évènement ✓' : 'Mode évènement';
-          mb.classList.toggle('onekite-active', isSpecial);
-        }
-      } catch (e) {}
-    }
+    // Creation chooser: Location / Prévision de sortie / Évènement (si autorisé).
 
     // Inject lightweight responsive CSS once.
     try {
@@ -1320,149 +1236,29 @@ function toDatetimeLocalValue(date) {
       left: 'prev,next today',
       center: 'title',
       // Only month + week (no day view)
-      right: (canCreateSpecial ? 'newSpecial ' : '') + 'dayGridMonth,timeGridWeek',
+      right: 'dayGridMonth,timeGridWeek',
     };
 
     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`).
+    // Unified handler for creation actions via a chooser modal.
     async function handleCreateFromSelection(info) {
-      if (isDialogOpen) {
-        return;
-      }
-      // Avoid double-taps creating two dialogs / two requests.
-      if (!lockAction('create', 900)) {
-        return;
-      }
-      isDialogOpen = true;
+      if (isDialogOpen) return;
+      if (!lockAction('create', 900)) return;
+
+      // Business rule: nothing can be created in the past.
       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;
+        const startDateCheck = toLocalYmd(info.start);
+        const todayCheck = toLocalYmd(new Date());
+        if (startDateCheck < todayCheck) {
+          lastDateRuleToastAt = Date.now();
+          showAlert('error', "Impossible de créer pour une date passée.");
+          try { calendar.unselect(); } catch (e) {}
           return;
         }
+      } catch (e) {}
 
-
-
-        // On a day click / selection in reservation mode, propose the user to create either
-        // a Location (reservation) or a "Prévision de sortie" (special event).
-        try {
-          const choice = await new Promise((resolve) => {
-            bootbox.dialog({
-              title: 'Créer',
-              message: '<div>Que veux-tu créer ?</div>',
-              buttons: {
-                cancel: { label: 'Annuler', className: 'btn-secondary', callback: () => resolve(null) },
-                outing: { label: 'Prévision de sortie', className: 'btn-info', callback: () => resolve('outing') },
-                reservation: { label: 'Location', className: 'btn-primary', callback: () => resolve('reservation') },
-              },
-            });
-          });
-
-          if (!choice) {
-            calendar.unselect();
-            isDialogOpen = false;
-            return;
-          }
-
-          if (choice === 'outing') {
-            const payload = await openSpecialEventDialog(info, { kind: 'outing', dialogTitle: 'Créer une prévision de sortie', defaultTitle: 'Sortie' });
-            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', 'Sortie créée.');
-            invalidateEventsCache();
-            scheduleRefetch(calendar);
-            calendar.unselect();
-            isDialogOpen = false;
-            return;
-          }
-        } catch (e) {
-          // ignore
-        }
-        // Business rule: reservations cannot start 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 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);
-        // 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);
-        const resp = await requestReservation({
-          start: startDate,
-          end: endDate,
-          itemIds: chosen.itemIds,
-          itemNames: chosen.itemNames,
-          total: chosen.total,
-        });
-        if (resp && (resp.autoPaid || String(resp.status) === 'paid')) {
-          showAlert('success', 'Réservation confirmée.');
-        } else {
-          showAlert('success', 'Demande envoyée (en attente de validation).');
-        }
-        invalidateEventsCache();
-        scheduleRefetch(calendar);
-        calendar.unselect();
-        isDialogOpen = false;
-      } catch (e) {
+      function handleCreateError(e) {
         const code = String((e && (e.status || e.message)) || '');
         const payload = e && e.payload ? e.payload : null;
 
@@ -1470,33 +1266,129 @@ function toDatetimeLocalValue(date) {
           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.');
+            showAlert('error', msg || 'Vous devez être adhérent pour pouvoir effectuer cette action.');
           } else {
-            showAlert('error', msg || 'Impossible de créer la demande : droits insuffisants (groupe).');
+            showAlert('error', msg || 'Action impossible : 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.');
+          showAlert('error', 'Impossible : conflit de réservation 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 une date passée."));
+            showAlert('error', String(payload.message || "Impossible de créer pour 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.'));
+          showAlert('error', msg || 'Erreur lors de la création.');
         }
-        calendar.unselect();
-        isDialogOpen = false;
       }
+
+      const buttons = {
+        close: { label: 'Annuler', className: 'btn-secondary' },
+        location: {
+          label: 'Location',
+          className: 'btn-primary',
+          callback: async () => {
+            try {
+              isDialogOpen = true;
+              if (!items || !items.length) {
+                showAlert('error', 'Aucun matériel disponible (items HelloAsso non chargés).');
+                return;
+              }
+              const chosen = await openReservationDialog(info, items);
+              if (!chosen || !chosen.itemIds || !chosen.itemIds.length) return;
+              const startDate = toLocalYmd(info.start);
+              const endDate = (chosen && chosen.endDate) ? String(chosen.endDate) : toLocalYmd(info.end);
+              const resp = await requestReservation({
+                start: startDate,
+                end: endDate,
+                itemIds: chosen.itemIds,
+                itemNames: chosen.itemNames,
+                total: chosen.total,
+              });
+              if (resp && (resp.autoPaid || String(resp.status) === 'paid')) {
+                showAlert('success', 'Réservation confirmée.');
+              } else {
+                showAlert('success', 'Demande envoyée (en attente de validation).');
+              }
+              invalidateEventsCache();
+              scheduleRefetch(calendar);
+            } catch (e) {
+              handleCreateError(e);
+            } finally {
+              try { calendar.unselect(); } catch (e) {}
+              isDialogOpen = false;
+            }
+            return true;
+          },
+        },
+        outing: {
+          label: 'Prévision de sortie',
+          className: 'btn-outline-primary',
+          callback: async () => {
+            try {
+              isDialogOpen = true;
+              const payload = await openOutingDialog(info);
+              if (!payload) return;
+              await fetchJson('/api/v3/plugins/calendar-onekite/outings', {
+                method: 'POST',
+                body: JSON.stringify(payload),
+              });
+              showAlert('success', 'Prévision de sortie créée.');
+              invalidateEventsCache();
+              scheduleRefetch(calendar);
+            } catch (e) {
+              handleCreateError(e);
+            } finally {
+              try { calendar.unselect(); } catch (e) {}
+              isDialogOpen = false;
+            }
+            return true;
+          },
+        },
+      };
+
+      if (canCreateSpecial) {
+        buttons.special = {
+          label: 'Évènement',
+          className: 'btn-outline-secondary',
+          callback: async () => {
+            try {
+              isDialogOpen = true;
+              const payload = await openSpecialEventDialog(info);
+              if (!payload) 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);
+            } catch (e) {
+              handleCreateError(e);
+            } finally {
+              try { calendar.unselect(); } catch (e) {}
+              isDialogOpen = false;
+            }
+            return true;
+          },
+        };
+      }
+
+      bootbox.dialog({
+        title: 'Créer',
+        message: '<div class="text-muted">Que veux-tu créer sur ces dates ?</div>',
+        buttons,
+      });
     }
 
     calendar = new FullCalendar.Calendar(el, {
@@ -1509,14 +1401,7 @@ function toDatetimeLocalValue(date) {
       headerToolbar: headerToolbar,
       // Keep titles short on mobile to avoid horizontal overflow
       titleFormat: isMobileNow() ? { year: 'numeric', month: 'short' } : undefined,
-      customButtons: canCreateSpecial ? {
-        newSpecial: {
-          text: 'Évènement',
-          click: () => {
-            setMode((mode === 'special') ? 'reservation' : 'special');
-          },
-        },
-      } : {},
+      customButtons: {},
       // We display the time ourselves inside the title for "special" events,
       // to match reservation icons and avoid FullCalendar's fixed-width time column.
       displayEventTime: false,
@@ -1598,19 +1483,15 @@ function toDatetimeLocalValue(date) {
         }
       },
       eventDidMount: function (arg) {
-        // Keep special event colors consistent (kind-specific).
+        // Keep special event colors consistent.
         try {
           const ev = arg && arg.event;
           if (!ev) return;
           if (ev.extendedProps && ev.extendedProps.type === 'special') {
-            const kind = String((ev.extendedProps.kind || 'event'));
-            const palette = (kind === 'outing')
-              ? { bg: '#0d6efd', border: '#0d6efd' }
-              : { bg: '#8e44ad', border: '#8e44ad' };
             const el2 = arg.el;
             if (el2 && el2.style) {
-              el2.style.backgroundColor = palette.bg;
-              el2.style.borderColor = palette.border;
+              el2.style.backgroundColor = '#8e44ad';
+              el2.style.borderColor = '#8e44ad';
               el2.style.color = '#ffffff';
             }
           }
@@ -1643,7 +1524,13 @@ function toDatetimeLocalValue(date) {
           } else if (p0.type === 'special' && p0.eid) {
             const details = await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(String(p0.eid))}`);
             p = Object.assign({}, p0, details, {
-              // keep backward compat with older field names used by templates below
+              pickupAddress: details.address || details.pickupAddress || p0.pickupAddress,
+              pickupLat: details.lat || details.pickupLat || p0.pickupLat,
+              pickupLon: details.lon || details.pickupLon || p0.pickupLon,
+            });
+          } else if (p0.type === 'outing' && p0.oid) {
+            const details = await fetchJson(`/api/v3/plugins/calendar-onekite/outings/${encodeURIComponent(String(p0.oid))}`);
+            p = Object.assign({}, p0, details, {
               pickupAddress: details.address || details.pickupAddress || p0.pickupAddress,
               pickupLat: details.lat || details.pickupLat || p0.pickupLat,
               pickupLon: details.lon || details.pickupLon || p0.pickupLon,
@@ -1656,55 +1543,106 @@ function toDatetimeLocalValue(date) {
 
         try {
           if (p.type === 'special') {
-          const specialKind = String((p.kind || p0.kind || 'event'));
-          const specialLabel = (specialKind === 'outing') ? 'Sortie' : 'Évènement';
-          const username = String(p.username || '').trim();
-          const userLine = username
-            ? `<div class="mb-2"><strong>Créé par</strong><br><a class="onekite-user-link" href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
-            : '';
-          const addr = String(p.pickupAddress || '').trim();
-          const lat = Number(p.pickupLat);
-          const lon = Number(p.pickupLon);
-          const hasCoords = Number.isFinite(lat) && Number.isFinite(lon);
-          const notes = String(p.notes || '').trim();
-          const addrHtml = addr
-            ? (hasCoords
-              ? `<a href="#" class="onekite-map-link" data-address="${escapeHtml(addr)}" data-lat="${escapeHtml(String(lat))}" data-lon="${escapeHtml(String(lon))}">${escapeHtml(addr)}</a>`
-              : `${escapeHtml(addr)}`)
-            : '';
-          const html = `
-            <div class="mb-2"><strong>Titre</strong><br>${escapeHtml(p.title || ev.title || '')}</div>
-            ${userLine}
-            <div class="mb-2"><strong>Période</strong><br>${escapeHtml(formatDtWithTime(ev.start))} → ${escapeHtml(formatDtWithTime(ev.end))}</div>
-            ${addr ? `<div class="mb-2"><strong>Adresse</strong><br>${addrHtml}</div>` : ''}
-            ${notes ? `<div class="mb-2"><strong>Notes</strong><br>${escapeHtml(notes).replace(/\n/g,'<br>')}</div>` : ''}
-          `;
-          const canDel = !!(p.canDeleteSpecial || canDeleteSpecial);
-          bootbox.dialog({
-            title: specialLabel,
-            message: html,
-            buttons: {
-              close: { label: 'Fermer', className: 'btn-secondary' },
-              ...(canDel ? {
-                del: {
-                  label: 'Supprimer',
-                  className: 'btn-danger',
-                  callback: async () => {
-                    try {
-                      const eid = String(p.eid || ev.id).replace(/^special:/, '');
-                      await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(eid)}`, { method: 'DELETE' });
-                      showAlert('success', `${specialLabel} supprimé.`);
-                      calendar.refetchEvents();
-                    } catch (e) {
-                      showAlert('error', 'Suppression impossible.');
-                    }
+            const username = String(p.username || '').trim();
+            const userLine = username
+              ? `<div class="mb-2"><strong>Créé par</strong><br><a class="onekite-user-link" href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
+              : '';
+            const addr = String(p.pickupAddress || p.address || '').trim();
+            const lat = Number(p.pickupLat || p.lat);
+            const lon = Number(p.pickupLon || p.lon);
+            const hasCoords = Number.isFinite(lat) && Number.isFinite(lon);
+            const notes = String(p.notes || '').trim();
+            const addrHtml = addr
+              ? (hasCoords
+                ? `<a href="#" class="onekite-map-link" data-address="${escapeHtml(addr)}" data-lat="${escapeHtml(String(lat))}" data-lon="${escapeHtml(String(lon))}">${escapeHtml(addr)}</a>`
+                : `${escapeHtml(addr)}`)
+              : '';
+            const html = `
+              <div class="mb-2"><strong>Titre</strong><br>${escapeHtml(p.title || ev.title || '')}</div>
+              ${userLine}
+              <div class="mb-2"><strong>Période</strong><br>${escapeHtml(formatDtWithTime(ev.start))} → ${escapeHtml(formatDtWithTime(ev.end))}</div>
+              ${addr ? `<div class="mb-2"><strong>Adresse</strong><br>${addrHtml}</div>` : ''}
+              ${notes ? `<div class="mb-2"><strong>Notes</strong><br>${escapeHtml(notes).replace(/\n/g,'<br>')}</div>` : ''}
+            `;
+            const canDel = !!(p.canDeleteSpecial || canDeleteSpecial);
+            bootbox.dialog({
+              title: 'Évènement',
+              message: html,
+              buttons: {
+                close: { label: 'Fermer', className: 'btn-secondary' },
+                ...(canDel ? {
+                  del: {
+                    label: 'Supprimer',
+                    className: 'btn-danger',
+                    callback: async () => {
+                      try {
+                        const eid = String(p.eid || ev.id).replace(/^special:/, '');
+                        await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(eid)}`, { method: 'DELETE' });
+                        showAlert('success', 'Évènement supprimé.');
+                        calendar.refetchEvents();
+                      } catch (e) {
+                        showAlert('error', 'Suppression impossible.');
+                      }
+                    },
                   },
-                },
-              } : {}),
-            },
-          });
-          return;
+                } : {}),
+              },
+            });
+            return;
+          }
+
+          if (p.type === 'outing') {
+            const username = String(p.username || '').trim();
+            const userLine = username
+              ? `<div class="mb-2"><strong>Créé par</strong><br><a class="onekite-user-link" href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
+              : '';
+            const addr = String(p.address || p.pickupAddress || '').trim();
+            const lat = Number(p.lat || p.pickupLat);
+            const lon = Number(p.lon || p.pickupLon);
+            const hasCoords = Number.isFinite(lat) && Number.isFinite(lon);
+            const notes = String(p.notes || '').trim();
+            const addrHtml = addr
+              ? (hasCoords
+                ? `<a href="#" class="onekite-map-link" data-address="${escapeHtml(addr)}" data-lat="${escapeHtml(String(lat))}" data-lon="${escapeHtml(String(lon))}">${escapeHtml(addr)}</a>`
+                : `${escapeHtml(addr)}`)
+              : '';
+            const html = `
+              <div class="mb-2"><strong>Titre</strong><br>${escapeHtml(p.title || ev.title || '')}</div>
+              ${userLine}
+              <div class="mb-2"><strong>Période</strong><br>${escapeHtml(formatDtWithTime(ev.start))} → ${escapeHtml(formatDtWithTime(ev.end))}</div>
+              ${addr ? `<div class="mb-2"><strong>Adresse</strong><br>${addrHtml}</div>` : ''}
+              ${notes ? `<div class="mb-2"><strong>Notes</strong><br>${escapeHtml(notes).replace(/\n/g,'<br>')}</div>` : ''}
+            `;
+            const canDel = !!(p.canDeleteOuting);
+            bootbox.dialog({
+              title: 'Prévision de sortie',
+              message: html,
+              buttons: {
+                close: { label: 'Fermer', className: 'btn-secondary' },
+                ...(canDel ? {
+                  del: {
+                    label: 'Annuler',
+                    className: 'btn-danger',
+                    callback: async () => {
+                      try {
+                        const oid = String(p.oid || ev.id).replace(/^outing:/, '');
+                        await fetchJson(`/api/v3/plugins/calendar-onekite/outings/${encodeURIComponent(oid)}`, { method: 'DELETE' });
+                        showAlert('success', 'Prévision annulée.');
+                        calendar.refetchEvents();
+                      } catch (e) {
+                        showAlert('error', 'Annulation impossible.');
+                      }
+                    },
+                  },
+                } : {}),
+              },
+            });
+            return;
+          }
+        } catch (e) {
+          // ignore
         }
+
         const rid = p.rid || ev.id;
         const status = p.status || '';
 
@@ -2016,9 +1954,6 @@ function toDatetimeLocalValue(date) {
           message: baseHtml,
           buttons,
         });
-        } finally {
-          isDialogOpen = false;
-        }
       },
     });
 
@@ -2150,7 +2085,7 @@ function toDatetimeLocalValue(date) {
   }
 
   
-async function openFabDatePicker() {
+async function openFabDatePicker(onSelection) {
   if (!lockAction('fab-date-picker', 700)) return;
 
   // Cannot book past dates (mobile FAB). Same-day booking is allowed.
@@ -2208,44 +2143,16 @@ async function openFabDatePicker() {
           const endExcl = new Date(e);
           endExcl.setDate(endExcl.getDate() + 1);
 
+          // If a callback is provided, delegate the next step (chooser).
+          if (typeof onSelection === 'function') {
+            try { onSelection({ start: s, end: endExcl, allDay: true }); } catch (e) {}
+            return true;
+          }
+
           (async () => {
             try {
               if (isDialogOpen) return;
               isDialogOpen = true;
-
-              // Let the user pick between a Location or an Outing forecast.
-              const choice = await new Promise((resolve) => {
-                bootbox.dialog({
-                  title: 'Créer',
-                  message: '<div>Que veux-tu créer ?</div>',
-                  buttons: {
-                    cancel: { label: 'Annuler', className: 'btn-secondary', callback: () => resolve(null) },
-                    outing: { label: 'Prévision de sortie', className: 'btn-info', callback: () => resolve('outing') },
-                    reservation: { label: 'Location', className: 'btn-primary', callback: () => resolve('reservation') },
-                  },
-                });
-              });
-
-              if (!choice) return;
-
-              if (choice === 'outing') {
-                const payload = await openSpecialEventDialog({ start: s, end: endExcl, allDay: true }, { kind: 'outing', dialogTitle: 'Créer une prévision de sortie', defaultTitle: 'Sortie' });
-                if (!payload) 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', 'Sortie créée.');
-                invalidateEventsCache();
-                if (currentCalendar) scheduleRefetch(currentCalendar);
-                return;
-              }
-
               const items = cachedItems || (await loadItems());
               const chosen = await openReservationDialog({ start: s, end: endExcl }, items);
               if (chosen && chosen.itemIds && chosen.itemIds.length) {
@@ -2268,8 +2175,6 @@ async function openFabDatePicker() {
               }
             } catch (err) {
               // ignore
-            } finally {
-              isDialogOpen = false;
             }
           })();
 
@@ -2405,6 +2310,33 @@ async function openFabDatePicker() {
           render();
         });
       }
+
+      // Swipe left/right to change month
+      try {
+        const root = document.getElementById('onekite-range-picker');
+        if (root) {
+          let x0 = null;
+          root.addEventListener('touchstart', (ev) => {
+            try { x0 = ev.touches && ev.touches[0] ? ev.touches[0].clientX : null; } catch (e) { x0 = null; }
+          }, { passive: true });
+          root.addEventListener('touchend', (ev) => {
+            try {
+              if (x0 === null) return;
+              const x1 = ev.changedTouches && ev.changedTouches[0] ? ev.changedTouches[0].clientX : null;
+              if (x1 === null) return;
+              const dx = x1 - x0;
+              if (Math.abs(dx) < 40) return;
+              if (dx < 0) {
+                state.cursor.setMonth(state.cursor.getMonth() + 1);
+              } else {
+                state.cursor.setMonth(state.cursor.getMonth() - 1);
+              }
+              render();
+            } catch (e) {}
+            finally { x0 = null; }
+          }, { passive: true });
+        }
+      } catch (e) {}
       render();
     } catch (e) {}
   });
@@ -2436,7 +2368,7 @@ function parseYmdDate(ymdStr) {
       fabEl.setAttribute('aria-label', 'Nouvelle réservation');
       fabEl.innerHTML = '<i class="fa fa-plus"></i>';
 
-      fabHandler = () => openFabDatePicker();
+      fabHandler = () => openFabDatePicker(handleCreateFromSelection);
       fabEl.addEventListener('click', fabHandler);
 
       document.body.appendChild(fabEl);