nodebb-plugin-calendar-onekite 11.1.94 → 11.1.95

package/lib/admin.js

@@ -20,39 +20,33 @@ function formatFR(tsOrIso) {
 
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
-  const params = Object.assign({}, data || {});
-  if (subject) {
-    params.subject = subject;
-  }
-  // NodeBB emailer expects: (template, email, language, params)
-  const lang = params.lang || (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
-
   try {
     if (typeof emailer.sendToEmail === 'function') {
       if (emailer.sendToEmail.length >= 4) {
-        await emailer.sendToEmail(template, toEmail, lang, params);
+        await emailer.sendToEmail(template, toEmail, subject, data);
       } else {
-        await emailer.sendToEmail(template, toEmail, params);
+        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
+        await emailer.sendToEmail(template, toEmail, dataWithSubject);
       }
       return;
     }
     if (typeof emailer.send === 'function') {
       if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, lang, params);
+        await emailer.send(template, toEmail, subject, data);
         return;
       }
       if (emailer.send.length === 3) {
-        await emailer.send(template, toEmail, params);
+        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
+        await emailer.send(template, toEmail, dataWithSubject);
         return;
       }
-      await emailer.send(template, toEmail, lang, params);
+      await emailer.send(template, toEmail, subject, data);
     }
   } catch (err) {
-    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 && err.message || err) });
   }
 }
 
-
 function normalizeCallbackUrl(configured, meta) {
   const base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
   let url = (configured || '').trim();
@@ -523,4 +517,3 @@ admin.purgeAccounting = async function (req, res) {
 
 
 module.exports = admin;
-

package/package.json

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

package/public/client.js

@@ -58,7 +58,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           cancel: {
             label: 'Annuler',
             className: 'btn-secondary',
-            callback: () => __settle(null),
+            callback: () => resolve(null),
           },
           ok: {
             label: 'Créer',
@@ -71,7 +71,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
               const notes = (document.getElementById('onekite-se-notes')?.value || '').trim();
               const lat = (document.getElementById('onekite-se-lat')?.value || '').trim();
               const lon = (document.getElementById('onekite-se-lon')?.value || '').trim();
-              __settle({ title, start: startVal, end: endVal, address, notes, lat, lon });
+              resolve({ title, start: startVal, end: endVal, address, notes, lat, lon });
               return true;
             },
           },
@@ -233,15 +233,6 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     return await res.json();
   }
 
