nodebb-plugin-onekite-calendar 2.0.42 → 2.0.43

package/lib/admin.js

@@ -305,6 +305,24 @@ admin.purgeSpecialEventsByYear = async function (req, res) {
   return res.json({ ok: true, removed: count });
 };
 
+admin.purgeOutingsByYear = async function (req, res) {
+  const year = (req.body && req.body.year ? String(req.body.year) : '').trim();
+  if (!/^\d{4}$/.test(year)) {
+    return res.status(400).json({ error: 'invalid-year' });
+  }
+  const y = parseInt(year, 10);
+  const startTs = new Date(Date.UTC(y, 0, 1)).getTime();
+  const endTs = new Date(Date.UTC(y + 1, 0, 1)).getTime() - 1;
+
+  const ids = await dbLayer.listOutingIdsByStartRange(startTs, endTs, 200000);
+  let count = 0;
+  for (const oid of ids) {
+    await dbLayer.removeOuting(oid);
+    count++;
+  }
+  return res.json({ ok: true, removed: count });
+};
+
 // Debug endpoint to validate HelloAsso connectivity and item loading
 
 

package/lib/api.js

@@ -469,6 +469,35 @@ function eventsForSpecial(ev) {
   };
 }
 
+
+function eventsForOuting(o) {
+  const start = new Date(parseInt(o.start, 10));
+  const end = new Date(parseInt(o.end, 10));
+  const startIso = start.toISOString();
+  const endIso = end.toISOString();
+  return {
+    id: `outing:${o.oid}`,
+    title: `${o.title || 'Prévision de sortie'}`.trim(),
+    allDay: false,
+    start: startIso,
+    end: endIso,
+    backgroundColor: '#2980b9',
+    borderColor: '#2980b9',
+    textColor: '#ffffff',
+    extendedProps: {
+      type: 'outing',
+      oid: o.oid,
+      title: o.title || '',
+      notes: o.notes || '',
+      pickupAddress: o.address || '',
+      pickupLat: o.lat || '',
+      pickupLon: o.lon || '',
+      createdBy: o.uid || 0,
+      username: o.username || '',
+    },
+  };
+}
+
 const api = {};
 
 function computeEtag(payload) {
@@ -623,6 +652,41 @@ api.getEvents = async function (req, res) {
     // ignore
   }
 
+
+  // Outings (prévisions de sortie)
+  try {
+    const outingIds = await dbLayer.listOutingIdsByStartRange(wideStart, endTs, 8000);
+    const outings = await dbLayer.getOutings(outingIds);
+    for (const o of (outings || [])) {
+      if (!o) continue;
+      const oStart = parseInt(o.start, 10);
+      const oEnd = parseInt(o.end, 10);
+      if (!(oStart < endTs && startTs < oEnd)) continue;
+      const full = eventsForOuting(o);
+      const minimal = {
+        id: full.id,
+        title: full.title,
+        allDay: full.allDay,
+        start: full.start,
+        end: full.end,
+        backgroundColor: full.backgroundColor,
+        borderColor: full.borderColor,
+        textColor: full.textColor,
+        extendedProps: {
+          type: 'outing',
+          oid: o.oid,
+          canDeleteOuting: canMod || (req.uid && String(req.uid) === String(o.uid)),
+        },
+      };
+      if (o.username && (canMod || (req.uid && String(req.uid) === String(o.uid)))) {
+        minimal.extendedProps.username = String(o.username);
+      }
+      out.push(minimal);
+    }
+  } catch (e) {
+    // ignore
+  }
+
   // Stable ordering -> stable ETag
   out.sort((a, b) => {
     const as = String(a.start || '');
@@ -730,6 +794,7 @@ api.getCapabilities = async function (req, res) {
     canModerate: canMod,
     canCreateSpecial: uid ? await canCreateSpecial(uid, settings) : false,
     canDeleteSpecial: uid ? await canDeleteSpecial(uid, settings) : false,
+    canCreateOuting: uid ? await canRequest(uid, settings, Date.now()) : false,
   });
 };
 
@@ -745,6 +810,19 @@ api.createSpecialEvent = async function (req, res) {
   if (!Number.isFinite(startTs) || !Number.isFinite(endTs) || !(startTs < endTs)) {
     return res.status(400).json({ error: 'bad-dates' });
   }
+
+  // Business rule: nothing can be created in the past.
+  try {
+    const today0 = new Date();
+    today0.setHours(0, 0, 0, 0);
+    const today0ts = today0.getTime();
+    if (startTs < today0ts) {
+      return res.status(400).json({
+        error: 'date-too-soon',
+        message: "Impossible de créer pour une date passée.",
+      });
+    }
+  } catch (e) {}
   const address = String((req.body && req.body.address) || '').trim();
   const notes = String((req.body && req.body.notes) || '').trim();
   const lat = String((req.body && req.body.lat) || '').trim();
@@ -766,6 +844,11 @@ api.createSpecialEvent = async function (req, res) {
     createdAt: String(Date.now()),
   };
   await dbLayer.saveSpecialEvent(ev);
+
+  try {
+    await discord.notifySpecialEventCreated(settings, ev);
+  } catch (e) {}
+
   // Real-time refresh for all viewers
   realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'created', eid: ev.eid });
   res.json({ ok: true, eid });
