nodebb-plugin-equipment-calendar 8.1.8 → 8.8.9

package/library.js

@@ -462,6 +462,26 @@ async function getReservation(rid) {
   return await db.getObject(resKey(id));
 }
 
+
+async function setReservationStatus(rid, status) {
+  const r = await getReservation(rid);
+  if (!r) throw new Error('not_found');
+  r.status = status;
+  await db.setObject(resKey(rid), r);
+}
+
+async function deleteReservation(rid) {
+  const r = await getReservation(rid);
+  if (!r) return;
+  // remove from global index
+  try { await db.sortedSetRemove('equipmentCalendar:reservations', rid); } catch (e) {}
+  // remove from item index
+  try { await db.sortedSetRemove(itemIndexKey(r.itemId), rid); } catch (e) {}
+  // delete object
+  await db.delete(resKey(rid));
+}
+
+
 function normalizeReservation(obj) {
   const startMs = Number(obj.startMs);
   const endMs = Number(obj.endMs);
@@ -751,7 +771,36 @@ plugin.init = async function (params) {
   });
 
   // Page routes are attached via filter:router.page as well, but we also add directly to be safe:
-  router.get('/equipment/calendar', middleware.buildHeader, renderCalendarPage);
+  
+  // Calendar inline actions (approve/reject/delete) via API
+  router.post('/api/equipment/reservations/:rid/action', middleware.applyCSRF, async (req, res) => {
+    try {
+      const settings = await getSettings();
+      const rid = String(req.params.rid || '').trim();
+      const action = String(req.body.action || '').trim();
+      if (!rid || !action) return res.status(400).json({ error: 'missing' });
+
+      // Only approvers/admins can moderate
+      const allowed = await isApprover(req.uid, settings);
+      if (!allowed) return res.status(403).json({ error: 'forbidden' });
+
+      if (action === 'approve') {
+        await setReservationStatus(rid, 'approved');
+      } else if (action === 'reject') {
+        await setReservationStatus(rid, 'rejected');
+      } else if (action === 'delete') {
+        await deleteReservation(rid);
+      } else {
+        return res.status(400).json({ error: 'bad_action' });
+      }
+      return res.json({ ok: true });
+    } catch (e) {
+      winston.error('[equipment-calendar] api action error', e);
+      return res.status(500).json({ error: 'server' });
+    }
+  });
+
+router.get('/equipment/calendar', middleware.buildHeader, renderCalendarPage);
   router.get('/equipment/approvals', middleware.buildHeader, renderApprovalsPage);
 
   router.post('/equipment/reservations/create', middleware.applyCSRF, handleCreateReservation);
@@ -830,9 +879,9 @@ async function renderAdminReservationsPage(req, res) {
       itemName: (itemById[String(r.itemId || '')] && itemById[String(r.itemId || '')].name) || String(r.itemId || ''),
       uid: String(r.uid || ''),
       status: String(r.status || ''),
-      start: startMs ? new Date(startMs).toISOString() : '',
-      end: endMs ? new Date(endMs).toISOString() : '',
-      createdAt: createdAt ? new Date(createdAt).toISOString() : '',
+      start: r.startIso,
+      end: addDaysIso(r.endIso, 1),
+      createdAt: formatDateTimeFR(r.createdAt || 0),
       notesUser: notes,
     });
   }
@@ -1219,8 +1268,8 @@ async function renderApprovalsPage(req, res) {
       id: r.id,
       itemName: item ? item.name : r.itemId,
       requester: nameByUid[r.uid] || `uid:${r.uid}`,
-      start: DateTime.fromMillis(r.startMs).toFormat('dd/LL/yyyy HH:mm'),
-      end: DateTime.fromMillis(r.endMs).toFormat('dd/LL/yyyy HH:mm'),
+      start: r.startIso,
+      end: addDaysIso(r.endIso, 1),
       status: r.status,
       paymentUrl: r.ha_paymentUrl || '',
     };
@@ -1259,7 +1308,7 @@ async function createReservationForItem(req, res, settings, itemId, startMs, end
     status: 'pending',
     notesUser: notesUser || '',
     bookingId: bookingId || '',
-    createdAt: Date.now(),
+    createdAt: formatDateTimeFR(r.createdAt || 0),
   };
   await saveReservation(data);
   if (bookingId) {
@@ -1289,6 +1338,10 @@ async function handleCreateReservation(req, res) {
     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')}`);
+
+
     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;
@@ -1319,14 +1372,14 @@ async function handleCreateReservation(req, res) {
         itemId,
         startMs,
         endMs,
-        startIso: new Date(startMs).toISOString().slice(0, 10),
-        endIso: new Date(endMs - 24*60*60*1000).toISOString().slice(0, 10),
+        startIso: startIso, 10),
+        endIso: endIso, 10),
         days,
         unitPrice,
         total,
         notesUser,
         status: 'pending',
-        createdAt: Date.now(),
+        createdAt: formatDateTimeFR(r.createdAt || 0),
       };
       // eslint-disable-next-line no-await-in-loop
       await saveReservation(r);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "8.1.8",
