nodebb-plugin-calendar-onekite 11.1.71 → 11.1.72

package/lib/admin.js

@@ -22,7 +22,12 @@ async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
   try {
     if (typeof emailer.sendToEmail === 'function') {
-      await emailer.sendToEmail(template, toEmail, subject, data);
+      if (emailer.sendToEmail.length >= 4) {
+        await emailer.sendToEmail(template, toEmail, subject, data);
+      } else {
+        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
+        await emailer.sendToEmail(template, toEmail, dataWithSubject);
+      }
       return;
     }
     if (typeof emailer.send === 'function') {
@@ -227,6 +232,24 @@ admin.purgeByYear = async function (req, res) {
   res.json({ ok: true, removed: count });
 };
 
+admin.purgeSpecialEventsByYear = 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.listSpecialIdsByStartRange(startTs, endTs, 100000);
+  let count = 0;
+  for (const eid of ids) {
+    await dbLayer.removeSpecialEvent(eid);
+    count++;
+  }
+  return res.json({ ok: true, removed: count });
+};
+
 // Debug endpoint to validate HelloAsso connectivity and item loading
 
 

package/lib/helloassoWebhook.js

@@ -28,7 +28,15 @@ async function sendEmail(template, toEmail, subject, data) {
   const emailer = require.main.require('./src/emailer');
   try {
     if (typeof emailer.sendToEmail === 'function') {
-      await emailer.sendToEmail(template, toEmail, subject, data);
+      // NodeBB versions differ:
+      // - sendToEmail(template, email, subject, data)
+      // - sendToEmail(template, email, data)
+      if (emailer.sendToEmail.length >= 4) {
+        await emailer.sendToEmail(template, toEmail, subject, data);
+      } else {
+        const dataWithSubject = Object.assign({}, data || {}, { subject });
+        await emailer.sendToEmail(template, toEmail, dataWithSubject);
+      }
       return;
     }
     if (typeof emailer.send === 'function') {
@@ -37,7 +45,8 @@ async function sendEmail(template, toEmail, subject, data) {
         return;
       }
       if (emailer.send.length === 3) {
-        await emailer.send(template, toEmail, data);
+        const dataWithSubject = Object.assign({}, data || {}, { subject });
+        await emailer.send(template, toEmail, dataWithSubject);
         return;
       }
       await emailer.send(template, toEmail, subject, data);
@@ -185,31 +194,6 @@ function isConfirmedPayment(payload) {
   }
 }
 
-async function sendEmail(template, toEmail, subject, data) {
-  if (!toEmail) return;
-  const emailer = require.main.require('./src/emailer');
-  try {
-    if (typeof emailer.sendToEmail === 'function') {
-      await emailer.sendToEmail(template, toEmail, subject, data);
-      return;
-    }
-    if (typeof emailer.send === 'function') {
-      if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, subject, data);
-        return;
-      }
-      if (emailer.send.length === 3) {
-        await emailer.send(template, toEmail, data);
-        return;
-      }
-      await emailer.send(template, toEmail, subject, data);
-    }
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email (webhook)', { template, toEmail, err: String(err && err.message || err) });
-  }
-}
-
 function formatFR(tsOrIso) {
   const d = new Date(tsOrIso);
   const dd = String(d.getDate()).padStart(2, '0');

package/library.js

@@ -110,6 +110,9 @@ Plugin.init = async function (params) {
     router.get(`${base}/accounting`, ...adminMws, admin.getAccounting);
     router.get(`${base}/accounting.csv`, ...adminMws, admin.exportAccountingCsv);
     router.post(`${base}/accounting/purge`, ...adminMws, admin.purgeAccounting);
+
+    // Purge special events by year
+    router.post(`${base}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
   });
 
   // HelloAsso callback endpoint (hardened)

package/package.json

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

package/public/admin.js

@@ -419,6 +419,20 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     });
   }
 
+  async function purgeSpecialEvents(year) {
+    try {
+      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/special-events/purge', {
+        method: 'POST',
+        body: JSON.stringify({ year }),
+      });
+    } catch (e) {
+      return await fetchJson('/api/admin/plugins/calendar-onekite/special-events/purge', {
+        method: 'POST',
+        body: JSON.stringify({ year }),
+      });
+    }
+  }
+
   async function debugHelloAsso() {
     try {
       return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
@@ -439,22 +453,6 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     const form = document.getElementById('onekite-settings-form');
     if (!form) return;
 
-    // Inject missing settings fields if the template is older
-    function ensureTextInput(name, label, help) {
-      if (form.querySelector(`[name="${name}"]`)) return;
-      const div = document.createElement('div');
-      div.className = 'mb-3';
-      div.innerHTML = `
-        <label class="form-label">${label}</label>
-        <input type="text" class="form-control" name="${name}" placeholder="" />
-        ${help ? `<div class="form-text">${help}</div>` : ''}
-      `;
-      form.appendChild(div);
-    }
-
-    ensureTextInput('specialCreatorGroups', 'Groupes autorisés à créer des évènements (csv)', 'Ex: groupA,groupB');
-    ensureTextInput('specialDeleterGroups', 'Groupes autorisés à supprimer des évènements (csv)', 'Par défaut, si vide : même liste que la création');
-
     // Load settings
     try {
       const s = await loadSettings();
@@ -603,6 +601,28 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
       });
     }
 
+    // Purge special events by year
+    const sePurgeBtn = document.getElementById('onekite-se-purge');
+    if (sePurgeBtn) {
+      sePurgeBtn.addEventListener('click', async () => {
+        const yearInput = document.getElementById('onekite-se-purge-year');
+        const year = (yearInput ? yearInput.value : '').trim();
+        if (!/^\d{4}$/.test(year)) {
+          showAlert('error', 'Année invalide (YYYY)');
+          return;
+        }
+        bootbox.confirm(`Purger tous les évènements de ${year} ?`, async (ok) => {
+          if (!ok) return;
+          try {
+            const r = await purgeSpecialEvents(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

@@ -118,6 +118,61 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     });
   }
 
+  async function openMapViewer(title, address, lat, lon) {
+    const mapId = `onekite-map-view-${Date.now()}-${Math.floor(Math.random()*10000)}`;
+    const safeAddr = (address || '').trim();
+    const html = `
+      ${safeAddr ? `<div class="mb-2">${escapeHtml(safeAddr)}</div>` : ''}
+      <div id="${mapId}" style="height:260px; border:1px solid #ddd; border-radius:6px;"></div>
+    `;
+    bootbox.dialog({
+      title: title || 'Carte',
+      message: html,
+      buttons: { close: { label: 'Fermer', className: 'btn-secondary' } },
+    });
+    setTimeout(async () => {
+      try {
+        const el = document.getElementById(mapId);
+        if (!el) return;
+        const L = await loadLeaflet();
+        const map = L.map(el);
+        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { maxZoom: 19, attribution: '&copy; OpenStreetMap' }).addTo(map);
+
+        async function setAt(lat2, lon2) {
+          map.setView([lat2, lon2], 14);
+          L.marker([lat2, lon2]).addTo(map);
+        }
+
+        const hasCoords = Number.isFinite(lat) && Number.isFinite(lon);
+        if (hasCoords) {
+          await setAt(lat, lon);
+          return;
+        }
+        if (safeAddr) {
+          const hit = await geocodeAddress(safeAddr);
+          if (hit && hit.lat && hit.lon) {
+            await setAt(hit.lat, hit.lon);
+            return;
+          }
+        }
+        map.setView([46.5, 2.5], 5);
+      } catch (e) {
+        // ignore leaflet errors
+      }
+    }, 0);
+  }
+
+  // Click handler for map links in popups
+  document.addEventListener('click', (ev) => {
+    const a = ev.target && ev.target.closest ? ev.target.closest('a.onekite-map-link') : null;
+    if (!a) return;
+    ev.preventDefault();
+    const addr = a.getAttribute('data-address') || a.textContent || '';
+    const lat = parseFloat(a.getAttribute('data-lat'));
+    const lon = parseFloat(a.getAttribute('data-lon'));
+    openMapViewer('Adresse', addr, lat, lon);
+  });
+
   function statusLabel(s) {
     const map = {
       pending: 'En attente',
@@ -524,12 +579,20 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
             ? `<div class="mb-2"><strong>Créé par</strong><br><a 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(formatDt(ev.start))} → ${escapeHtml(formatDt(ev.end))}</div>
-            ${addr ? `<div class="mb-2"><strong>Adresse</strong><br>${escapeHtml(addr)}</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);

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

@@ -6,7 +6,10 @@
 
     <ul class="nav nav-tabs mt-3" role="tablist">
       <li class="nav-item" role="presentation">
-        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#onekite-tab-settings" type="button" role="tab">Paramètres</button>
+        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#onekite-tab-settings" type="button" role="tab">Locations</button>
+      </li>
+      <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-pending" type="button" role="tab">Demandes en attente</button>
@@ -20,13 +23,13 @@
     </ul>
 
     <div class="tab-content pt-3">
+      <form id="onekite-settings-form" class="mt-1">
       <div class="tab-pane fade show active" id="onekite-tab-settings" role="tabpanel">
-        <form id="onekite-settings-form" class="mt-1">
           <h4>Groupes</h4>
           <div class="mb-3">
             <label class="form-label">Groupes autorisés à créer une demande (csv)</label>
             <input class="form-control" name="creatorGroups" placeholder="ex: registered-users,membres">
-            <div class="form-text">Si vide, tous les utilisateurs connectés peuvent créer une demande.</div>
+            <div class="form-text">Le groupe <code>onekite-ffvl-YYYY</code> est automatiquement ajouté au début. Tu peux ajouter d'autres groupes à la suite.</div>
           </div>
 
           <div class="mb-3">
@@ -84,10 +87,33 @@
             <label class="form-label">Form Slug</label>
             <input class="form-control" name="helloassoFormSlug">
           </div>
+      </div>
+
+      <div class="tab-pane fade" id="onekite-tab-events" role="tabpanel">
+        <h4>Évènements (autre couleur)</h4>
+        <div class="form-text mb-3">Permet de créer des évènements horaires (début/fin) avec adresse (Leaflet) et notes.</div>
+
+        <div class="mb-3">
+          <label class="form-label">Groupes autorisés à créer des évènements (csv)</label>
+          <input class="form-control" name="specialCreatorGroups" placeholder="ex: staff,instructors">
+        </div>
 
-        </form>
+        <div class="mb-3">
+          <label class="form-label">Groupes autorisés à supprimer des évènements (csv)</label>
+          <input class="form-control" name="specialDeleterGroups" placeholder="Si vide: même liste que la création">
+        </div>
+
+        <hr class="my-4" />
+        <h4>Purge des évènements</h4>
+        <div class="d-flex gap-2 align-items-center">
+          <input class="form-control" style="max-width: 160px;" id="onekite-se-purge-year" placeholder="YYYY">
+          <button type="button" class="btn btn-outline-danger" id="onekite-se-purge">Purger</button>
+        </div>
+        <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>
 
+      </form>
+
       <div class="tab-pane fade" id="onekite-tab-pending" role="tabpanel">
         <h4>Demandes en attente</h4>
         <div id="onekite-pending" class="list-group"></div>