@@ -779,10 +862,125 @@ api.deleteSpecialEvent = async function (req, res) {
   const eid = String(req.params.eid || '').replace(/^special:/, '').trim();
   if (!eid) return res.status(400).json({ error: 'bad-id' });
   await dbLayer.removeSpecialEvent(eid);
+
+  try {
+    await discord.notifySpecialEventDeleted(settings, Object.assign({}, { eid }, { deletedBy: String(req.uid || '') }));
+  } catch (e) {}
+
   realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'deleted', eid });
   res.json({ ok: true });
 };
 
+api.getOutingDetails = async function (req, res) {
+  const uid = req.uid;
+  if (!uid) return res.status(401).json({ error: 'not-logged-in' });
+
+  const settings = await meta.settings.get('calendar-onekite');
+  const canMod = await canValidate(uid, settings);
+
+  const oid = String(req.params.oid || '').trim();
+  if (!oid) return res.status(400).json({ error: 'missing-oid' });
+  const o = await dbLayer.getOuting(oid);
+  if (!o) return res.status(404).json({ error: 'not-found' });
+
+  const out = {
+    oid: o.oid,
+    title: o.title || '',
+    start: o.start,
+    end: o.end,
+    address: o.address || '',
+    lat: o.lat || '',
+    lon: o.lon || '',
+    notes: o.notes || '',
+    canDeleteOuting: canMod || (uid && String(uid) === String(o.uid)),
+  };
+  if (o.username && (canMod || (uid && String(uid) === String(o.uid)))) {
+    out.username = String(o.username);
+  }
+  return res.json(out);
+};
+
+api.createOuting = async function (req, res) {
+  const settings = await meta.settings.get('calendar-onekite');
+  if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
+
+  const startTs = toTs(req.body && req.body.start);
+  const ok = await canRequest(req.uid, settings, startTs);
+  if (!ok) return res.status(403).json({ error: 'not-allowed' });
+
+  const title = String((req.body && req.body.title) || '').trim() || 'Prévision de sortie';
+  const endTs = toTs(req.body && req.body.end);
+  if (!Number.isFinite(startTs) || !Number.isFinite(endTs) || !(startTs < endTs)) {
+    return res.status(400).json({ error: 'bad-dates' });
+  }
+
+  // Business rule: nothing can be created in the past.
+  try {
+    const today0 = new Date();
+    today0.setHours(0, 0, 0, 0);
+    const today0ts = today0.getTime();
+    if (startTs < today0ts) {
+      return res.status(400).json({
+        error: 'date-too-soon',
+        message: "Impossible de créer pour une date passée.",
+      });
+    }
+  } catch (e) {}
+
+  const address = String((req.body && req.body.address) || '').trim();
+  const notes = String((req.body && req.body.notes) || '').trim();
+  const lat = String((req.body && req.body.lat) || '').trim();
+  const lon = String((req.body && req.body.lon) || '').trim();
+
+  const u = await user.getUserFields(req.uid, ['username']);
+  const oid = crypto.randomUUID();
+  const o = {
+    oid,
+    title,
+    start: String(startTs),
+    end: String(endTs),
+    address,
+    notes,
+    lat,
+    lon,
+    uid: String(req.uid),
+    username: u && u.username ? String(u.username) : '',
+    createdAt: String(Date.now()),
+  };
+  await dbLayer.saveOuting(o);
+
+  try {
+    await discord.notifyOutingCreated(settings, o);
+  } catch (e) {}
+
+  realtime.emitCalendarUpdated({ kind: 'outing', action: 'created', oid: o.oid });
+  return res.json({ ok: true, oid });
+};
+
+api.deleteOuting = async function (req, res) {
+  const settings = await meta.settings.get('calendar-onekite');
+  if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
+
+  const oid = String(req.params.oid || '').replace(/^outing:/, '').trim();
+  if (!oid) return res.status(400).json({ error: 'bad-id' });
+
+  const o = await dbLayer.getOuting(oid);
+  if (!o) return res.status(404).json({ error: 'not-found' });
+
+  const canMod = await canValidate(req.uid, settings);
+  const isOwner = String(o.uid) === String(req.uid);
+  if (!canMod && !isOwner) return res.status(403).json({ error: 'not-allowed' });
+
+  await dbLayer.removeOuting(oid);
+
+  try {
+    await discord.notifyOutingDeleted(settings, Object.assign({}, o, { deletedBy: String(req.uid || '') }));
+  } catch (e) {}
+
+  realtime.emitCalendarUpdated({ kind: 'outing', action: 'deleted', oid });
+  return res.json({ ok: true });
+};
+
 api.getItems = async function (req, res) {
   const settings = await meta.settings.get('calendar-onekite');
 

package/lib/db.js

@@ -10,6 +10,10 @@ const KEY_CHECKOUT_INTENT_TO_RID = 'calendar-onekite:helloasso:checkoutIntentToR
 const KEY_SPECIAL_ZSET = 'calendar-onekite:special';
 const KEY_SPECIAL_OBJ = (eid) => `calendar-onekite:special:${eid}`;
 
+// Outings (previsions de sortie)
+const KEY_OUTING_ZSET = 'calendar-onekite:outings';
+const KEY_OUTING_OBJ = (oid) => `calendar-onekite:outings:${oid}`;
+
 // Maintenance (simple ON/OFF per item, no dates)
 const KEY_MAINTENANCE_ZSET = 'calendar-onekite:maintenance:itemIds';
 
@@ -26,6 +30,10 @@ function specialKey(eid) {
   return KEY_SPECIAL_OBJ(eid);
 }
 
+function outingKey(oid) {
+  return KEY_OUTING_OBJ(oid);
+}
+
 async function getReservation(rid) {
   return await db.getObject(KEY_OBJ(rid));
 }
@@ -208,6 +216,34 @@ module.exports = {
     const stop = Math.max(0, (parseInt(limit, 10) || 2000) - 1);
     return await db.getSortedSetRangeByScore(KEY_SPECIAL_ZSET, start, stop, startTs, endTs);
   },
+
+  // Outings
+  getOuting: async (oid) => await db.getObject(KEY_OUTING_OBJ(oid)),
+  getOutings: async (oids) => {
+    const ids = Array.isArray(oids) ? oids.filter(Boolean) : [];
+    if (!ids.length) return [];
+    const keys = ids.map(outingKey);
+    const rows = await db.getObjects(keys);
+    return (rows || []).map((row, idx) => {
+      if (!row) return null;
+      if (!row.oid) row.oid = String(ids[idx]);
+      return row;
+    });
+  },
+  saveOuting: async (o) => {
+    await db.setObject(KEY_OUTING_OBJ(o.oid), o);
+    await db.sortedSetAdd(KEY_OUTING_ZSET, o.start, o.oid);
+  },
+  removeOuting: async (oid) => {
+    await db.sortedSetRemove(KEY_OUTING_ZSET, oid);
+    await db.delete(KEY_OUTING_OBJ(oid));
+  },
+  listOutingIdsByStartRange: async (startTs, endTs, limit = 5000) => {
+    const start = 0;
+    const stop = Math.max(0, (parseInt(limit, 10) || 5000) - 1);
+    return await db.getSortedSetRangeByScore(KEY_OUTING_ZSET, start, stop, startTs, endTs);
+  },
+
   listReservationIdsByStartRange,
   listAllReservationIds,
 

package/lib/discord.js

@@ -183,8 +183,93 @@ async function notifyReservationCancelled(settings, reservation) {
   }
 }
 
