nodebb-plugin-equipment-calendar 8.9.2 → 8.9.4

package/library.js

@@ -1328,15 +1328,26 @@ async function handleCreateReservation(req, res) {
     const itemIds = normalizeItemIds(itemIdsRaw);
     if (!itemIds.length) return res.status(400).send('itemIds required');
 
-    // Dates expected as YYYY-MM-DD (end inclusive in UI)
-    const startIso = String(req.body.start || req.body.startDate || req.body.startIso || '').trim();
-    const endIso = String(req.body.end || req.body.endDate || req.body.endIso || '').trim();
-    if (!/^\d{4}-\d{2}-\d{2}$/.test(startIso) || !/^\d{4}-\d{2}-\d{2}$/.test(endIso)) {
+    // Dates: accept YYYY-MM-DD or ISO-with-time; take first 10 chars
+    let _startIso = String(req.body.start || req.body.startDate || req.body.startIso || req.body.startStr || '').trim().slice(0, 10);
+    let _endIso = String(req.body.end || req.body.endDate || req.body.endIso || req.body.endStr || '').trim().slice(0, 10);
+
+    // Fallback: timestamps
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(_startIso)) {
+      const ms = Number(req.body.startMs || req.body.startTime || 0);
+      if (ms) _startIso = new Date(ms).toISOString().slice(0, 10);
+    }
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(_endIso)) {
+      const ms = Number(req.body.endMs || req.body.endTime || 0);
+      if (ms) _endIso = new Date(ms).toISOString().slice(0, 10);
+    }
+
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(_startIso) || !/^\d{4}-\d{2}-\d{2}$/.test(_endIso)) {
       return res.status(400).send('dates required');
     }
 
-    const startMs = Date.parse(startIso + 'T00:00:00Z');
-    const endMs = Date.parse(addDaysIso(endIso, 1) + 'T00:00:00Z'); // exclusive end
+    const startMs = Date.parse(_startIso + 'T00:00:00Z');
+    const endMs = Date.parse(addDaysIso(_endIso, 1) + 'T00:00:00Z'); // exclusive end
     if (!startMs || !endMs || endMs <= startMs) {
       return res.status(400).send('dates required');
     }
@@ -1364,8 +1375,8 @@ async function handleCreateReservation(req, res) {
         itemId,
         startMs,
         endMs,
-        startIso,
-        endIso,
+        startIso: _startIso,
+        endIso: _endIso,
         days,
         unitPrice,
         total,
@@ -1385,6 +1396,7 @@ async function handleCreateReservation(req, res) {
 }
 
 
+
 async function handleApproveReservation(req, res) {
   try {
     const settings = await getSettings();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "8.9.2",
+  "version": "8.9.4",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {

package/plugin.json

@@ -25,6 +25,6 @@
   "scripts": [
     "public/js/client.js"
   ],
-  "version": "3.0.0-stable4l-dateslice-noemoji",
+  "version": "3.0.0-stable4n-syntaxfix",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -139,34 +139,7 @@ function updateTotalPrice() {
       selectMirror: true,
       dayMaxEventRows: true,
       displayEventTime: false,
-        eventDisplay: 'block',
-        eventContent: function(arg) {
-          try {
-            var status = (arg.event.extendedProps && arg.event.extendedProps.status) ? arg.event.extendedProps.status : '';
-            var iconClass = '';
-            if (status === 'pending') iconClass = 'fa fa-hourglass-half text-warning';
-            else if (status === 'paid') iconClass = 'fa fa-check-circle text-success';
-            else if (status === 'approved') iconClass = 'fa fa-check text-success';
-            else if (status === 'rejected' || status === 'cancelled') iconClass = 'fa fa-times text-danger';
-
-            var wrap = document.createElement('div');
-            wrap.className = 'ec-event';
-            if (iconClass) {
-              var icon = document.createElement('span');
-              icon.className = 'ec-icon';
-              icon.innerHTML = '<i class="' + iconClass + '"></i>';
-              wrap.appendChild(icon);
-            }
-            var t = document.createElement('span');
-            t.className = 'ec-title';
-            t.textContent = arg.event.title || '';
-            wrap.appendChild(t);
-            return { domNodes: [wrap] };
-          } catch (e) {
-            return true;
-          }
-        },
-      timeZone: 'local',
+        timeZone: 'local',
       events: events,
       select: function (info) {
         if (!window.EC_CAN_CREATE) return;

package/public/templates/admin/plugins/equipment-calendar-reservations.tpl

@@ -36,7 +36,7 @@
   </form>
 
   <div class="text-muted small mb-2">
-    Total (filtré) : <strong>{total}</strong> — Total (global) : <strong>{totalAll}</strong>
+    Total (filtré) : <strong>{total}</strong> - Total (global) : <strong>{totalAll}</strong>
   </div>
 
   {{{ if hasRows }}}

package/public/templates/equipment-calendar/calendar.tpl

@@ -59,7 +59,7 @@
               <div id="ec-total-days">1 jour</div>
               <hr class="my-2">
               <div class="fw-semibold">Total estimé</div>
-              <div id="ec-total-price" class="fs-5">0 €</div>
+              <div id="ec-total-price" class="fs-5">0 EUR</div>
             </div>
           </div>