nodebb-plugin-onekite-calendar 1.0.7 → 1.0.9

package/lib/admin.js

@@ -18,6 +18,20 @@ function formatFR(tsOrIso) {
   return `${dd}/${mm}/${yyyy}`;
 }
 
+function buildHelloAssoItemName(baseLabel, itemNames, start, end) {
+  const base = String(baseLabel || 'Réservation matériel Onekite').trim();
+  const items = Array.isArray(itemNames) ? itemNames.map((s) => String(s || '').trim()).filter(Boolean) : [];
+  const range = (start && end) ? `Du ${formatFR(start)} au ${formatFR(end)}` : '';
+  const lines = [base];
+  items.forEach((it) => lines.push(`• ${it}`));
+  if (range) lines.push(range);
+  let out = lines.join('\n').trim();
+  if (out.length > 250) {
+    out = out.slice(0, 249).trimEnd() + '…';
+  }
+  return out;
+}
+
 async function sendEmail(template, toEmail, subject, data) {
   // Prefer sending by uid (NodeBB core expects uid in various places)
   const uid = data && Number.isInteger(data.uid) ? data.uid : null;
@@ -95,7 +109,7 @@ const admin = {};
 
 admin.renderAdmin = async function (req, res) {
   res.render('admin/plugins/calendar-onekite', {
-    title: 'Calendar OneKite',
+    title: 'Calendar Onekite',
   });
 };
 
@@ -173,9 +187,13 @@ admin.approveReservation = async function (req, res) {
       // User return/back/error URLs must be real pages; webhook uses the plugin endpoint.
       callbackUrl: returnUrl,
       webhookUrl: webhookUrl,
-      itemName: 'Réservation matériel OneKite',
+      itemName: buildHelloAssoItemName('Réservation matériel Onekite', r.itemNames || (r.itemName ? [r.itemName] : []), r.start, r.end),
       containsDonation: false,
-      metadata: { reservationId: String(rid) },
+      metadata: {
+        reservationId: String(rid),
+        items: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
+        dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
+      },
     });
     paymentUrl = intent && (intent.paymentUrl || intent.redirectUrl)
       ? (intent.paymentUrl || intent.redirectUrl)

package/lib/api.js

@@ -133,6 +133,21 @@ function formatFR(tsOrIso) {
   return `${dd}/${mm}/${yyyy}`;
 }
 
+function buildHelloAssoItemName(baseLabel, itemNames, start, end) {
+  const base = String(baseLabel || 'Réservation matériel Onekite').trim();
+  const items = Array.isArray(itemNames) ? itemNames.map((s) => String(s || '').trim()).filter(Boolean) : [];
+  const range = (start && end) ? `Du ${formatFR(start)} au ${formatFR(end)}` : '';
+  const lines = [base];
+  items.forEach((it) => lines.push(`• ${it}`));
+  if (range) lines.push(range);
+  let out = lines.join('\n').trim();
+  // HelloAsso constraint: itemName max 250 chars
+  if (out.length > 250) {
+    out = out.slice(0, 249).trimEnd() + '…';
+  }
+  return out;
+}
+
 function toTs(v) {
   if (v === undefined || v === null || v === '') return NaN;
   // Accept milliseconds timestamps passed as strings or numbers.
@@ -797,9 +812,13 @@ api.approveReservation = async function (req, res) {
       // Can be overridden via ACP setting `helloassoCallbackUrl`.
       callbackUrl: normalizeReturnUrl(meta),
       webhookUrl: normalizeCallbackUrl(settings2.helloassoCallbackUrl, meta),
-      itemName: 'Réservation matériel OneKite',
+      itemName: buildHelloAssoItemName('Réservation matériel Onekite', r.itemNames || (r.itemName ? [r.itemName] : []), r.start, r.end),
       containsDonation: false,
-      metadata: { reservationId: String(rid) },
+      metadata: {
+        reservationId: String(rid),
+        items: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
+        dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
+      },
     });
     const paymentUrl = intent && (intent.paymentUrl || intent.redirectUrl) ? (intent.paymentUrl || intent.redirectUrl) : (typeof intent === 'string' ? intent : null);
     const checkoutIntentId = intent && intent.checkoutIntentId ? String(intent.checkoutIntentId) : null;

package/lib/discord.js