+
+
+// --------------------------
+// Special events & outings
+// --------------------------
+
+function buildSimpleCalendarPayload(kind, label, entity, opts) {
+  const options = opts || {};
+  const calUrl = options.calUrl || 'https://www.onekite.com/calendar';
+  const webhookUsername = options.webhookUsername || `Onekite • ${label}`;
+
+  const title = kind === 'deleted' ? '❌ ' + label + ' annulé(e)' : label + ' créé(e)';
+  const showIcon = kind === 'deleted';
+  const embedTitle = showIcon ? title : title.replace(/^❌\s*/, '');
+
+  const start = entity && entity.start ? Number(entity.start) : NaN;
+  const end = entity && entity.end ? Number(entity.end) : NaN;
+  const fields = [];
+  const name = entity && entity.title ? String(entity.title) : '';
+  if (name) fields.push({ name: 'Titre', value: name, inline: false });
+  if (Number.isFinite(start) && Number.isFinite(end)) {
+    fields.push({ name: 'Période', value: `Du ${formatFRShort(start)} au ${formatFRShort(end)}`, inline: false });
+  }
+  const username = entity && entity.username ? String(entity.username) : '';
+  if (username) fields.push({ name: 'Membre', value: username, inline: true });
+
+  return {
+    username: webhookUsername,
+    content: '',
+    embeds: [
+      {
+        title: embedTitle,
+        url: calUrl,
+        description: kind === 'deleted' ? 'Une entrée a été annulée.' : 'Une nouvelle entrée a été créée.',
+        fields,
+        footer: { text: 'Onekite • Calendrier' },
+        timestamp: new Date().toISOString(),
+      },
+    ],
+  };
+}
+
+async function notifySpecialEventCreated(settings, ev) {
+  const url = settings && settings.discordWebhookUrlEvents ? String(settings.discordWebhookUrlEvents).trim() : '';
+  if (!url) return;
+  try {
+    await postWebhook(url, buildSimpleCalendarPayload('created', 'Évènement', ev, { webhookUsername: 'Onekite • Évènement' }));
+  } catch (e) {
+    console.warn('[calendar-onekite] Discord webhook failed (event created)', e && e.message ? e.message : String(e));
+  }
+}
+
+async function notifySpecialEventDeleted(settings, ev) {
+  const url = settings && settings.discordWebhookUrlEvents ? String(settings.discordWebhookUrlEvents).trim() : '';
+  if (!url) return;
+  try {
+    await postWebhook(url, buildSimpleCalendarPayload('deleted', 'Évènement', ev, { webhookUsername: 'Onekite • Annulation' }));
+  } catch (e) {
+    console.warn('[calendar-onekite] Discord webhook failed (event deleted)', e && e.message ? e.message : String(e));
+  }
+}
+
+async function notifyOutingCreated(settings, o) {
+  const url = settings && settings.discordWebhookUrlOutings ? String(settings.discordWebhookUrlOutings).trim() : '';
+  if (!url) return;
+  try {
+    await postWebhook(url, buildSimpleCalendarPayload('created', 'Sortie', o, { webhookUsername: 'Onekite • Sortie' }));
+  } catch (e) {
+    console.warn('[calendar-onekite] Discord webhook failed (outing created)', e && e.message ? e.message : String(e));
+  }
+}
+
+async function notifyOutingDeleted(settings, o) {
+  const url = settings && settings.discordWebhookUrlOutings ? String(settings.discordWebhookUrlOutings).trim() : '';
+  if (!url) return;
+  try {
+    await postWebhook(url, buildSimpleCalendarPayload('deleted', 'Sortie', o, { webhookUsername: 'Onekite • Annulation' }));
+  } catch (e) {
+    console.warn('[calendar-onekite] Discord webhook failed (outing deleted)', e && e.message ? e.message : String(e));
+  }
+}
 module.exports = {
   notifyReservationRequested,
   notifyPaymentReceived,
   notifyReservationCancelled,
+  notifySpecialEventCreated,
+  notifySpecialEventDeleted,
+  notifyOutingCreated,
+  notifyOutingDeleted,
 };