-
-  async function apiJson(v3Url, legacyUrl, opts) {
-    try {
-      return await fetchJson(v3Url, opts);
-    } catch (e) {
-      return await fetchJson(legacyUrl, opts);
-    }
-  }
-
   async function loadCapabilities() {
     try {
       return await fetchJson('/api/v3/plugins/calendar-onekite/capabilities');
@@ -455,34 +446,34 @@ function attachAddressAutocomplete(inputEl, onPick) {
 
   async function loadItems() {
     try {
-      return await apiJson('/api/v3/plugins/calendar-onekite/items', '/api/plugins/calendar-onekite/items');
+      return await fetchJson('/api/v3/plugins/calendar-onekite/items');
     } catch (e) {
       return [];
     }
   }
 
   async function requestReservation(payload) {
-    return await apiJson('/api/v3/plugins/calendar-onekite/reservations', '/api/plugins/calendar-onekite/reservations', {
+    return await fetchJson('/api/v3/plugins/calendar-onekite/reservations', {
       method: 'POST',
       body: JSON.stringify(payload),
     });
   }
 
   async function approveReservation(rid, payload) {
-    return await apiJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/approve`, `/api/plugins/calendar-onekite/reservations/${rid}/approve`, {
+    return await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/approve`, {
       method: 'PUT',
       body: JSON.stringify(payload || {}),
     });
   }
 
   async function cancelReservation(rid) {
-    return await apiJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/cancel`, `/api/plugins/calendar-onekite/reservations/${rid}/cancel`, {
+    return await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/cancel`, {
       method: 'PUT',
     });
   }
 
   async function refuseReservation(rid) {
-    return await apiJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/refuse`, `/api/plugins/calendar-onekite/reservations/${rid}/refuse`, {
+    return await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/refuse`, {
       method: 'PUT',
     });
   }
@@ -506,26 +497,6 @@ function attachAddressAutocomplete(inputEl, onPick) {
   }
 
 
-  function formatPeriodWithTime(start, end) {
-    const s = formatDtWithTime(start);
-    if (!end) {
-      return s;
-    }
-    try {
-      const st = new Date(start).getTime();
-      const en = new Date(end).getTime();
-      if (Number.isFinite(st) && Number.isFinite(en) && en <= st) {
-        return s;
-      }
-    } catch (e) {}
-    const eTxt = formatDtWithTime(end);
-    if (!eTxt || eTxt === 'Invalid Date') {
-      return s;
-    }
-    return `${s} → ${eTxt}`;
-  }
-
-
   
   function toLocalYmd(date) {
     const d = new Date(date);
@@ -551,7 +522,7 @@ function toDatetimeLocalValue(date) {
     let blocked = new Set();
     try {
       const qs = new URLSearchParams({ start: selectionInfo.startStr, end: selectionInfo.endStr });
-      const evs = await apiJson(`/api/v3/plugins/calendar-onekite/events?${qs.toString()}`, `/api/plugins/calendar-onekite/events?${qs.toString()}`);
+      const evs = await fetchJson(`/api/v3/plugins/calendar-onekite/events?${qs.toString()}`);
       (evs || []).forEach((ev) => {
         const st = (ev.extendedProps && ev.extendedProps.status) || '';
         if (!['pending', 'awaiting_payment', 'approved', 'paid'].includes(st)) return;
@@ -600,8 +571,6 @@ function toDatetimeLocalValue(date) {
     `;
 
     return new Promise((resolve) => {
-      let __settled = false;
-      const __settle = (v) => { if (__settled) return; __settled = true; __settle(v); };
       const dlg = bootbox.dialog({
         title: 'Demander une réservation',
         message: messageHtml,
@@ -610,7 +579,7 @@ function toDatetimeLocalValue(date) {
             label: 'Annuler',
             className: 'btn-secondary',
             callback: function () {
-              __settle(null);
+              resolve(null);
             },
           },
           ok: {
@@ -626,16 +595,13 @@ function toDatetimeLocalValue(date) {
               const itemNames = cbs.map(cb => cb.getAttribute('data-name'));
               const sum = cbs.reduce((acc, cb) => acc + (parseFloat(cb.getAttribute('data-price') || '0') || 0), 0);
               const total = (sum / 100) * days;
-              __settle({ itemIds, itemNames, total, days });
+              resolve({ itemIds, itemNames, total, days });
             },
           },
         },
       });
 
-      
-      // Ensure the promise resolves even if the modal is dismissed externally (e.g. mobile rotate)
-      dlg.on('hidden.bs.modal', () => __settle(null));
-// live total update
+      // live total update
       setTimeout(() => {
         const totalEl = document.getElementById('onekite-total');
         function refreshTotal() {
@@ -668,7 +634,30 @@ function toDatetimeLocalValue(date) {
     const canCreateSpecial = !!caps.canCreateSpecial;
     const canDeleteSpecial = !!caps.canDeleteSpecial;
 
-    let mode = 'reservation'; // or 'special'
+    let setMode('reservation'); 
+        function refreshDesktopModeButton() {
+          try {
+            const btn = document.querySelector('#onekite-calendar .fc-newSpecial-button');
+            if (!btn) return;
+            const isSpecial = mode === 'special';
+            btn.textContent = isSpecial ? 'Évènement ✓' : 'Évènement';
+            btn.classList.toggle('onekite-active', isSpecial);
+          } catch (e) {}
+        }
+
+        function setMode(next) {
+          mode = next;
+          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) {}
+        }
+// or 'special'
 
     // Inject lightweight responsive CSS once.
     try {
@@ -694,7 +683,21 @@ function toDatetimeLocalValue(date) {
             #onekite-calendar .fc .fc-toolbar-title { font-size: 1rem; }
             #onekite-calendar .fc .fc-button { padding: .2rem .4rem; font-size: .8rem; }
           }
-        `;
+        
+          /* Violet action button (events mode) */
+          #onekite-calendar .fc .fc-newSpecial-button,
+          .onekite-btn-violet {
+            background: #6f42c1 !important;
+            border-color: #6f42c1 !important;
+            color: #fff !important;
+          }
+          /* Active state */
+          #onekite-calendar .fc .fc-newSpecial-button.onekite-active,
+          .onekite-btn-violet.onekite-active {
+            filter: brightness(0.95);
+            box-shadow: 0 0 0 0.15rem rgba(111,66,193,.25);
+          }
+`;
         document.head.appendChild(st);
       }
     } catch (e) {}
@@ -724,31 +727,6 @@ function toDatetimeLocalValue(date) {
       right: (canCreateSpecial ? 'newSpecial ' : '') + 'dayGridMonth,timeGridWeek',
     };
 
-    // Mode UI helpers (desktop FullCalendar button + mobile toggle)
-    let mobileModeBtn = null;
-    function refreshModeIndicators() {
-      const isSpecial = mode === 'special';
-
-      // Desktop "Évènement" button in the FullCalendar header
-      try {
-        const desktopBtn = document.querySelector('#onekite-calendar .fc-newSpecial-button');
-        if (desktopBtn) {
-          desktopBtn.textContent = isSpecial ? 'Évènement ✓' : 'Évènement';
-          desktopBtn.classList.toggle('onekite-mode-active', isSpecial);
-        }
-      } catch (e) {}
-
-      // Mobile mode toggle (under the calendar)
-      try {
-        if (mobileModeBtn) {
-          mobileModeBtn.textContent = isSpecial ? 'Mode évènement ✓' : 'Mode évènement';
-          mobileModeBtn.classList.toggle('active', isSpecial);
-          mobileModeBtn.classList.toggle('onekite-btn-violet', isSpecial);
-          mobileModeBtn.classList.toggle('onekite-btn-violet-outline', !isSpecial);
-        }
-      } catch (e) {}
-    }
-
     const calendar = new FullCalendar.Calendar(el, {
       initialView: 'dayGridMonth',
       height: 'auto',
@@ -763,8 +741,7 @@ function toDatetimeLocalValue(date) {
         newSpecial: {
           text: 'Évènement',
           click: () => {
-            mode = (mode === 'special') ? 'reservation' : 'special';
-            refreshModeIndicators();
+            setMode((mode === 'special') ? 'reservation' : 'special');
             if (mode === 'special') {
               showAlert('success', 'Mode évènement : sélectionne une plage (date/heure) sur le calendrier.');
             }
@@ -778,7 +755,7 @@ function toDatetimeLocalValue(date) {
       events: async function (info, successCallback, failureCallback) {
         try {
           const qs = new URLSearchParams({ start: info.startStr, end: info.endStr });
-          const data = await apiJson(`/api/v3/plugins/calendar-onekite/events?${qs.toString()}`, `/api/plugins/calendar-onekite/events?${qs.toString()}`);
+          const data = await fetchJson(`/api/v3/plugins/calendar-onekite/events?${qs.toString()}`);
           successCallback(data);
         } catch (e) {
           failureCallback(e);
@@ -792,7 +769,7 @@ function toDatetimeLocalValue(date) {
         try {
           if (mode === 'special' && canCreateSpecial) {
             const payload = await openSpecialEventDialog(info);
-            mode = 'reservation';
+            setMode('reservation');
             if (!payload) {
               calendar.unselect();
               isDialogOpen = false;
@@ -854,35 +831,8 @@ function toDatetimeLocalValue(date) {
         }
       },
       dateClick: async function (info) {
-        // One-day selection convenience.
-        // For reservations, selecting a day makes a 1-day range.
-        // For special events ("mode évènement"), we want a single date (no implicit J+1 end).
+        // One-day selection convenience
         const start = info.date;
-
-        if (mode === 'special' && canCreateSpecial) {
-          if (isDialogOpen) {
-            return;
-          }
-          isDialogOpen = true;
-          try {
-            const payload = await openSpecialEventDialog({ start, end: start });
-            mode = 'reservation';
-            if (!payload) {
-              isDialogOpen = false;
-              return;
-            }
-            await createSpecialEvent(payload);
-            showAlert('success', 'Évènement créé.');
-            calendar.refetchEvents();
-            isDialogOpen = false;
-            return;
-          } catch (e) {
-            showAlert('error', 'Impossible de créer l\'évènement.');
-            isDialogOpen = false;
-            return;
-          }
-        }
-
         const end = new Date(start.getTime() + 24 * 60 * 60 * 1000);
         calendar.select(start, end);
       },
@@ -908,7 +858,7 @@ function toDatetimeLocalValue(date) {
           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(formatPeriodWithTime(ev.start, 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>` : ''}
           `;
@@ -1113,10 +1063,7 @@ function toDatetimeLocalValue(date) {
                 },
               });
 
-              
-      // Ensure the promise resolves even if the modal is dismissed externally (e.g. mobile rotate)
-      dlg.on('hidden.bs.modal', () => __settle(null));
-// Init Leaflet map once the modal is visible.
+              // Init Leaflet map once the modal is visible.
               dlg.on('shown.bs.modal', async () => {
                 try {
                   const L = await loadLeaflet();
@@ -1217,8 +1164,9 @@ function toDatetimeLocalValue(date) {
     try { window.oneKiteCalendar = calendar; } catch (e) {}
 
     calendar.render();
-    // Sync mode UI after the header is rendered
-    try { refreshModeIndicators(); } catch (e) {}
+
+    refreshDesktopModeButton();
+
 
     // Mobile controls: view (month/week) + mode (reservation/event) without bloating the header.
     try {
@@ -1267,17 +1215,22 @@ function toDatetimeLocalValue(date) {
         if (canCreateSpecial) {
           const modeBtn = document.createElement('button');
           modeBtn.type = 'button';
-          modeBtn.className = 'btn btn-sm onekite-btn-violet-outline onekite-mode-btn';
-          // Expose to the shared mode indicator refresher
-          mobileModeBtn = modeBtn;
+          modeBtn.className = 'btn btn-sm onekite-btn-violet onekite-mode-btn';
+          function refreshModeBtn() {
+            const isSpecial = mode === 'special';
+            modeBtn.textContent = isSpecial ? 'Mode évènement ✓' : 'Mode évènement';
+            modeBtn.classList.toggle('active', isSpecial);
+            // Keep violet, only toggle active class
+            modeBtn.classList.toggle('onekite-active', isSpecial);
+          }
           modeBtn.addEventListener('click', () => {
-            mode = (mode === 'special') ? 'reservation' : 'special';
-            refreshModeIndicators();
+            setMode((mode === 'special') ? 'reservation' : 'special');
+            refreshModeBtn();
             if (mode === 'special') {
               showAlert('success', 'Mode évènement : sélectionne une plage (date/heure) sur le calendrier.');
             }
           });
-          refreshModeIndicators();
+          refreshModeBtn();
           controls.appendChild(modeBtn);
         }
 

package/templates/calendar-onekite.tpl

@@ -27,31 +27,6 @@
   .fc .fc-newSpecial-button:hover {
     filter: brightness(0.95);
   }
-  /* Indicate active "mode évènement" (desktop) */
-  .fc .fc-newSpecial-button.onekite-mode-active {
-    box-shadow: inset 0 0 0 2px rgba(255,255,255,0.35);
-  }
-
-  /* Violet button variants for mobile mode toggle */
-  .onekite-btn-violet {
-    background: #8e44ad !important;
-    border-color: #8e44ad !important;
-    color: #fff !important;
-  }
-  .onekite-btn-violet:hover {
-    filter: brightness(0.95);
-    color: #fff !important;
-  }
-  .onekite-btn-violet-outline {
-    background: transparent !important;
-    border-color: #8e44ad !important;
-    color: #8e44ad !important;
-  }
-  .onekite-btn-violet-outline:hover {
-    background: #8e44ad !important;
-    border-color: #8e44ad !important;
-    color: #fff !important;
-  }
 
   /* Mobile tweaks for FullCalendar */
   @media (max-width: 576px) {