nodebb-plugin-equipment-calendar 8.8.9 → 8.9.1

package/library.js

@@ -1324,31 +1324,23 @@ async function handleCreateReservation(req, res) {
       return helpers.notAllowed(req, res);
     }
 
-    const startIsoInput = String(req.body.start || req.body.startDate || req.body.startIso || '').trim();
-    const endIsoInput = String(req.body.end || req.body.endDate || req.body.endIso || '').trim();
-
     const itemIdsRaw = (req.body.itemIds !== undefined ? req.body.itemIds : req.body.itemId);
     const itemIds = normalizeItemIds(itemIdsRaw);
     if (!itemIds.length) return res.status(400).send('itemIds required');
 
-    // Dates come from modal as YYYY-MM-DD
-    const startVal = req.body.start || req.body.startDate || req.body.startIso || req.body.startMs || req.body.startTime || '';
-    const endVal = req.body.end || req.body.endDate || req.body.endIso || req.body.endMs || req.body.endTime || '';
-    const start = parseDateInput(startVal);
-    const end = parseDateInput(endVal);
-    if (!start || !end) return res.status(400).send('dates required');
-
-    const startIso = (/^\d{4}-\d{2}-\d{2}$/.test(startIsoInput) ? startIsoInput : `${start.getUTCFullYear()}-${String(start.getUTCMonth()+1).padStart(2,'0')}-${String(start.getUTCDate()).padStart(2,'0')}`);
-    const endIso = (/^\d{4}-\d{2}-\d{2}$/.test(endIsoInput) ? endIsoInput : `${end.getUTCFullYear()}-${String(end.getUTCMonth()+1).padStart(2,'0')}-${String(end.getUTCDate()).padStart(2,'0')}`);
-
+    // 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)) {
+      return res.status(400).send('dates required');
+    }
 
-    const startMs = Date.UTC(start.getUTCFullYear(), start.getUTCMonth(), start.getUTCDate());
-    let endMs = Date.UTC(end.getUTCFullYear(), end.getUTCMonth(), end.getUTCDate());
-    if (endMs <= startMs) endMs = startMs + 24 * 60 * 60 * 1000;
+    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');
+    }
 
-    const endMsInclusive = endMs;
-    const endMsExclusive = endMsInclusive + 24 * 60 * 60 * 1000;
-    endMs = endMsExclusive;
     const days = Math.max(1, Math.round((endMs - startMs) / (24 * 60 * 60 * 1000)));
 
     const items = await getActiveItems(settings);
@@ -1372,14 +1364,14 @@ async function handleCreateReservation(req, res) {
         itemId,
         startMs,
         endMs,
-        startIso: startIso, 10),
-        endIso: endIso, 10),
+        startIso,
+        endIso,
         days,
         unitPrice,
         total,
         notesUser,
         status: 'pending',
-        createdAt: formatDateTimeFR(r.createdAt || 0),
+        createdAt: Date.now(),
       };
       // eslint-disable-next-line no-await-in-loop
       await saveReservation(r);
@@ -1388,10 +1380,11 @@ async function handleCreateReservation(req, res) {
     return res.redirect(nconf.get('relative_path') + '/calendar?created=1');
   } catch (err) {
     winston.error('[equipment-calendar] create error: ' + (err && err.message ? err.message : ''), err);
-    return res.status(500).send(err && err.message ? err.message : 'error');
+    return res.status(500).send('error');
   }
 }
 
+
 async function handleApproveReservation(req, res) {
   try {
     const settings = await getSettings();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "8.8.9",
+  "version": "8.9.1",
   "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-stable4j-calendar-actions",
+  "version": "3.0.0-stable4k-fix-create-icons",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -143,26 +143,42 @@ function updateTotalPrice() {
         eventContent: function(arg) {
           try {
             var status = (arg.event.extendedProps && arg.event.extendedProps.status) ? arg.event.extendedProps.status : '';
+            var iconTxt = '';
             var iconClass = '';
-            if (status === 'pending') iconClass = 'fa-hourglass-half text-warning';
-            else if (status === 'paid') iconClass = 'fa-check-circle text-success';
-            else if (status === 'approved') iconClass = 'fa-check text-primary';
-            else if (status === 'rejected' || status === 'cancelled') iconClass = 'fa-times-circle text-danger';
+            if (status === 'pending') { iconTxt = '⏳'; iconClass = 'fa fa-hourglass-half text-warning'; }
+            else if (status === 'paid') { iconTxt = '✅'; iconClass = 'fa fa-check-circle text-success'; }
+            else if (status === 'approved') { iconTxt = '✔️'; iconClass = 'fa fa-check text-success'; }
+            else if (status === 'rejected' || status === 'cancelled') { iconTxt = '❌'; iconClass = 'fa fa-times text-danger'; }
+
             var wrap = document.createElement('div');
             wrap.className = 'ec-event';
+            var icon = document.createElement('span');
+            icon.className = 'ec-icon';
+            // Prefer fontawesome if available, but keep emoji fallback
             if (iconClass) {
-              var i = document.createElement('i');
-              i.className = 'fa ' + iconClass + ' ec-icon';
-              wrap.appendChild(i);
+              icon.innerHTML = '<i class="' + iconClass + '"></i> <span class="visually-hidden">' + status + '</span>';
+            } else {
+              icon.textContent = '';
             }
             var t = document.createElement('span');
             t.className = 'ec-title';
             t.textContent = arg.event.title || '';
+            if (iconTxt && (!iconClass || !document.querySelector('link[href*="fontawesome"], style, script'))) {
+              // emoji fallback shown if needed
+              var em = document.createElement('span');
+              em.textContent = iconTxt + ' ';
+              wrap.appendChild(em);
+            } else if (iconClass) {
+              wrap.appendChild(icon);
+            }
             wrap.appendChild(t);
             return { domNodes: [wrap] };
           } catch (e) {
             return true;
           }
+        } catch (e) {
+            return true;
+          }
         },
       timeZone: 'local',
       events: events,