nodebb-plugin-equipment-calendar 6.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');
@@ -256,21 +274,15 @@ async function fetchHelloAssoItems(settings) {
 
   function pushItem(it, tierName) {
     if (!it) return;
-    const id = String(it.id || it.itemId || it.productId || it.code || it.slug || '').trim();
-    const baseName = String(it.name || it.label || it.title || '').trim();
-    const name = (tierName && baseName) ? `${tierName} — ${baseName}` : (baseName || tierName || id);
-    let amount = it.amount ?? it.price ?? it.unitPrice ?? it.totalAmount ?? it.initialAmount ?? it.minimumAmount;
-    if (amount && typeof amount === 'object') {
-      amount = amount.amount ?? amount.value ?? amount.total ?? amount.price ?? amount.cents ?? amount.centAmount ?? 0;
-    }
-    let price = 0;
-    if (typeof amount === 'number') price = amount;
-    else if (typeof amount === 'string') {
-      const s = amount.replace(',', '.').replace(/[^0-9.\-]/g, '');
-      price = parseFloat(s) || 0;
-    }
-    if (!id) return;
-    out.push({ id, name, price, location: '' });
+    const id = String(it.id || it.itemId || it.reference || it.slug || it.code || it.name || '').trim();
+    const name = String(it.name || it.label || it.title || '').trim() || (tierName ? String(tierName) : id);
+    if (!id || !name) return;
+    const amount = it.amount || it.price || it.unitPrice || it.totalAmount || it.initialAmount;
+    const priceCents = (typeof amount === 'number' ? amount : parseInt(amount, 10)) || 0;
+    const raw = (typeof priceCents === 'number' ? priceCents : parseInt(priceCents, 10)) || 0;
+    // Heuristic: HelloAsso amounts are often in cents; convert when it looks like cents.
+    const price = (raw >= 1000 && raw % 100 === 0) ? (raw / 100) : raw;
+    out.push({ id, name, price, priceRaw: raw });
   }
 
   // Try a few known layouts
@@ -307,7 +319,7 @@ async function getActiveItems() {
   const items = (Array.isArray(rawItems) ? rawItems : []).map((it) => ({
     id: String(it.id || '').trim(),
     name: String(it.name || '').trim(),
-    price: Number((it.price !== undefined ? it.price : it.priceCents) || 0) || 0,
+    price: (Number(it.price || 0) || ((Number(it.priceCents || 0) || 0) >= 1000 && (Number(it.priceCents||0)%100===0) ? (Number(it.priceCents||0)/100) : (Number(it.priceCents||0)||0)) || 0),
     active: true,
   })).filter(it => it.id && it.name);
   return items;
@@ -322,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) {
@@ -354,18 +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);
-  await db.sortedSetAdd(itemIndexKey(res.itemId), res.startMs, res.id);
-  // Global index for ACP listing
-  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) {
@@ -551,22 +564,28 @@ function verifyWebhook(req, secret) {
 
 // --- Rendering helpers ---
 function toEvent(res, item, requesterName, canSeeRequester) {
-  const start = DateTime.fromMillis(res.startMs).toISODate();
-  const end = DateTime.fromMillis(res.endMs).toISODate();
+  const start = DateTime.fromMillis(res.startMs).toISO();
+  const end = DateTime.fromMillis(res.endMs).toISO();
+
+  let icon = '⏳';
   let className = 'ec-status-pending';
-  if (res.status === 'approved_waiting_payment' || res.status === 'approved') { className = 'ec-status-approved'; }
-  if (res.status === 'paid_validated' || res.status === 'paid') { className = 'ec-status-paid'; }
-  if (res.status === 'rejected' || res.status === 'cancelled') { className = 'ec-status-cancelled'; }
-  const titleParts = [item ? item.name : res.itemId];
+  if (res.status === 'approved_waiting_payment') { icon = '💳'; className = 'ec-status-awaitpay'; }
+  if (res.status === 'paid_validated') { icon = '✅'; className = 'ec-status-valid'; }
+  if (res.status === 'rejected' || res.status === 'cancelled') { icon = '❌'; className = 'ec-status-cancel'; }
+
+  const titleParts = [icon, item ? item.name : res.itemId];
   if (canSeeRequester && requesterName) titleParts.push(`- ${requesterName}`);
   return {
     id: res.id,
     title: titleParts.join(' '),
     start,
     end,
-    allDay: true,
-    classNames: [className],
-    extendedProps: { status: res.status, itemId: res.itemId },
+    allDay: false,
+    className,
+    extendedProps: {
+      status: res.status,
+      itemId: res.itemId,
+    },
   };
 }
 
@@ -1175,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');
   }
 }
 
