nodebb-plugin-calendar-onekite 11.1.96 → 11.1.98

package/lib/admin.js

@@ -20,30 +20,32 @@ function formatFR(tsOrIso) {
 
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
+
+  const settings = await meta.settings.get('calendar-onekite').catch(() => ({}));
+  const lang = (settings && settings.defaultLang) || (meta && meta.config && meta.config.defaultLang) || 'fr';
+  const params = Object.assign({}, data || {}, subject ? { subject } : {});
+
   try {
     if (typeof emailer.sendToEmail === 'function') {
+      // NodeBB: sendToEmail(template, email, language, params)
       if (emailer.sendToEmail.length >= 4) {
-        await emailer.sendToEmail(template, toEmail, subject, data);
+        await emailer.sendToEmail(template, toEmail, lang, params);
       } else {
-        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
-        await emailer.sendToEmail(template, toEmail, dataWithSubject);
+        // Older signature: sendToEmail(template, email, params)
+        await emailer.sendToEmail(template, toEmail, params);
       }
       return;
     }
     if (typeof emailer.send === 'function') {
-      if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, subject, data);
-        return;
-      }
-      if (emailer.send.length === 3) {
-        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
-        await emailer.send(template, toEmail, dataWithSubject);
-        return;
-      }
-      await emailer.send(template, toEmail, subject, data);
+      // Fallback: send(template, uid, params) - not usable without uid
+      return;
     }
   } 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: err && err.message ? err.message : String(err),
+    });
   }
 }
 
@@ -194,7 +196,7 @@ admin.approveReservation = async function (req, res) {
         pickupLon: r.pickupLon || '',
         mapUrl,
         validatedBy: r.approvedByUsername || '',
-        validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/users/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
+        validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/user/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
       });
     }
   } catch (e) {}

package/lib/api.js

@@ -624,7 +624,7 @@ api.approveReservation = async function (req, res) {
       mapUrl,
       paymentUrl: r.paymentUrl || '',
       validatedBy: r.approvedByUsername || '',
-      validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/users/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
+      validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/user/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
     });
   }
   return res.json({ ok: true });

package/package.json

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

package/public/client.js

@@ -188,6 +188,20 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     const lon = parseFloat(a.getAttribute('data-lon'));
     openMapViewer('Adresse', addr, lat, lon);
   });
+  // Close any open Bootbox modal when navigating to a user profile from within a modal
+  document.addEventListener('click', (ev) => {
+    const a = ev.target && ev.target.closest ? ev.target.closest('a.onekite-user-link') : null;
+    if (!a) return;
+    const inModal = !!(a.closest && a.closest('.modal, .bootbox'));
+    if (!inModal) return;
+    const href = a.getAttribute('href');
+    if (!href) return;
+    ev.preventDefault();
+    try { bootbox.hideAll(); } catch (e) {}
+    setTimeout(() => { window.location.href = href; }, 50);
+  });
+
+
 
   function statusLabel(s) {
     const map = {
@@ -228,7 +242,12 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       ...opts,
     });
     if (!res.ok) {
-      throw new Error(`${res.status}`);
+      let payload = null;
+      try { payload = await res.json(); } catch (e) {}
+      const err = new Error(`${res.status}`);
+      err.status = res.status;
+      err.payload = payload;
+      throw err;
     }
     return await res.json();
   }
@@ -634,7 +653,31 @@ function toDatetimeLocalValue(date) {
     const canCreateSpecial = !!caps.canCreateSpecial;
     const canDeleteSpecial = !!caps.canDeleteSpecial;
 
-    let mode = 'reservation'; // or 'special'
+    // Current creation mode: reservation (location) or special (event)
+    let mode = '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 {
@@ -660,7 +703,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) {}
@@ -704,8 +761,10 @@ function toDatetimeLocalValue(date) {
         newSpecial: {
           text: 'Évènement',
           click: () => {
-            mode = 'special';
-            showAlert('success', 'Mode évènement : sélectionne une plage (date/heure) sur le calendrier.');
+            setMode((mode === 'special') ? 'reservation' : 'special');
+            if (mode === 'special') {
+              showAlert('success', 'Mode évènement : sélectionne une plage (date/heure) sur le calendrier.');
+            }
           },
         },
       } : {},