package/library.js

@@ -83,6 +83,11 @@ Plugin.init = async function (params) {
   router.get('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.getSpecialEventDetails);
   router.delete('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.deleteSpecialEvent);
 
+  // Outings (prévisions de sortie)
+  router.post('/api/v3/plugins/calendar-onekite/outings', ...publicExpose, api.createOuting);
+  router.get('/api/v3/plugins/calendar-onekite/outings/:oid', ...publicExpose, api.getOutingDetails);
+  router.delete('/api/v3/plugins/calendar-onekite/outings/:oid', ...publicExpose, api.deleteOuting);
+
   // Admin API (JSON)
   const adminBases = ['/api/v3/admin/plugins/calendar-onekite'];
 
@@ -103,6 +108,8 @@ Plugin.init = async function (params) {
 
     // Purge special events by year
     router.post(`${base}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
+    // Purge outings by year
+    router.post(`${base}/outings/purge`, ...adminMws, admin.purgeOutingsByYear);
   });
 
   // HelloAsso callback endpoint (hardened)

package/package.json

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

package/public/admin.js

@@ -559,6 +559,20 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     }
   }
 
+  async function purgeOutings(year) {
+    try {
+      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/outings/purge', {
+        method: 'POST',
+        body: JSON.stringify({ year }),
+      });
+    } catch (e) {
+      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/outings/purge', {
+        method: 'POST',
+        body: JSON.stringify({ year }),
+      });
+    }
+  }
+
   async function debugHelloAsso() {
     try {
       return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
@@ -1128,6 +1142,28 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
       });
     }
 
+
+    // Purge outings by year
+    const outPurgeBtn = document.getElementById('onekite-out-purge');
+    if (outPurgeBtn) {
+      outPurgeBtn.addEventListener('click', async () => {
+        const yearInput = document.getElementById('onekite-out-purge-year');
+        const year = (yearInput ? yearInput.value : '').trim();
+        if (!/^\d{4}$/.test(year)) {
+          showAlert('error', 'Année invalide (YYYY)');
+          return;
+        }
+        bootbox.confirm(`Purger toutes les sorties de ${year} ?`, async (ok) => {
+          if (!ok) return;
+          try {
+            const r = await purgeOutings(year);
+            showAlert('success', `Purge OK (${r.removed || 0} supprimé(s)).`);
+          } catch (e) {
+            showAlert('error', 'Purge impossible.');
+          }
+        });
+      });
+    }
     // Debug
     const debugBtn = document.getElementById('onekite-debug-run');
     if (debugBtn) {

package/public/client.js

@@ -427,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();
@@ -1158,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 {
@@ -1315,100 +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) {}
 
-        // 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;
 
@@ -1416,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, {
@@ -1455,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,
@@ -1585,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,
@@ -1598,53 +1543,106 @@ function toDatetimeLocalValue(date) {
 
         try {
           if (p.type === 'special') {
-          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: 'É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.');
-                    }
+            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 || '';
 
@@ -1956,9 +1954,6 @@ function toDatetimeLocalValue(date) {
           message: baseHtml,
           buttons,
         });
-        } finally {
-          isDialogOpen = false;
-        }
       },
     });
 
@@ -2090,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.
@@ -2148,6 +2143,12 @@ 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;
@@ -2174,8 +2175,6 @@ async function openFabDatePicker() {
               }
             } catch (err) {
               // ignore
-            } finally {
-              isDialogOpen = false;
             }
           })();
 
@@ -2311,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) {}
   });
@@ -2342,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);

package/templates/admin/plugins/calendar-onekite.tpl

@@ -11,6 +11,9 @@
       <li class="nav-item" role="presentation">
         <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-events" type="button" role="tab">Évènements</button>
       </li>
+      <li class="nav-item" role="presentation">
+        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-outings" type="button" role="tab">Sorties</button>
+      </li>
       <li class="nav-item" role="presentation">
         <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-pending" type="button" role="tab">Demandes en attente</button>
       </li>
@@ -80,6 +83,18 @@
             <div class="form-text">Si vide, aucune notification Discord n'est envoyée.</div>
           </div>
 
+          <div class="mb-3">
+            <label class="form-label">Webhook URL — Évènements</label>
+            <input class="form-control" name="discordWebhookUrlEvents" placeholder="https://discord.com/api/webhooks/...">
+            <div class="form-text">Canal Discord dédié aux notifications d'évènements (création / annulation).</div>
+          </div>
+
+          <div class="mb-3">
+            <label class="form-label">Webhook URL — Sorties</label>
+            <input class="form-control" name="discordWebhookUrlOutings" placeholder="https://discord.com/api/webhooks/...">
+            <div class="form-text">Canal Discord dédié aux notifications de sorties (création / annulation).</div>
+          </div>
+
           <div class="mb-3">
             <label class="form-label">Envoyer une notification à la demande</label>
             <select class="form-select" name="discordNotifyOnRequest">
@@ -177,6 +192,20 @@
         <div class="form-text mt-2">Supprime définitivement tous les évènements dont la date de début est dans l'année sélectionnée.</div>
       </div>
 
+      <div class="tab-pane fade" id="onekite-tab-outings" role="tabpanel">
+        <h4>Sorties (prévisions)</h4>
+        <div class="form-text mb-3">Prévisions de sortie (autre couleur) créées par les utilisateurs autorisés à faire une demande de location. Les utilisateurs peuvent annuler leurs propres prévisions. Les droits sont ceux des locations.</div>
+
+        <hr class="my-4" />
+        <h4>Purge des sorties</h4>
+        <div class="d-flex gap-2 align-items-center">
+          <input class="form-control" style="max-width: 160px;" id="onekite-out-purge-year" placeholder="YYYY">
+          <button type="button" class="btn btn-outline-danger" id="onekite-out-purge">Purger</button>
+        </div>
+        <div class="form-text mt-2">Supprime définitivement toutes les sorties dont la date de début est dans l'année sélectionnée.</div>
+      </div>
+
+
       <div class="tab-pane fade" id="onekite-tab-pending" role="tabpanel">
         <h4>Demandes en attente</h4>
         <div id="onekite-pending" class="list-group"></div>