@@ -1464,3 +1497,32 @@ function startPaymentTimeoutScheduler() {
 }
 
 module.exports = plugin;
+
+
+async function handleGetReservation(req, res) {
+  if (!req.uid) return res.status(403).json({ error: 'not-logged-in' });
+  const rid = String(req.params.id || '');
+  const r = await db.getObject(resKey(rid));
+  if (!r || !r.id) return res.status(404).json({ error: 'not-found' });
+
+  const settings = await getSettings();
+  const isAdmin = await user.isAdminOrGlobalMod(req.uid);
+  const isOwner = String(r.uid) === String(req.uid);
+  const canSee = isAdmin || isOwner || String(settings.showRequesterToAll || '0') === '1';
+  if (!canSee) return res.status(403).json({ error: 'forbidden' });
+
+  res.json({
+    id: r.id,
+    bookingId: r.bookingId || '',
+    itemId: r.itemId,
+    itemName: r.itemName || '',
+    startMs: parseInt(r.startMs, 10) || 0,
+    endMs: parseInt(r.endMs, 10) || 0,
+    days: parseInt(r.days, 10) || 1,
+    status: r.status || 'pending',
+    total: Number(r.total || 0) || 0,
+    unitPrice: Number(r.unitPrice || 0) || 0,
+    notesUser: r.notesUser || '',
+    uid: r.uid,
+  });
+}

package/package.json

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

package/public/js/client.js