@@ -730,7 +789,7 @@ function toDatetimeLocalValue(date) {
         try {
           if (mode === 'special' && canCreateSpecial) {
             const payload = await openSpecialEventDialog(info);
-            mode = 'reservation';
+            setMode('reservation');
             if (!payload) {
               calendar.unselect();
               isDialogOpen = false;
@@ -779,13 +838,22 @@ function toDatetimeLocalValue(date) {
           calendar.unselect();
           isDialogOpen = false;
         } catch (e) {
-          const code = String(e && e.message || '');
+          const code = String((e && (e.status || e.message)) || '');
+          const payload = e && e.payload ? e.payload : null;
+
           if (code === '403') {
-            showAlert('error', 'Impossible de créer la demande : droits insuffisants (groupe).');
+            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.');
+            } else {
+              showAlert('error', msg || 'Impossible de créer la demande : 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.');
           } else {
-            showAlert('error', 'Erreur lors de la création de la demande.');
+            const msg = payload && (payload.message || payload.error || payload.msg) ? String(payload.message || payload.error || payload.msg) : '';
+            showAlert('error', msg || 'Erreur lors de la création de la demande.');
           }
           calendar.unselect();
           isDialogOpen = false;
@@ -794,6 +862,39 @@ function toDatetimeLocalValue(date) {
       dateClick: async function (info) {
         // One-day selection convenience
         const start = info.date;
+
+        // In "special event" mode, a simple click should propose a one-day event (not two days in the modal)
+        if (mode === 'special' && canCreateSpecial) {
+          if (isDialogOpen) {
+            return;
+          }
+          isDialogOpen = true;
+          try {
+            // Default to a same-day event: 00:00 -> 23:59
+            const end = new Date(start.getTime() + (23 * 60 + 59) * 60 * 1000);
+            const payload = await openSpecialEventDialog({ start, end, allDay: true });
+            setMode('reservation');
+            if (!payload) {
+              isDialogOpen = false;
+              return;
+            }
+            await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
+              method: 'POST',
+              body: JSON.stringify(payload),
+            }).catch(async () => {
+              return await fetchJson('/api/plugins/calendar-onekite/special-events', {
+                method: 'POST',
+                body: JSON.stringify(payload),
+              });
+            });
+            showAlert('success', 'Évènement créé.');
+            calendar.refetchEvents();
+          } finally {
+            isDialogOpen = false;
+          }
+          return;
+        }
+
         const end = new Date(start.getTime() + 24 * 60 * 60 * 1000);
         calendar.select(start, end);
       },
@@ -804,7 +905,7 @@ function toDatetimeLocalValue(date) {
         if (p.type === 'special') {
           const username = String(p.username || '').trim();
           const userLine = username
-            ? `<div class="mb-2"><strong>Créé par</strong><br><a href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
+            ? `<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);
@@ -856,7 +957,7 @@ function toDatetimeLocalValue(date) {
         // Reserved-by line (user profile link)
         const username = String(p.username || p.user || p.reservedBy || p.ownerUsername || '').trim();
         const userLine = username
-          ? `<div class="mb-2"><strong>Réservé par</strong><br><a href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
+          ? `<div class="mb-2"><strong>Réservée par</strong><br><a class="onekite-user-link" href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
           : '';
         const itemsHtml = (() => {
         const names = Array.isArray(p.itemNames) ? p.itemNames : (typeof p.itemNames === 'string' && p.itemNames.trim() ? p.itemNames.split(',').map(s=>s.trim()).filter(Boolean) : (p.itemName ? [p.itemName] : []));
@@ -869,7 +970,7 @@ function toDatetimeLocalValue(date) {
 
         const approvedBy = String(p.approvedByUsername || '').trim();
         const validatedByHtml = approvedBy
-          ? `<div class=\"mb-2\"><strong>Validée par</strong><br><a href=\"https://www.onekite.com/users/${encodeURIComponent(approvedBy)}\">${escapeHtml(approvedBy)}</a></div>`
+          ? `<div class=\"mb-2\"><strong>Validée par</strong><br><a href=\"https://www.onekite.com/user/${encodeURIComponent(approvedBy)}\">${escapeHtml(approvedBy)}</a></div>`
           : '';
 
         // Pickup details (address / time / notes) shown once validated
@@ -1126,6 +1227,9 @@ function toDatetimeLocalValue(date) {
 
     calendar.render();
 
+    refreshDesktopModeButton();
+
+
     // Mobile controls: view (month/week) + mode (reservation/event) without bloating the header.
     try {
       const controlsId = 'onekite-mobile-controls';
@@ -1173,17 +1277,16 @@ function toDatetimeLocalValue(date) {
         if (canCreateSpecial) {
           const modeBtn = document.createElement('button');
           modeBtn.type = 'button';
-          modeBtn.className = 'btn btn-sm btn-outline-warning onekite-mode-btn';
+          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);
-            // Make the button visually distinct from the view buttons
-            modeBtn.classList.toggle('btn-warning', isSpecial);
-            modeBtn.classList.toggle('btn-outline-warning', !isSpecial);
+            // Keep violet, only toggle active class
+            modeBtn.classList.toggle('onekite-active', isSpecial);
           }
           modeBtn.addEventListener('click', () => {
-            mode = (mode === 'special') ? 'reservation' : 'special';
+            setMode((mode === 'special') ? 'reservation' : 'special');
             refreshModeBtn();
             if (mode === 'special') {
               showAlert('success', 'Mode évènement : sélectionne une plage (date/heure) sur le calendrier.');