nodebb-plugin-onekite-calendar 1.0.8 → 1.0.10

package/lib/api.js

@@ -134,12 +134,14 @@ function formatFR(tsOrIso) {
 }
 
 function buildHelloAssoItemName(baseLabel, itemNames, start, end) {
-  const base = String(baseLabel || 'Réservation matériel Onekite').trim();
+  const base = String(baseLabel || '').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}`));
+  const range = (start && end) ? ('Du ' + formatFR(start) + ' au ' + formatFR(end)) : '';
+  const lines = [];
+  if (base) lines.push(base);
+  items.forEach((it) => lines.push('• ' + it));
   if (range) lines.push(range);
+  if (!lines.length) lines.push('Réservation matériel');
   let out = lines.join('\n').trim();
   // HelloAsso constraint: itemName max 250 chars
   if (out.length > 250) {
@@ -812,7 +814,7 @@ api.approveReservation = async function (req, res) {
       // Can be overridden via ACP setting `helloassoCallbackUrl`.
       callbackUrl: normalizeReturnUrl(meta),
       webhookUrl: normalizeCallbackUrl(settings2.helloassoCallbackUrl, meta),
-      itemName: buildHelloAssoItemName('Réservation matériel Onekite', r.itemNames || (r.itemName ? [r.itemName] : []), r.start, r.end),
+      itemName: buildHelloAssoItemName('', r.itemNames || (r.itemName ? [r.itemName] : []), r.start, r.end),
       containsDonation: false,
       metadata: {
         reservationId: String(rid),

package/lib/widgets.js

@@ -164,10 +164,51 @@ 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)
+      // Force day number to be numeric only (avoid '1 janvier' style labels)
+      dayCellContent: function(arg) {
+        try {
+          const t = String(arg.dayNumberText || '');
+          const m = t.match(/^\d+/);
+          return { html: m ? m[0] : t };
+        } catch (e) {
+          return { html: String(arg.dayNumberText || '') };
+        }
+      },
+      eventClassNames: function(arg) {
+        try {
+          const ev = arg && arg.event;
+          if (!ev) return ['onekite-singleday'];
+          if (ev.extendedProps && (ev.extendedProps.multiDay === true || ev.extendedProps.days > 1)) return ['onekite-multiday'];
+          if (ev.start && ev.end) {
+            const diff = (new Date(ev.end)).getTime() - (new Date(ev.start)).getTime();
+            return [diff > 86400000 ? 'onekite-multiday' : 'onekite-singleday'];
+          }
+        } catch (e) {}
+        return ['onekite-singleday'];
+      },
+      // Render: dot for single-day, pill for multi-day
       eventContent: function(arg) {
-        const bg = (arg.event.backgroundColor || (arg.event.extendedProps && arg.event.extendedProps.backgroundColor) || '').trim();
-        const border = (arg.event.borderColor || '').trim();
+        const ev = arg && arg.event;
+        const isMulti = (function(){
+          try {
+            if (!ev || !ev.start || !ev.end) return false;
+            if (ev.extendedProps && (ev.extendedProps.multiDay === true || ev.extendedProps.days > 1)) return true;
+            const s = new Date(ev.start);
+            const e = new Date(ev.end);
+            const diff = e.getTime() - s.getTime();
+            return diff > 86400000; // strictly more than 1 day
+          } catch (e) { return false; }
+        })();
+
+        if (isMulti) {
+          const spacer = document.createElement('span');
+          spacer.className = 'onekite-pill-spacer';
+          spacer.appendChild(document.createTextNode('\u00A0'));
+          return { domNodes: [spacer] };
+        }
+
+        const bg = (ev.backgroundColor || (ev.extendedProps && ev.extendedProps.backgroundColor) || '').trim();
+        const border = (ev.borderColor || '').trim();
         const color = bg || border || '#3788d8';
         const wrap = document.createElement('span');
         wrap.className = 'onekite-dot-wrap';
@@ -194,13 +235,12 @@ widgets.renderTwoWeeksWidget = async function (data) {
           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>` : ''}
-          `;
+          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) => {
@@ -262,11 +302,38 @@ 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 { background: transparent; border: none; }
+
+  /* Single-day: show only a dot */
+  .onekite-twoweeks .fc .fc-event.onekite-singleday { background: transparent !important; border: none !important; }
+  .onekite-twoweeks .fc .fc-daygrid-event.onekite-singleday,
+  .onekite-twoweeks .fc .fc-daygrid-block-event.onekite-singleday {
+    background: transparent !important;
+    border: none !important;
+    box-shadow: none !important;
+  }
+  .onekite-twoweeks .fc .fc-daygrid-block-event.onekite-singleday .fc-event-main { padding: 0 !important; }
+
+  /* Multi-day: keep FullCalendar bar, but hide text and make it a pill */
+  .onekite-twoweeks .fc .fc-event.onekite-multiday {
+    border-radius: 999px !important;
+    overflow: hidden;
+  }
+  .onekite-twoweeks .fc .fc-daygrid-event.onekite-multiday,
+  .onekite-twoweeks .fc .fc-daygrid-block-event.onekite-multiday {
+    border-radius: 999px !important;
+    box-shadow: none !important;
+  }
+  .onekite-twoweeks .fc .fc-event.onekite-multiday .fc-event-main { padding: 0 !important; }
+  .onekite-twoweeks .fc .fc-event.onekite-multiday .fc-event-title,
+  .onekite-twoweeks .fc .fc-event.onekite-multiday .fc-event-time { display:none !important; }
+
+  .onekite-twoweeks .fc .fc-daygrid-event-harness { margin-top: 2px; }
+  .onekite-twoweeks .fc .fc-daygrid-event { padding: 0 !important; }
   .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-wrap { display:flex; align-items:center; justify-content:center; width: auto; }
   .onekite-dot { width: 10px; height: 10px; border-radius: 999px; display:inline-block; }
+  .onekite-pill-spacer { display:block; height: 10px; line-height: 10px; }
   .onekite-cal-tooltip {
     position: absolute;
     z-index: 99999;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "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.3"
+  "version": "1.0.10"
 }