nodebb-plugin-calendar-onekite 11.1.85 → 11.1.86

package/lib/api.js

@@ -3,6 +3,7 @@
 const crypto = require('crypto');
 
 const meta = require.main.require('./src/meta');
+const emailer = require.main.require('./src/emailer');
 const nconf = require.main.require('nconf');
 const user = require.main.require('./src/user');
 const groups = require.main.require('./src/groups');
@@ -14,35 +15,33 @@ const helloasso = require('./helloasso');
 // We try the common forms. Any failure is logged for debugging.
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
-  const emailer = require.main.require('./src/emailer');
-  const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
   try {
-    // NodeBB's Emailer API differs across versions; the most reliable approach is to pass `subject` inside `data`.
+    // NodeBB core signature (historically):
+    //   Emailer.sendToEmail(template, email, language, params[, callback])
+    // Subject is not a positional arg; it must be injected (either by NodeBB itself
+    // or via filter:email.modify). We always pass it in params.subject.
+    const language = (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
+    const params = Object.assign({}, data || {}, subject ? { subject } : {});
     if (typeof emailer.sendToEmail === 'function') {
-      // Prefer 3-args (template, email, data) when possible
-      if (emailer.sendToEmail.length >= 3) {
-        await emailer.sendToEmail(template, toEmail, dataWithSubject);
-        return;
-      }
-      // Fallback
-      await emailer.sendToEmail(template, toEmail, subject, data);
+      await emailer.sendToEmail(template, toEmail, language, params);
       return;
     }
+    // Fallback for older/unusual builds (rare)
     if (typeof emailer.send === 'function') {
-      if (emailer.send.length >= 3) {
-        await emailer.send(template, toEmail, dataWithSubject);
+      // Some builds accept (template, email, language, params)
+      if (emailer.send.length >= 4) {
+        await emailer.send(template, toEmail, language, params);
         return;
       }
-      await emailer.send(template, toEmail, subject, data);
-      return;
+      // Some builds accept (template, email, params)
+      await emailer.send(template, toEmail, params);
     }
   } catch (err) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String((err && err.message) || err) });
+    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err) });
   }
 }
 
