nodebb-plugin-equipment-calendar 8.0.0 → 8.0.2

package/library.js

@@ -27,6 +27,24 @@ function generateId() {
     return String(Date.now()) + '-' + Math.random().toString(16).slice(2);
   }
 }
+
+
+function normalizeItemIds(itemIdsRaw) {
+  if (!itemIdsRaw) return [];
+  if (Array.isArray(itemIdsRaw)) {
+    return itemIdsRaw.map(String).flatMap((v) => String(v).split(',')).map(s => s.trim()).filter(Boolean);
+  }
+  if (typeof itemIdsRaw === 'string') {
+    return itemIdsRaw.split(',').map(s => s.trim()).filter(Boolean);
+  }
+  // fallback: single value (number/object/etc.)
+  try {
+    return [String(itemIdsRaw).trim()].filter(Boolean);
+  } catch (e) {
+    return [];
+  }
+}
+
 const axios = require('axios');
 const { DateTime } = require('luxon');
 const { v4: uuidv4 } = require('uuid');
@@ -316,10 +334,10 @@ async function getSettings() {
 // Keys:
 // item hash: equipmentCalendar:items (stored in settings as JSON)
 // reservations stored as objects in db, indexed by id, and by itemId
-// reservation object key: equipmentCalendar:res:<id>
+// reservation object key: equipmentCalendar:reservation:<rid>
 // index by item: equipmentCalendar:item:<itemId>:res (sorted set score=startMillis, value=resId)
 
-function resKey(id) { return `equipmentCalendar:res:${id}`; }
+function resKey(rid) { return `equipmentCalendar:reservation:${rid}`; }
 function itemIndexKey(itemId) { return `equipmentCalendar:item:${itemId}:res`; }
 
 function statusBlocksItem(status) {
@@ -348,19 +366,19 @@ async function getBookingRids(bookingId) {
   return await db.getSetMembers(`equipmentCalendar:booking:${bookingId}:rids`) || [];
 }
 
-async function saveReservation(res) {
-  await db.setObject(resKey(res.id), res);
-  // per-item index (calendar fetch by item)
-  await db.sortedSetAdd(itemIndexKey(res.itemId), res.startMs, res.id);
-  // global index (ACP list)
-  await db.sortedSetAdd('equipmentCalendar:reservations', res.startMs, res.id);
+async function saveReservation(r) {
+  const rid = String(r.rid || r.id || '');
+  if (!rid) throw new Error('missing rid');
+  r.rid = rid;
+  await db.setObject(resKey(rid), r);
+  await db.sortedSetAdd(itemIndexKey(r.itemId), r.startMs, rid);
+  await db.sortedSetAdd('equipmentCalendar:reservations', r.startMs, rid);
 }
 
-async function getReservation(id) {
-  const obj = await db.getObject(resKey(id));
-  if (!obj || !obj.id) return null;
-  // db returns strings, normalize
-  return normalizeReservation(obj);
+async function getReservation(rid) {
+  const id = String(rid || '');
+  if (!id) return null;
+  return await db.getObject(resKey(id));
 }
 
 function normalizeReservation(obj) {
@@ -1176,47 +1194,61 @@ async function handleCreateReservation(req, res) {
       return helpers.notAllowed(req, res);
     }
 
-    const itemIdsRaw = req.body.itemIds || req.body.itemId || '';
-    const itemIds = (Array.isArray(itemIdsRaw) ? itemIdsRaw : String(itemIdsRaw))
-      .split(',')
-      .map(s => String(s).trim())
-      .filter(Boolean);
+    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');
 
-    if (!itemIds.length) {
-      return res.status(400).send('itemIds required');
-    }
+    // Dates come from modal as YYYY-MM-DD
+    const startStr = String(req.body.start || req.body.startDate || req.body.startIso || '');
+    const endStr = String(req.body.end || req.body.endDate || req.body.endIso || '');
+    if (!startStr || !endStr) return res.status(400).send('dates required');
 
-    const tz = settings.timezone || 'Europe/Paris';
-    const start = DateTime.fromISO(String(req.body.start || ''), { zone: tz });
-    const end = DateTime.fromISO(String(req.body.end || ''), { zone: tz });
-    if (!start.isValid || !end.isValid) return res.status(400).send('Invalid dates');
+    const start = new Date(startStr + 'T00:00:00Z');
+    const end = new Date(endStr + 'T00:00:00Z');
+    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;
 
-    // Normalize to whole days (no hours). End is exclusive.
-    const startDay = start.startOf('day');
-    let endDay = end.startOf('day');
-    if (endDay <= startDay) {
-      endDay = startDay.plus({ days: 1 });
-    }
+    const days = Math.max(1, Math.round((endMs - startMs) / (24 * 60 * 60 * 1000)));
 
-    const startMs = startDay.toMillis();
-    const endMs = endDay.toMillis();
+    const items = await getActiveItems(settings);
+    const byId = {};
+    items.forEach((it) => { byId[String(it.id)] = it; });
 
-    const notesUser = String(req.body.notesUser || '').trim();
+    const validIds = itemIds.map(String).filter((id) => byId[id]);
+    if (!validIds.length) return res.status(400).send('unknown item');
 
-    const bookingId = `${req.uid}:${Date.now()}:${Math.random().toString(36).slice(2, 8)}`;
+    const notesUser = String(req.body.notesUser || '').trim();
 
-    // Create one reservation per item, linked by bookingId
-    const created = [];
-    for (const itemId of itemIds) {
-      const rid = await createReservationForItem(req, res, settings, itemId, startMs, endMs, notesUser, bookingId);
-      created.push(rid);
+    for (const itemId of validIds) {
+      const it = byId[itemId];
+      const unitPrice = Number(it.price || 0) || 0;
+      const total = unitPrice * days;
+
+      const rid = generateId();
+      const r = {
+        rid,
+        uid: req.uid,
+        itemId,
+        startMs,
+        endMs,
+        startIso: new Date(startMs).toISOString().slice(0, 10),
+        endIso: new Date(endMs).toISOString().slice(0, 10),
+        days,
+        unitPrice,
+        total,
+        notesUser,
+        status: 'pending',
+        createdAt: Date.now(),
+      };
+      // eslint-disable-next-line no-await-in-loop
+      await saveReservation(r);
     }
 
-    // Redirect to calendar with a success flag
-    return res.redirect('/equipment/calendar?requested=1');
+    return res.redirect(nconf.get('relative_path') + '/calendar?created=1');
   } catch (err) {
-    winston.error(err);
-    return res.status(500).send(err.message || 'Error');
+    winston.error('[equipment-calendar] create error', err);
+    return res.status(500).send('error');
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "8.0.0",
+  "version": "8.0.2",
   "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": "0.7.5",
+  "version": "3.0.0-stable4",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -29,34 +29,32 @@ require(['jquery', 'bootstrap'], function ($, bootstrap) {
   }
 
   function updateTotalPrice() {
-  try {
-    const sel = document.getElementById('ec-item-ids');
-  if (sel) sel.addEventListener('change', updateTotalPrice);
-    const out = document.getElementById('ec-total-price');
-    const startEl = document.getElementById('ec-start');
-    const endEl = document.getElementById('ec-end');
-  if (startEl) startEl.addEventListener('change', updateTotalPrice);
-  if (endEl) endEl.addEventListener('change', updateTotalPrice);
-    if (!sel || !out || !startEl || !endEl) return;
+    try {
+      const sel = document.getElementById('ec-item-ids');
+      const out = document.getElementById('ec-total');
+      const startEl = document.getElementById('ec-start');
+      const endEl = document.getElementById('ec-end');
+      if (!sel || !out || !startEl || !endEl) return;
 
-    const start = startEl.value ? new Date(startEl.value + 'T00:00:00Z') : null;
-    const end = endEl.value ? new Date(endEl.value + 'T00:00:00Z') : null;
-    let days = 1;
-    if (start && end) {
-      const diff = (end.getTime() - start.getTime());
-      days = Math.max(1, Math.round(diff / (24*60*60*1000)));
-    }
+      const start = startEl.value ? new Date(startEl.value + 'T00:00:00Z') : null;
+      const end = endEl.value ? new Date(endEl.value + 'T00:00:00Z') : null;
+      let days = 1;
+      if (start && end) {
+        const ms = end.getTime() - start.getTime();
+        days = Math.max(1, Math.round(ms / (24 * 60 * 60 * 1000)));
+      }
 
-    let sum = 0;
-    const opts = Array.from(sel.selectedOptions || []);
-    for (const opt of opts) {
-      const raw = (opt.getAttribute('data-price') || '').trim().replace(',', '.');
-      const price = parseFloat(raw);
-      if (!Number.isNaN(price)) sum += price;
-    }
+      let sum = 0;
+      const opts = Array.from(sel.selectedOptions || []);
+      opts.forEach((opt) => {
+        const raw = (opt && opt.dataset) ? opt.dataset.price : '';
+        const num = Number(String(raw).replace(',', '.'));
+        if (!Number.isNaN(num)) sum += num;
+      });
 
-    const total = sum * days;
-    out.textContent = total.toFixed(2).replace('.00','') + ' €';
-  } catch (e) rememberError(e);
-})();
+      const total = sum * days;
+      const txt = Number.isInteger(total) ? String(total) : total.toFixed(2);
+      out.textContent = txt + ' €';
+    } catch (e) {}
+  })();
 });