@@ -29,108 +29,32 @@ require(['jquery', 'bootstrap'], function ($, bootstrap) {
   }
 
   function updateTotalPrice() {
-    const sel = document.getElementById('ec-item-ids');
-    const out = document.getElementById('ec-total-price');
-    const daysEl = document.getElementById('ec-total-days');
-    if (!sel || !out) return;
-
-    let unitTotal = 0;
-    Array.from(sel.selectedOptions || []).forEach((opt) => {
-      const p = parseFloat(opt.getAttribute('data-price') || '0');
-      if (!Number.isNaN(p)) unitTotal += p;
-    });
-
-    const days = getReservationDays();
-    if (daysEl) daysEl.textContent = days + (days > 1 ? ' jours' : ' jour');
-
-    const finalTotal = unitTotal * days;
-    const txt = Number.isInteger(finalTotal) ? String(finalTotal) : finalTotal.toFixed(2);
-    out.textContent = txt + ' €';
-  }
-
-  function syncHiddenIsoFields() {
-    const s = document.getElementById('ec-start-date')?.value;
-    const e = document.getElementById('ec-end-date')?.value;
-    const startIsoEl = document.getElementById('ec-start-iso');
-    const endIsoEl = document.getElementById('ec-end-iso');
-    if (!s || !e || !startIsoEl || !endIsoEl) return;
-
-    // Start inclusive at 00:00Z; End exclusive = day after end date at 00:00Z
-    const startMs = parseDateInputToMs(s);
-    const endMsExclusive = parseDateInputToMs(e) + 24 * 60 * 60 * 1000;
-    startIsoEl.value = new Date(startMs).toISOString();
-    endIsoEl.value = new Date(endMsExclusive).toISOString();
-  }
-
-  function openModalWithRange(startMs, endMsExclusive) {
-    // Convert to date inputs: end date = endExclusive -1 day
-    const startDate = toIsoDateUTC(startMs);
-    const endDate = toIsoDateUTC(endMsExclusive - 24 * 60 * 60 * 1000);
-
-    const startEl = document.getElementById('ec-start-date');
-    const endEl = document.getElementById('ec-end-date');
-    if (startEl) startEl.value = startDate;
-    if (endEl) endEl.value = endDate;
-
-    syncHiddenIsoFields();
-    updateTotalPrice();
-
-    const modalEl = document.getElementById('ec-create-modal');
-    const BS = (bootstrap && bootstrap.Modal) ? bootstrap : (window.bootstrap && window.bootstrap.Modal ? window.bootstrap : null);
-    if (modalEl && BS && BS.Modal) {
-      BS.Modal.getOrCreateInstance(modalEl).show();
-    } else {
-      // Fallback: if bootstrap modal isn't available, scroll to form area
-      modalEl?.scrollIntoView({ behavior: 'smooth', block: 'center' });
-    }
-  }
-
-  function initCalendar() {
-    const calendarEl = document.getElementById('ec-calendar');
-    if (!calendarEl || !window.FullCalendar) return;
-
-    const canCreate = !!window.EC_CAN_CREATE;
-    const events = Array.isArray(window.EC_EVENTS) ? window.EC_EVENTS : [];
-
-    const calendar = new window.FullCalendar.Calendar(calendarEl, {
-      initialView: 'dayGridMonth',
-      locale: 'fr',
-      headerToolbar: { left: 'prev,next today', center: 'title', right: 'dayGridMonth,dayGridWeek,listMonth,listWeek' },
-      selectable: canCreate,
-      selectMirror: true,
-      events,
-      dateClick: function (info) {
-        if (!canCreate) return;
-        const startMs = Date.UTC(info.date.getUTCFullYear(), info.date.getUTCMonth(), info.date.getUTCDate());
-        const endMs = startMs + 24 * 60 * 60 * 1000;
-        console.debug('[equipment-calendar] open modal', { startMs, endMs });
-        openModalWithRange(startMs, endMs);
-      },
-      select: function (info) {
-        if (!canCreate) return;
-        const startMs = Date.UTC(info.start.getUTCFullYear(), info.start.getUTCMonth(), info.start.getUTCDate());
-        const endMs = Date.UTC(info.end.getUTCFullYear(), info.end.getUTCMonth(), info.end.getUTCDate());
-        console.debug('[equipment-calendar] open modal', { startMs, endMs });
-        openModalWithRange(startMs, endMs);
-      },
-    });
-
-    calendar.render();
-
-    document.getElementById('ec-item-ids')?.addEventListener('change', updateTotalPrice);
-    document.getElementById('ec-start-date')?.addEventListener('change', function () {
-      syncHiddenIsoFields();
-      updateTotalPrice();
-    });
-    document.getElementById('ec-end-date')?.addEventListener('change', function () {
-      syncHiddenIsoFields();
-      updateTotalPrice();
-    });
-
-    updateTotalPrice();
-  }
-
-  $(window).off('action:ajaxify.end.ec').on('action:ajaxify.end.ec', initCalendar);
-  $(initCalendar);
-})();
+    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 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 || []);
+      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;
+      const txt = Number.isInteger(total) ? String(total) : total.toFixed(2);
+      out.textContent = txt + ' €';
+    } catch (e) {}
+  })();
 });

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

@@ -43,7 +43,7 @@
               <label class="form-label">Matériel</label>
               <select class="form-select" id="ec-item-ids" name="itemIds" multiple required>
         <!-- BEGIN items -->
-        <option value="{items.id}" data-price="{items.price}">{items.name} — {items.price} €</option>
+        <option value="{items.id}" data-price="{items.price}">{items.name}</option>
         <!-- END items -->
 </select>
               <div class="form-text">Tu peux sélectionner plusieurs matériels.</div>
@@ -82,12 +82,3 @@
   window.EC_CAN_CREATE = {canCreateJs};
   window.EC_TZ = '{tz}';
 </script>
-
-<style>
-/* Event styling */
-.fc .fc-event-title { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
-.fc-event.ec-status-pending { background: rgba(108,117,125,.18); border-color: rgba(108,117,125,.45); }
-.fc-event.ec-status-approved { background: rgba(13,110,253,.18); border-color: rgba(13,110,253,.45); }
-.fc-event.ec-status-paid { background: rgba(25,135,84,.18); border-color: rgba(25,135,84,.45); }
-.fc-event.ec-status-cancelled { background: rgba(220,53,69,.10); border-color: rgba(220,53,69,.35); opacity:.65; text-decoration: line-through; }
-</style>