nodebb-plugin-onekite-calendar 1.0.11 → 1.0.13

package/lib/widgets.js

@@ -169,19 +169,23 @@ widgets.renderTwoWeeksWidget = async function (data) {
       height: 'auto',
       headerToolbar: {
         left: 'prev,next',
-        center: 'title',
+        // No range/title in the widget: it becomes redundant and, when the
+        // view crosses months, FullCalendar displays a start/end range.
+        center: '',
         right: '',
       },
       navLinks: false,
       eventTimeFormat: { hour: '2-digit', minute: '2-digit', hour12: false },
+      // Hide date numbers in column headers (keep only weekday)
+      dayHeaderFormat: { weekday: 'short' },
       // 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 };
+          return { html: '<span class="fc-daygrid-day-number">' + (m ? m[0] : t) + '</span>' };
         } catch (e) {
-          return { html: String(arg.dayNumberText || '') };
+          return { html: '<span class="fc-daygrid-day-number">' + String(arg.dayNumberText || '') + '</span>' };
         }
       },
       eventClassNames: function(arg) {
@@ -235,7 +239,16 @@ widgets.renderTwoWeeksWidget = async function (data) {
           .then((json) => successCallback(json || []))
           .catch((e) => failureCallback(e));
       },
-      dateClick: function() { window.location.href = calUrl; },
+            eventDataTransform: function(ev) {
+        try {
+          if (ev && ev.extendedProps && String(ev.extendedProps.type) === 'special') {
+            // Unify rendering with rentals in the widget: use allDay layout
+            ev.allDay = true;
+          }
+        } catch (e) {}
+        return ev;
+      },
+dateClick: function() { window.location.href = calUrl; },
       eventDidMount: function(info) {
         try {
           const ev = info.event;
@@ -256,7 +269,18 @@ widgets.renderTwoWeeksWidget = async function (data) {
 
           const ep = ev.extendedProps || {};
           const title = (ep.itemNameLine || ep.title || ev.title || '').toString();
-          const status = (ep.status || ep.type || '').toString();
+          const statusLabel = (function(s){
+            const map = {
+              pending: 'En attente',
+              awaiting_payment: 'Validée – paiement en attente',
+              paid: 'Payée',
+              rejected: 'Rejetée',
+              expired: 'Expirée',
+            };
+            const k = String(s || '');
+            return map[k] || '';
+          });
+          const status = (String(ep.type || '') === 'reservation') ? statusLabel(ep.status) : '';
           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');

package/package.json

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