+  "version": "8.8.9",
   "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-stable4f-parisdates",
+  "version": "3.0.0-stable4j-calendar-actions",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -83,4 +83,120 @@ function updateTotalPrice() {
       out.textContent = txt + ' €';
     } catch (e) {}
   })();
+
+  // EC_CALENDAR_INIT
+  function addDaysIsoLocal(iso, days) {
+    const m = String(iso || '').match(/^(\d{4})-(\d{2})-(\d{2})$/);
+    if (!m) return iso;
+    const y = parseInt(m[1], 10);
+    const mo = parseInt(m[2], 10) - 1;
+    const d = parseInt(m[3], 10);
+    const dt = new Date(Date.UTC(y, mo, d));
+    dt.setUTCDate(dt.getUTCDate() + (days || 0));
+    const pad = (x) => String(x).padStart(2, '0');
+    return dt.getUTCFullYear() + '-' + pad(dt.getUTCMonth() + 1) + '-' + pad(dt.getUTCDate());
+  }
+
+  function openCreateModal(startIso, endIsoInclusive) {
+    const modalEl = document.getElementById('ec-create-modal');
+    if (!modalEl) return;
+
+    const startInput = document.getElementById('ec-start-date');
+    const endInput = document.getElementById('ec-end-date');
+    const hiddenStart = document.getElementById('ec-start-iso');
+    const hiddenEnd = document.getElementById('ec-end-iso');
+
+    if (startInput) startInput.value = startIso;
+    if (endInput) endInput.value = endIsoInclusive;
+    if (hiddenStart) hiddenStart.value = startIso;
+    if (hiddenEnd) hiddenEnd.value = endIsoInclusive;
+
+    // sync hidden when user edits
+    if (startInput && hiddenStart) startInput.onchange = () => { hiddenStart.value = startInput.value; updateTotalPrice(); };
+    if (endInput && hiddenEnd) endInput.onchange = () => { hiddenEnd.value = endInput.value; updateTotalPrice(); };
+
+    updateTotalPrice();
+
+    try {
+      const modal = bootstrap.Modal.getOrCreateInstance(modalEl, { backdrop: true, keyboard: true });
+      modal.show();
+    } catch (e) {}
+  }
+
+  function initCalendar() {
+    const calEl = document.getElementById('ec-calendar');
+    if (!calEl || typeof window.FullCalendar === 'undefined') return;
+
+    const events = Array.isArray(window.EC_EVENTS) ? window.EC_EVENTS : [];
+    const blocks = Array.isArray(window.EC_BLOCKS) ? window.EC_BLOCKS : [];
+
+    const calendar = new window.FullCalendar.Calendar(calEl, {
+      initialView: 'dayGridMonth',
+        listDaySideFormat: false,
+        listDayFormat: { weekday: 'long', day: '2-digit', month: '2-digit', year: 'numeric' },
+      headerToolbar: { left: 'prev,next today', center: 'title', right: 'dayGridMonth,dayGridWeek,listWeek' },
+      selectable: !!window.EC_CAN_CREATE,
+      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-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';
+            var wrap = document.createElement('div');
+            wrap.className = 'ec-event';
+            if (iconClass) {
+              var i = document.createElement('i');
+              i.className = 'fa ' + iconClass + ' ec-icon';
+              wrap.appendChild(i);
+            }
+            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',
+      events: events,
+      select: function (info) {
+        if (!window.EC_CAN_CREATE) return;
+        const startIso = info.startStr; // YYYY-MM-DD
+        const endIsoInclusive = addDaysIsoLocal(info.endStr, -1); // endStr is exclusive
+        openCreateModal(startIso, endIsoInclusive);
+      },
+      dateClick: function (info) {
+        if (!window.EC_CAN_CREATE) return;
+        openCreateModal(info.dateStr, info.dateStr);
+      },
+      eventClick: function (info) {
+        // simple details popup
+        const r = info.event.extendedProps || {};
+        const title = info.event.title || 'Réservation';
+        const start = info.event.startStr || '';
+        const end = info.event.endStr ? addDaysIsoLocal(info.event.endStr, -1) : '';
+        bootbox.alert(`<strong>${title}</strong><br>Du ${start} au ${end}<br>Statut: ${r.status || ''}`);
+      },
+    });
+
+    calendar.render();
+  }
+
+  $(window).on('action:ajaxify.end', function (ev, data) {
+    if (data && data.url && data.url.indexOf('/calendar') !== -1) {
+      initCalendar();
+    }
+  });
+
+  $(function () {
+    initCalendar();
+  });
+
 });

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

@@ -82,3 +82,8 @@
   window.EC_CAN_CREATE = {canCreateJs};
   window.EC_TZ = '{tz}';
 </script>
+
+<script>
+  window.EC_CSRF = '{csrf_token}';
+  window.EC_IS_APPROVER = {isApprover};
+</script>