-
 function normalizeBaseUrl(meta) {
   // Prefer meta.config.url, fallback to nconf.get('url')
   let base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
@@ -184,6 +183,7 @@ async function canDeleteSpecial(uid, settings) {
 function eventsFor(resv) {
   const status = resv.status;
   const icons = { pending: '⏳', awaiting_payment: '💳', paid: '✅' };
+  const colors = { pending: '#f39c12', awaiting_payment: '#d35400', paid: '#27ae60' };
   const startIsoDate = new Date(parseInt(resv.start, 10)).toISOString().slice(0, 10);
   const endIsoDate = new Date(parseInt(resv.end, 10)).toISOString().slice(0, 10);
 
@@ -200,6 +200,9 @@ function eventsFor(resv) {
       // keep id unique per item for FullCalendar, but keep the real rid in extendedProps.rid
       id: `${resv.rid}:${itemId || i}`,
       title: `${icons[status] || ''} ${itemName}`.trim(),
+      backgroundColor: colors[status] || '#3498db',
+      borderColor: colors[status] || '#3498db',
+      textColor: '#ffffff',
       allDay: true,
       start: startIsoDate,
       end: endIsoDate,
@@ -228,7 +231,9 @@ function eventsForSpecial(ev) {
     allDay: false,
     start: startIso,
     end: endIso,
-    color: '#8e44ad',
+    backgroundColor: '#8e44ad',
+    borderColor: '#8e44ad',
+    textColor: '#ffffff',
     extendedProps: {
       type: 'special',
       eid: ev.eid,
@@ -496,7 +501,7 @@ api.createReservation = async function (req, res) {
             await sendEmail(
               'calendar-onekite_pending',
               md.email,
-              'Location - Demande de réservation',
+              'Location matériel - Demande de réservation',
               {
                 username: md.username,
                 requester: requester.username,
@@ -594,7 +599,7 @@ api.approveReservation = async function (req, res) {
     const mapUrl = (Number.isFinite(latNum) && Number.isFinite(lonNum))
       ? `https://www.openstreetmap.org/?mlat=${encodeURIComponent(String(latNum))}&mlon=${encodeURIComponent(String(lonNum))}#map=18/${encodeURIComponent(String(latNum))}/${encodeURIComponent(String(lonNum))}`
       : '';
-    await sendEmail('calendar-onekite_approved', requester.email, 'Location - Réservation validée', {
+    await sendEmail('calendar-onekite_approved', requester.email, 'Location matériel - Réservation validée', {
       username: requester.username,
       itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
@@ -630,7 +635,7 @@ api.refuseReservation = async function (req, res) {
 
   const requester = await user.getUserFields(r.uid, ['username', 'email']);
   if (requester && requester.email) {
-    await sendEmail('calendar-onekite_refused', requester.email, 'Location - Demande de réservation', {
+    await sendEmail('calendar-onekite_refused', requester.email, 'Location matériel - Demande de réservation', {
       username: requester.username,
       itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),

package/lib/scheduler.js

@@ -56,81 +56,31 @@ async function processAwaitingPayment() {
   const user = require.main.require('./src/user');
 
   async function sendEmail(template, toEmail, subject, data) {
-    if (!toEmail) return;
-    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 (scheduler)', { template, toEmail, err: String(err && err.message || err) });
+  if (!toEmail) return;
+  try {
+    // NodeBB core signature (historically):
+    //   Emailer.sendToEmail(template, email, language, params[, callback])
+    // Subject is not a positional arg; it must be injected (either by NodeBB itself
+    // or via filter:email.modify). We always pass it in params.subject.
+    const language = (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
+    const params = Object.assign({}, data || {}, subject ? { subject } : {});
+    if (typeof emailer.sendToEmail === 'function') {
+      await emailer.sendToEmail(template, toEmail, language, params);
+      return;
     }
-  }
-
-  function formatFR(ts) {
-    const d = new Date(ts);
-    const dd = String(d.getDate()).padStart(2, '0');
-    const mm = String(d.getMonth() + 1).padStart(2, '0');
-    const yyyy = d.getFullYear();
-    return `${dd}/${mm}/${yyyy}`;
-  }
-
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
-    if (!r || r.status !== 'awaiting_payment') continue;
-
-    const approvedAt = parseInt(r.approvedAt || r.validatedAt || 0, 10) || 0;
-    if (!approvedAt) continue;
-
-    const reminderAt = approvedAt + holdMins * 60 * 1000;
-    const expireAt = approvedAt + 2 * holdMins * 60 * 1000;
-
-    if (!r.reminderSent && now >= reminderAt && now < expireAt) {
-      // Send reminder once
-      const u = await user.getUserFields(r.uid, ['username', 'email']);
-      if (u && u.email) {
-        await sendEmail('calendar-onekite_reminder', u.email, 'Location matériel - Rappel', {
-          username: u.username,
-          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
-          dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
-          paymentUrl: r.paymentUrl || '',
-          delayMinutes: holdMins,
-          pickupLine: r.pickupTime ? (r.adminNote ? `${r.pickupTime} à ${r.adminNote}` : r.pickupTime) : '',
-        });
-      }
-      r.reminderSent = true;
-      r.reminderAt = now;
-      await dbLayer.saveReservation(r);
-      continue;
-    }
-
-    if (now >= expireAt) {
-      // Expire: remove reservation so it disappears from calendar and frees items
-      const u = await user.getUserFields(r.uid, ['username', 'email']);
-      if (u && u.email) {
-        await sendEmail('calendar-onekite_expired', u.email, 'Location matériel - Rappel', {
-          username: u.username,
-          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
-          dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
-          delayMinutes: holdMins,
-        });
+    // Fallback for older/unusual builds (rare)
+    if (typeof emailer.send === 'function') {
+      // Some builds accept (template, email, language, params)
+      if (emailer.send.length >= 4) {
+        await emailer.send(template, toEmail, language, params);
+        return;
       }
-      await dbLayer.removeReservation(rid);
+      // Some builds accept (template, email, params)
+      await emailer.send(template, toEmail, params);
     }
+  } catch (err) {
+    // eslint-disable-next-line no-console
+    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err) });
   }
 }
 

package/library.js

@@ -19,110 +19,6 @@ const Plugin = {};
 const isFn = (fn) => typeof fn === 'function';
 const mw = (...fns) => fns.filter(isFn);
 
-function escapeHtml(str) {
-  return String(str)
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;');
-}
-
-// --- Widgets ---------------------------------------------------------------
-// Docs: https://docs.nodebb.org/development/widgets/
-Plugin.defineWidgets = async function (widgets, callback) {
-  try {
-    widgets = widgets || [];
-    widgets.push({
-      widget: 'calendar-onekite-mini',
-      name: 'Calendrier OneKite (mini)',
-      description: 'Mini calendrier (mois en cours) avec indicateurs de réservations/évènements.',
-      // Widget settings form (ACP Widgets editor)
-      content: [
-        '<div class="form-group">',
-        '  <label>Titre</label>',
-        '  <input type="text" class="form-control" name="title" placeholder="Calendrier" />',
-        '</div>',
-        '<div class="form-group">',
-        '  <label>Afficher les évènements</label>',
-        '  <select class="form-control" name="showSpecial">',
-        '    <option value="1">Oui</option>',
-        '    <option value="0">Non</option>',
-        '  </select>',
-        '</div>',
-      ].join(''),
-    });
-
-    if (typeof callback === 'function') {
-      return callback(null, widgets);
-    }
-    return widgets;
-  } catch (err) {
-    if (typeof callback === 'function') {
-      return callback(err);
-    }
-    throw err;
-  }
-};
-
-Plugin.renderMiniWidget = async function (hookData, callback) {
-  try {
-    const widget = hookData.widget || {};
-    const data = widget.data || {};
-    const title = (data.title || 'Calendrier').toString();
-    const showSpecial = String(data.showSpecial ?? '1') !== '0';
-
-    const widgetId = `calendar-onekite-mini-${Date.now()}-${Math.floor(Math.random() * 1e9)}`;
-
-    // Note: We render client-side to avoid extra server-side queries. The widget fetches
-    // events via the existing public API endpoint.
-    widget.html = `
-<div class="calendar-onekite-widget" id="${widgetId}" data-show-special="${showSpecial ? '1' : '0'}">
-  <div class="calendar-onekite-widget__header">
-    <strong>${escapeHtml(title)}</strong>
-    <a class="calendar-onekite-widget__link" href="/calendar">Ouvrir</a>
-  </div>
-  <div class="calendar-onekite-widget__month"></div>
-  <div class="calendar-onekite-widget__legend">
-    <span class="calendar-onekite-dot calendar-onekite-dot--pending"></span> en attente
-    <span class="calendar-onekite-dot calendar-onekite-dot--paid"></span> payée
-    ${showSpecial ? '<span class="calendar-onekite-dot calendar-onekite-dot--special"></span> évènement' : ''}
-  </div>
-</div>
-<style>
-.calendar-onekite-widget{border:1px solid rgba(0,0,0,.1);border-radius:8px;padding:10px}
-.calendar-onekite-widget__header{display:flex;justify-content:space-between;align-items:center;margin-bottom:8px}
-.calendar-onekite-widget__link{font-size:12px}
-.calendar-onekite-widget__grid{display:grid;grid-template-columns:repeat(7,1fr);gap:4px}
-.calendar-onekite-widget__cell{position:relative;aspect-ratio:1/1;border-radius:6px;display:flex;align-items:center;justify-content:center;font-size:12px;user-select:none}
-.calendar-onekite-widget__cell--muted{opacity:.35}
-.calendar-onekite-widget__cell--today{outline:2px solid rgba(0,0,0,.2)}
-.calendar-onekite-badges{position:absolute;bottom:2px;left:50%;transform:translateX(-50%);display:flex;gap:2px}
-.calendar-onekite-dot{display:inline-block;width:8px;height:8px;border-radius:50%;margin:0 4px 0 10px;vertical-align:middle}
-.calendar-onekite-dot--pending{background:#0d6efd}
-.calendar-onekite-dot--paid{background:#198754}
-.calendar-onekite-dot--special{background:#fd7e14}
-.calendar-onekite-badge{width:6px;height:6px;border-radius:50%}
-.calendar-onekite-badge--pending{background:#0d6efd}
-.calendar-onekite-badge--paid{background:#198754}
-.calendar-onekite-badge--special{background:#fd7e14}
-.calendar-onekite-widget__legend{margin-top:8px;font-size:12px;opacity:.8}
-</style>
-`;
-
-    hookData.widget = widget;
-    if (typeof callback === 'function') {
-      return callback(null, hookData);
-    }
-    return hookData;
-  } catch (err) {
-    if (typeof callback === 'function') {
-      return callback(err);
-    }
-    throw err;
-  }
-};
-
 Plugin.init = async function (params) {
   const { router, middleware } = params;
 
@@ -252,4 +148,23 @@ Plugin.addAdminNavigation = async function (header) {
   return header;
 };
 
+
+// Ensure our transactional emails always get a subject.
+// NodeBB's Emailer.sendToEmail signature expects (template, email, language, params),
+// so plugins typically inject/modify the subject via this hook.
+Plugin.emailModify = async function (data) {
+  try {
+    if (!data || !data.template) return data;
+    const tpl = String(data.template);
+    if (!tpl.startsWith('calendar-onekite_')) return data;
+
+    // If the caller provided a subject (we pass it in params.subject), copy it to data.subject.
+    const provided = data.params && data.params.subject ? String(data.params.subject) : '';
+    if (provided && (!data.subject || !String(data.subject).trim())) {
+      data.subject = provided;
+    }
+  } catch (e) {}
+  return data;
+};
+
 module.exports = Plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.1.85",
+  "version": "11.1.86",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",
@@ -8,4 +8,4 @@
     "node": ">=18"
   },
   "dependencies": {}
-}
+}

package/plugin.json

@@ -8,19 +8,13 @@
       "hook": "static:app.load",
       "method": "init"
     },
-    {
-      "hook": "filter:widgets.getWidgets",
-      "method": "defineWidgets",
-      "callbacked": true
-    },
-    {
-      "hook": "filter:widget.render:calendar-onekite-mini",
-      "method": "renderMiniWidget",
-      "callbacked": true
-    },
     {
       "hook": "filter:admin.header.build",
       "method": "addAdminNavigation"
+    },
+    {
+      "hook": "filter:email.modify",
+      "method": "emailModify"
     }
   ],
   "staticDirs": {
@@ -37,5 +31,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.49"
+  "version": "1.0.47"
 }

package/public/client.js

@@ -18,15 +18,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
 
   async function openSpecialEventDialog(selectionInfo) {
     const start = selectionInfo.start;
-    let end = selectionInfo.end;
-    // FullCalendar all-day selection uses an exclusive end (next day 00:00). For a single-day click,
-    // this looks like a 2-day range. Default to a 1-hour duration in that case.
-    try {
-      if (selectionInfo && selectionInfo.allDay && start && end && (end.getTime() - start.getTime()) <= 86400000 + 1000) {
-        end = new Date(start.getTime() + 60 * 60 * 1000);
-      }
-    } catch (e) {}
-
+    const end = selectionInfo.end;
     const html = `
       <div class="mb-3">
         <label class="form-label">Titre</label>
@@ -59,7 +51,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     `;
 
     return await new Promise((resolve) => {
-      const dlg = bootbox.dialog({
+      bootbox.dialog({
         title: 'Créer un évènement',
         message: html,
         buttons: {
@@ -86,18 +78,14 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         },
       });
 
-      // init leaflet once the modal is visible (Leaflet needs a laid-out container)
-      dlg.on('shown.bs.modal', async () => {
+      // init leaflet
+      setTimeout(async () => {
         try {
           const mapEl = document.getElementById('onekite-se-map');
           if (!mapEl) return;
           const L = await loadLeaflet();
           const map = L.map(mapEl).setView([46.5, 2.5], 5);
           L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { maxZoom: 19, attribution: '&copy; OpenStreetMap' }).addTo(map);
-
-          setTimeout(() => {
-            try { map.invalidateSize(); } catch (e) {}
-          }, 50);
           let marker = null;
           function setMarker(lat, lon) {
             if (marker) map.removeLayer(marker);
@@ -126,7 +114,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         } catch (e) {
           // ignore leaflet errors
         }
-      });
+      }, 0);
     });
   }
 
@@ -137,12 +125,12 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       ${safeAddr ? `<div class="mb-2">${escapeHtml(safeAddr)}</div>` : ''}
       <div id="${mapId}" style="height:260px; border:1px solid #ddd; border-radius:6px;"></div>
     `;
-    const dlg = bootbox.dialog({
+    bootbox.dialog({
       title: title || 'Carte',
       message: html,
       buttons: { close: { label: 'Fermer', className: 'btn-secondary' } },
     });
-    dlg.on('shown.bs.modal', async () => {
+    setTimeout(async () => {
       try {
         const el = document.getElementById(mapId);
         if (!el) return;
@@ -168,14 +156,10 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           }
         }
         map.setView([46.5, 2.5], 5);
-
-        setTimeout(() => {
-          try { map.invalidateSize(); } catch (e) {}
-        }, 50);
       } catch (e) {
         // ignore leaflet errors
       }
-    });
+    }, 0);
   }
 
   // Click handler for map links in popups
@@ -348,6 +332,16 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     }
   }
 
+
+  function formatDtWithTime(d) {
+    try {
+      return new Date(d).toLocaleString('fr-FR', { dateStyle: 'short', timeStyle: 'short' });
+    } catch (e) {
+      return String(d);
+    }
+  }
+
+
   function toDatetimeLocalValue(date) {
     const d = new Date(date);
     const pad = (n) => String(n).padStart(2, '0');
@@ -552,10 +546,9 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
             isDialogOpen = false;
             return;
           }
-          // Send date-only strings from FullCalendar to avoid timezone shifts.
-          // For all-day selections, startStr/endStr are YYYY-MM-DD (end is exclusive).
-          const startDate = info.startStr;
-          const endDate = info.endStr;
+          // Send date strings (no hours) so reservations are day-based.
+          const startDate = new Date(info.start).toISOString().slice(0, 10);
+          const endDate = new Date(info.end).toISOString().slice(0, 10);
           await requestReservation({
             start: startDate,
             end: endDate,
@@ -608,7 +601,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           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>
+            <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>` : ''}
           `;
@@ -823,12 +816,6 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
                   // Default view (France-ish)
                   map.setView([46.7, 2.5], 5);
 
-                  // Bootbox/Bootstrap modal layouts can report a zero-sized container on first paint.
-                  // Force Leaflet to recompute sizes once the modal is fully displayed.
-                  setTimeout(() => {
-                    try { map.invalidateSize(); } catch (e) {}
-                  }, 50);
-
                   let marker = null;
                   function setMarker(lat, lon, zoom) {
                     const ll = [lat, lon];
@@ -926,95 +913,6 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   // call once after current tick.
   setTimeout(() => autoInit({ template: (ajaxify && ajaxify.data && ajaxify.data.template) || { name: '' } }), 0);
 
-  // Render mini widgets (ACP Widgets) without inline scripts (CSP-friendly).
-  async function renderMiniWidgets() {
-    const widgets = Array.from(document.querySelectorAll('.calendar-onekite-widget'));
-    if (!widgets.length) return;
-
-    const now = new Date();
-    const year = now.getFullYear();
-    const month = now.getMonth();
-
-    const start = new Date(year, month, 1);
-    start.setDate(start.getDate() - ((start.getDay() + 6) % 7)); // Monday-start
-    const end = new Date(start);
-    end.setDate(end.getDate() + 41);
-
-    function iso(d){ return d.toISOString(); }
-    function ymd(d){ return d.toISOString().slice(0, 10); }
-
-    let events = [];
-    try {
-      const qs = new URLSearchParams({ start: iso(start), end: iso(end) });
-      events = await fetchJson(`/api/v3/plugins/calendar-onekite/events?${qs.toString()}`)
-        .catch(() => fetchJson(`/api/plugins/calendar-onekite/events?${qs.toString()}`));
-    } catch (e) {
-      events = [];
-    }
-
-    const dayMap = new Map();
-    for (const ev of (events || [])) {
-      if (!ev || !ev.start) continue;
-      const d = new Date(ev.start);
-      const key = ymd(d);
-      const props = ev.extendedProps || {};
-      const isSpecial = props.type === 'special' || ev.type === 'special' || (ev.classNames || []).includes('onekite-special');
-      const status = props.status || ev.status || '';
-      const bucket = dayMap.get(key) || { pending: 0, paid: 0, special: 0 };
-      if (isSpecial) bucket.special++;
-      else if (status === 'paid') bucket.paid++;
-      else bucket.pending++;
-      dayMap.set(key, bucket);
-    }
-
-    for (const widgetEl of widgets) {
-      const monthEl = widgetEl.querySelector('.calendar-onekite-widget__month');
-      if (!monthEl) continue;
-      const showSpecial = widgetEl.getAttribute('data-show-special') === '1';
-
-      const grid = document.createElement('div');
-      grid.className = 'calendar-onekite-widget__grid';
-      const labels = ['L','M','M','J','V','S','D'];
-      for (const l of labels) {
-        const el = document.createElement('div');
-        el.className = 'calendar-onekite-widget__cell calendar-onekite-widget__cell--muted';
-        el.textContent = l;
-        grid.appendChild(el);
-      }
-      for (let i = 0; i < 42; i++) {
-        const d = new Date(start);
-        d.setDate(start.getDate() + i);
-        const cell = document.createElement('a');
-        cell.href = '/calendar';
-        cell.className = 'calendar-onekite-widget__cell';
-        if (d.getMonth() !== month) cell.classList.add('calendar-onekite-widget__cell--muted');
-        if (ymd(d) === ymd(now)) cell.classList.add('calendar-onekite-widget__cell--today');
-        cell.textContent = d.getDate();
-
-        const b = dayMap.get(ymd(d));
-        if (b && (b.pending || b.paid || (showSpecial && b.special))) {
-          const badges = document.createElement('div');
-          badges.className = 'calendar-onekite-badges';
-          if (b.pending) { const s = document.createElement('span'); s.className = 'calendar-onekite-badge calendar-onekite-badge--pending'; badges.appendChild(s); }
-          if (b.paid) { const s = document.createElement('span'); s.className = 'calendar-onekite-badge calendar-onekite-badge--paid'; badges.appendChild(s); }
-          if (showSpecial && b.special) { const s = document.createElement('span'); s.className = 'calendar-onekite-badge calendar-onekite-badge--special'; badges.appendChild(s); }
-          cell.appendChild(badges);
-        }
-
-        grid.appendChild(cell);
-      }
-
-      monthEl.innerHTML = '';
-      monthEl.appendChild(grid);
-    }
-  }
-
-  // Re-render widgets on every page load/end.
-  if (hooks && typeof hooks.on === 'function') {
-    hooks.on('action:ajaxify.end', () => { renderMiniWidgets().catch(() => {}); });
-  }
-  setTimeout(() => { renderMiniWidgets().catch(() => {}); }, 0);
-
 
 
 // Live refresh when a reservation changes (e.g., payment confirmed by webhook)

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

@@ -6,26 +6,27 @@
 
     <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" aria-controls="onekite-tab-settings" aria-selected="true">Locations</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" aria-controls="onekite-tab-events" aria-selected="false">Évènements</button>
+        <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" aria-controls="onekite-tab-pending" aria-selected="false">Demandes en attente</button>
+        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-pending" type="button" role="tab">Demandes en attente</button>
       </li>
       <li class="nav-item" role="presentation">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-debug" type="button" role="tab" aria-controls="onekite-tab-debug" aria-selected="false">Debug HelloAsso</button>
+        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-debug" type="button" role="tab">Debug HelloAsso</button>
       </li>
       <li class="nav-item" role="presentation">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-accounting" type="button" role="tab" aria-controls="onekite-tab-accounting" aria-selected="false">Comptabilisation</button>
+        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-accounting" type="button" role="tab">Comptabilisation</button>
       </li>
     </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">
-          <h4>Groupes</h4>
+                  <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">
@@ -87,6 +88,7 @@
             <label class="form-label">Form Slug</label>
             <input class="form-control" name="helloassoFormSlug">
           </div>
+              </form>
       </div>
 
       <div class="tab-pane fade" id="onekite-tab-events" role="tabpanel">
@@ -112,7 +114,7 @@
         <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>
@@ -183,4 +185,4 @@
   });
 </script>
 
-<!-- IMPORT admin/partials/settings/footer.tpl -->
+<!-- IMPORT admin/partials/settings/footer.tpl -->