@@ -88,7 +88,7 @@ function buildReservationMessage(kind, reservation) {
 function buildWebhookPayload(kind, reservation) {
   // Discord "regroupe" visuellement les messages consécutifs d'un même auteur.
   // En utilisant un username différent par action, on obtient un message bien distinct.
-  const webhookUsername = kind === 'paid' ? 'OneKite • Paiement' : 'OneKite • Réservation';
+  const webhookUsername = kind === 'paid' ? 'Onekite • Paiement' : 'Onekite • Réservation';
 
   const calUrl = 'https://www.onekite.com/calendar';
   const username = reservation && reservation.username ? String(reservation.username) : '';
@@ -124,7 +124,7 @@ function buildWebhookPayload(kind, reservation) {
           ? 'Un paiement a été reçu pour une réservation.'
           : 'Une nouvelle demande de réservation a été créée.',
         fields,
-        footer: { text: 'OneKite • Calendrier' },
+        footer: { text: 'Onekite • Calendrier' },
         timestamp: new Date().toISOString(),
       },
     ],

package/lib/widgets.js

@@ -41,7 +41,7 @@ widgets.defineWidgets = async function (widgetData) {
 
   list.push({
     widget: 'calendar-onekite-twoweeks',
-    name: 'Calendrier OneKite (2 semaines)',
+    name: 'Calendrier',
     description: 'Affiche la semaine courante + la semaine suivante (FullCalendar via CDN).',
     content: '',
   });
@@ -63,7 +63,7 @@ widgets.renderTwoWeeksWidget = async function (data) {
   const html = `
 <div class="onekite-twoweeks">
   <div class="d-flex justify-content-between align-items-center mb-1">
-    <div style="font-weight: 600;">Calendrier (2 semaines)</div>
+    <div style="font-weight: 600;">Calendrier</div>
     <a href="${escapeHtml(calUrl)}" class="btn btn-sm btn-outline-secondary" style="line-height: 1.1;">Ouvrir</a>
   </div>
   <div id="${escapeHtml(id)}"></div>
@@ -117,6 +117,33 @@ widgets.renderTwoWeeksWidget = async function (data) {
 
     await ensureFullCalendar();
 
+    // Basic lightweight tooltip (no dependencies, works on hover + tap)
+    const tip = document.createElement('div');
+    tip.className = 'onekite-cal-tooltip';
+    tip.style.display = 'none';
+    document.body.appendChild(tip);
+
+    function setTipContent(html) {
+      tip.innerHTML = html;
+    }
+
+    function showTipAt(x, y) {
+      tip.style.left = Math.max(8, x + 12) + 'px';
+      tip.style.top = Math.max(8, y + 12) + 'px';
+      tip.style.display = 'block';
+    }
+
+    function hideTip() {
+      tip.style.display = 'none';
+    }
+
+    document.addEventListener('click', (e) => {
+      // Close when clicking outside an event
+      if (!e.target || !e.target.closest || !e.target.closest('.fc-event')) {
+        hideTip();
+      }
+    }, { passive: true });
+
     // Define a 2-week dayGrid view
     const calendar = new window.FullCalendar.Calendar(el, {
       initialView: 'dayGridTwoWeek',
@@ -137,6 +164,19 @@ widgets.renderTwoWeeksWidget = async function (data) {
       },
       navLinks: false,
       eventTimeFormat: { hour: '2-digit', minute: '2-digit', hour12: false },
+      // Render as a colored dot (like FullCalendar list dots)
+      eventContent: function(arg) {
+        const bg = (arg.event.backgroundColor || (arg.event.extendedProps && arg.event.extendedProps.backgroundColor) || '').trim();
+        const border = (arg.event.borderColor || '').trim();
+        const color = bg || border || '#3788d8';
+        const wrap = document.createElement('span');
+        wrap.className = 'onekite-dot-wrap';
+        const dot = document.createElement('span');
+        dot.className = 'onekite-dot';
+        dot.style.backgroundColor = color;
+        wrap.appendChild(dot);
+        return { domNodes: [wrap] };
+      },
       events: function(info, successCallback, failureCallback) {
         const qs = new URLSearchParams({ start: info.startStr, end: info.endStr });
         fetch(eventsEndpoint + '?' + qs.toString(), { credentials: 'same-origin' })
@@ -144,15 +184,71 @@ widgets.renderTwoWeeksWidget = async function (data) {
           .then((json) => successCallback(json || []))
           .catch((e) => failureCallback(e));
       },
-      dateClick: function() {
-        window.location.href = calUrl;
-      },
-      eventClick: function() {
-        window.location.href = calUrl;
+      dateClick: function() { window.location.href = calUrl; },
+      eventDidMount: function(info) {
+        try {
+          const ev = info.event;
+          const ep = ev.extendedProps || {};
+          const title = (ep.itemNameLine || ep.title || ev.title || '').toString();
+          const status = (ep.status || ep.type || '').toString();
+          const start = ev.start ? new Date(ev.start) : null;
+          const end = ev.end ? new Date(ev.end) : null;
+          const pad2 = (n) => String(n).padStart(2, '0');
+          const fmt = (d) => d ? (pad2(d.getDate()) + '/' + pad2(d.getMonth() + 1) + '/' + String(d.getFullYear()).slice(-2)) : '';
+          const range = (start && end) ? ('Du ' + fmt(start) + ' au ' + fmt(end)) : '';
+          const html = '' +
+            '<div style="font-weight:600; margin-bottom:2px;">' + escapeHtml(title) + '</div>' +
+            (range ? ('<div style="opacity:.85">' + escapeHtml(range) + '</div>') : '') +
+            (status ? ('<div style="opacity:.75; margin-top:2px; font-size:.85em;">' + escapeHtml(status) + '</div>') : '');
+
+          // Hover (desktop)
+          info.el.addEventListener('mouseenter', (e) => {
+            setTipContent(html);
+            const rect = info.el.getBoundingClientRect();
+            showTipAt(rect.left + window.scrollX, rect.top + window.scrollY);
+          }, { passive: true });
+          info.el.addEventListener('mouseleave', hideTip, { passive: true });
+
+          // Tap/click (mobile)
+          info.el.addEventListener('click', (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            setTipContent(html);
+            const pt = (e.touches && e.touches[0]) ? e.touches[0] : e;
+            showTipAt((pt.clientX || 0) + window.scrollX, (pt.clientY || 0) + window.scrollY);
+          });
+        } catch (e) {}
       },
     });
 
     calendar.render();
+
+    // Mobile swipe (left/right) to navigate weeks
+    try {
+      let touchStartX = null;
+      let touchStartY = null;
+      el.addEventListener('touchstart', (e) => {
+        const t = e.touches && e.touches[0];
+        if (!t) return;
+        touchStartX = t.clientX;
+        touchStartY = t.clientY;
+      }, { passive: true });
+      el.addEventListener('touchend', (e) => {
+        const t = e.changedTouches && e.changedTouches[0];
+        if (!t || touchStartX === null || touchStartY === null) return;
+        const dx = t.clientX - touchStartX;
+        const dy = t.clientY - touchStartY;
+        touchStartX = null;
+        touchStartY = null;
+        if (Math.abs(dx) < 55) return;
+        if (Math.abs(dx) < Math.abs(dy) * 1.2) return; // mostly vertical
+        if (dx < 0) {
+          calendar.next();
+        } else {
+          calendar.prev();
+        }
+      }, { passive: true });
+    } catch (e) {}
   }
 
   // Widgets can be rendered after ajaxify; delay a tick.
@@ -165,7 +261,23 @@ widgets.renderTwoWeeksWidget = async function (data) {
   .onekite-twoweeks .fc .fc-button { padding: .2rem .35rem; font-size: .75rem; }
   .onekite-twoweeks .fc .fc-daygrid-day-number { font-size: .75rem; padding: 2px; }
   .onekite-twoweeks .fc .fc-col-header-cell-cushion { font-size: .75rem; }
-  .onekite-twoweeks .fc .fc-event-title { font-size: .72rem; }
+  .onekite-twoweeks .fc .fc-event { background: transparent; border: none; }
+  .onekite-twoweeks .fc .fc-event-main { color: inherit; }
+  .onekite-twoweeks .fc .fc-event-title { display:none; }
+  .onekite-dot-wrap { display:flex; align-items:center; justify-content:center; width: 100%; }
+  .onekite-dot { width: 10px; height: 10px; border-radius: 999px; display:inline-block; }
+  .onekite-cal-tooltip {
+    position: absolute;
+    z-index: 99999;
+    max-width: 260px;
+    background: rgba(0,0,0,.92);
+    color: #fff;
+    padding: 8px 10px;
+    border-radius: 10px;
+    font-size: 0.9rem;
+    box-shadow: 0 8px 24px rgba(0,0,0,.25);
+    pointer-events: none;
+  }
 </style>
   `;
 

package/library.js

@@ -126,7 +126,7 @@ Plugin.addAdminNavigation = async function (header) {
   header.plugins.push({
     route: '/plugins/calendar-onekite',
     icon: 'fa-calendar',
-    name: 'Calendar OneKite',
+    name: 'Calendar Onekite',
   });
   return header;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "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": "1.0.7"
+  "version": "1.0.9"
 }

package/public/client.js

@@ -4,7 +4,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   'use strict';
 
   // Ensure small UI tweaks are applied even when themes override bootstrap defaults.
-  (function ensureOneKiteStyles() {
+  (function ensureOnekiteStyles() {
     try {
       if (document.getElementById('onekite-inline-styles')) return;
       const style = document.createElement('style');

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

@@ -2,7 +2,7 @@
 
 <div class="row">
   <div class="col-lg-9">
-    <h1>Calendar OneKite</h1>
+    <h1>Calendar Onekite</h1>
 
     <ul class="nav nav-tabs mt-3" role="tablist">
       <li class="nav-item" role="presentation">