nodebb-plugin-equipment-calendar 1.1.0 → 2.0.1

package/library.js

@@ -27,12 +27,12 @@ const DEFAULT_SETTINGS = {
   creatorGroups: 'registered-users',
   approverGroup: 'administrators',
   notifyGroup: 'administrators',
-  // JSON array of items: [{ "id": "cam1", "name": "Caméra A", "price": 5000, "location": "Stock A", "active": true }]
+  // JSON array of items: [{ "id": "cam1", "name": "Caméra A", "priceCents": 5000, "location": "Stock A", "active": true }]
   itemsJson: '[]',
-  
+  itemsSource: 'manual',
   ha_itemsFormType: '',
   ha_itemsFormSlug: '',
-  
+  ha_locationMapJson: '{}',
   ha_calendarItemNamePrefix: 'Location matériel',
   paymentTimeoutMinutes: 10,
   // HelloAsso
@@ -49,11 +49,18 @@ const DEFAULT_SETTINGS = {
 };
 
 
+function parseLocationMap(locationMapJson) {
+  try {
+    const obj = JSON.parse(locationMapJson || '{}');
+    return (obj && typeof obj === 'object') ? obj : {};
+  } catch (e) {
+    return {};
+  }
+}
 
 let haTokenCache = null; // { accessToken, refreshToken, expMs }
 
-async function getHelloAssoAccessToken(settings,
-    saved, opts = {}) {
+async function getHelloAssoAccessToken(settings, opts = {}) {
   const now = Date.now();
   if (!opts.force && haTokenCache && haTokenCache.accessToken && haTokenCache.expMs && now < haTokenCache.expMs - 30_000) {
     return haTokenCache.accessToken;
@@ -114,8 +121,7 @@ async function getHelloAssoAccessToken(settings,
 }
 
 
-async function createHelloAssoCheckoutIntent(settings,
-    saved, bookingId, reservations) {
+async function createHelloAssoCheckoutIntent(settings, bookingId, reservations) {
   const org = String(settings.ha_organizationSlug || '').trim();
   if (!org) throw new Error('HelloAsso organization slug missing');
 
@@ -129,11 +135,9 @@ async function createHelloAssoCheckoutIntent(settings,
   items.forEach(i => { byId[i.id] = i; });
 
   const names = reservations.map(r => (byId[r.itemId] && byId[r.itemId].name) || r.itemId);
-  const days = reservations.length ? Math.max(1, Math.round((reservations[0].endMs - reservations[0].startMs) / (24*60*60*1000))) : 1;
   const totalAmount = reservations.reduce((sum, r) => {
-    const priceEuro = (byId[r.itemId] && parseFloat(byId[r.itemId].price)) || 0;
-    const priceCents = Math.round((Number.isFinite(priceEuro) ? priceEuro : 0) * 100);
-    return sum + (priceCents * days);
+    const price = (byId[r.itemId] && parseInt(byId[r.itemId].priceCents, 10)) || 0;
+    return sum + (Number.isFinite(price) ? price : 0);
   }, 0);
 
   if (!totalAmount || totalAmount <= 0) {
@@ -176,8 +180,7 @@ async function createHelloAssoCheckoutIntent(settings,
   return await resp.json();
 }
 
-async function fetchHelloAssoCheckoutIntent(settings,
-    saved, checkoutIntentId) {
+async function fetchHelloAssoCheckoutIntent(settings, checkoutIntentId) {
   const org = String(settings.ha_organizationSlug || '').trim();
   const token = await getHelloAssoAccessToken(settings);
   const url = `https://api.helloasso.com/v5/organizations/${encodeURIComponent(org)}/checkout-intents/${encodeURIComponent(checkoutIntentId)}`;
@@ -245,8 +248,8 @@ async function fetchHelloAssoItems(settings) {
     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 price = (typeof amount === 'number' ? amount : parseInt(amount, 10)) || 0;
-    out.push({ id, name, price: String(price), location: '' });
+    const priceCents = (typeof amount === 'number' ? amount : parseInt(amount, 10)) || 0;
+    out.push({ id, name, priceCents: String(priceCents), location: '' });
   }
 
   // Try a few known layouts
@@ -280,14 +283,12 @@ async function fetchHelloAssoItems(settings) {
 async function getActiveItems() {
   const settings = await getSettings();
   const rawItems = await fetchHelloAssoItems(settings);
-  // Normalize
   const items = (Array.isArray(rawItems) ? rawItems : []).map((it) => ({
     id: String(it.id || '').trim(),
     name: String(it.name || '').trim(),
     price: String(it.price || '0').trim(),
     active: true,
   })).filter(it => it.id && it.name);
-
   return items;
 }
 
@@ -480,15 +481,14 @@ async function helloAssoGetAccessToken(settings) {
   return resp.data.access_token;
 }
 
-async function helloAssoCreateCheckout(settings,
-    saved, token, reservation, item) {
+async function helloAssoCreateCheckout(settings, token, reservation, item) {
   // Minimal: create a checkout intent and return redirectUrl
   // This endpoint/payload may need adaptation depending on your HelloAsso setup.
   const org = settings.ha_organizationSlug;
   if (!org) throw new Error('HelloAsso organizationSlug missing');
 
   const url = `https://api.helloasso.com/v5/organizations/${encodeURIComponent(org)}/checkout-intents`;
-  const amountCents = Math.max(0, Number(item.price || 0));
+  const amountCents = Math.max(0, Number(item.priceCents || 0));
 
   const payload = {
     totalAmount: amountCents,
@@ -673,7 +673,6 @@ async function renderAdminReservationsPage(req, res) {
   if (!(await ensureIsAdmin(req, res))) return;
 
   const settings = await getSettings();
-  const saved = false;
   const items = await getActiveItems(settings);
   const itemById = {};
   items.forEach(it => { itemById[it.id] = it; });
@@ -740,7 +739,6 @@ async function renderAdminReservationsPage(req, res) {
   res.render('admin/plugins/equipment-calendar-reservations', {
     title: 'Equipment Calendar - Réservations',
     settings,
-    saved,
     rows: pageRows,
     hasRows: pageRows.length > 0,
     itemOptions: itemOptions.map(o => ({ ...o, selected: o.id === itemId })),
@@ -812,8 +810,7 @@ async function handleHelloAssoTest(req, res) {
     const clear = String(req.query.clear || '') === '1';
     // force=1 skips in-memory cache and refresh_token; clear=1 wipes stored refresh token
     haTokenCache = null;
-    await getHelloAssoAccessToken(settings,
-{ force, clearStored: clear });
+    await getHelloAssoAccessToken(settings, { force, clearStored: clear });
     const items = await fetchHelloAssoItems(settings);
     const list = Array.isArray(items) ? items : (Array.isArray(items.data) ? items.data : []);
     count = list.length;
@@ -836,7 +833,7 @@ async function handleHelloAssoTest(req, res) {
     message,
     count,
     settings,
-sampleItems,
+    sampleItems,
     hasSampleItems,
     hasSampleItems: sampleItems && sampleItems.length > 0,
   });
@@ -844,11 +841,9 @@ sampleItems,
 
 async function renderAdminPage(req, res) {
   const settings = await getSettings();
-  const saved = String(req.query.saved || '') === '1';
   res.render('admin/plugins/equipment-calendar', {
     title: 'Equipment Calendar',
     settings,
-    saved,
     saved: req.query && String(req.query.saved || '') === '1',
     purged: req.query && parseInt(req.query.purged, 10) || 0,
     view_dayGridMonth: (settings.defaultView || 'dayGridMonth') === 'dayGridMonth',
@@ -873,8 +868,7 @@ async function handleHelloAssoCallback(req, res) {
 
   try {
     if (!checkoutIntentId) throw new Error('checkoutIntentId manquant');
-    const checkout = await fetchHelloAssoCheckoutIntent(settings,
-    saved, checkoutIntentId);
+    const checkout = await fetchHelloAssoCheckoutIntent(settings, checkoutIntentId);
 
     const paid = isCheckoutPaid(checkout);
     if (paid) {
@@ -1124,8 +1118,7 @@ async function renderApprovalsPage(req, res) {
 
 // --- Actions ---
 
-async function createReservationForItem(req, res, settings,
-    saved, itemId, startMs, endMs, notesUser, bookingId) {
+async function createReservationForItem(req, res, settings, itemId, startMs, endMs, notesUser, bookingId) {
   const items = await getActiveItems(settings);
   const item = items.find(i => i.id === itemId);
   if (!item) {
@@ -1165,64 +1158,47 @@ async function handleCreateReservation(req, res) {
       return helpers.notAllowed(req, res);
     }
 
-    const items = await getActiveItems(settings);
-    const itemIdsRaw = String(req.body.itemIds || req.body.itemId || '').trim();
-  const itemIds = itemIdsRaw.split(',').map(s => s.trim()).filter(Boolean);
-  if (!itemIds.length) {
-    req.flash('error', 'Veuillez sélectionner au moins un matériel.');
-    return res.redirect('/equipment/calendar');
-  }
-    const item = items.find(i => i.id === itemId);
-    if (!item) return res.status(400).send('Invalid item');
+    const itemIdsRaw = req.body.itemIds || req.body.itemId || '';
+    const itemIds = (Array.isArray(itemIdsRaw) ? itemIdsRaw : String(itemIdsRaw))
+      .split(',')
+      .map(s => String(s).trim())
+      .filter(Boolean);
+
+    if (!itemIds.length) {
+      return res.status(400).send('itemIds 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 startMs = start.toMillis();
-    const endMs = end.toMillis();
-
-    if (endMs <= startMs) return res.status(400).send('End must be after start');
-    if (end.diff(start, 'days').days > 31) return res.status(400).send('Range too large');
 
-    // Overlap
-    if (await hasOverlap(itemId, startMs, endMs)) {
-      return res.status(409).send('Overlap');
+    // 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 reservation = {
-      id: uuidv4(),
-      itemId,
-      uid: req.uid,
-      startMs,
-      endMs,
-      status: 'pending',
-      createdAtMs: Date.now(),
-      updatedAtMs: Date.now(),
-      validatorUid: 0,
-      notesUser: String(req.body.notesUser || '').slice(0, 2000),
-      notesAdmin: '',
-      ha_checkoutIntentId: '',
-      ha_paymentUrl: '',
-      ha_paymentStatus: '',
-      ha_paidAtMs: 0,
-    };
+    const startMs = startDay.toMillis();
+    const endMs = endDay.toMillis();
 
-    await saveReservation(reservation);
+    const notesUser = String(req.body.notesUser || '').trim();
 
-    // Notify group
-    const link = `/equipment/approvals`;
-    await sendGroupNotificationAndEmail(
-      settings.notifyGroup || settings.approverGroup,
-      'Nouvelle demande de réservation',
-      `Une demande de réservation est en attente (matériel: ${item.name}).`,
-      link
-    );
+    const bookingId = `${req.uid}:${Date.now()}:${Math.random().toString(36).slice(2, 8)}`;
 
-    return res.redirect(`/equipment/calendar?itemId=${encodeURIComponent(itemId)}`);
-  } catch (e) {
-    return res.status(500).send(e.message || 'error');
+    // 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);
+    }
+
+    // Redirect to calendar with a success flag
+    return res.redirect('/equipment/calendar?requested=1');
+  } catch (err) {
+    winston.error(err);
+    return res.status(500).send(err.message || 'Error');
   }
 }
 
@@ -1250,8 +1226,7 @@ async function handleApproveReservation(req, res) {
         return res.status(400).send('HelloAsso not configured');
       }
       const token = await helloAssoGetAccessToken(settings);
-      const checkout = await helloAssoCreateCheckout(settings,
-    saved, token, reservation, item);
+      const checkout = await helloAssoCreateCheckout(settings, token, reservation, item);
       reservation.ha_checkoutIntentId = checkout.checkoutIntentId;
       reservation.ha_paymentUrl = checkout.paymentUrl;
     }
@@ -1402,7 +1377,7 @@ async function handleAdminSave(req, res) {
       itemsJson: '[]',
       ha_itemsFormType: String(req.body.ha_itemsFormType || DEFAULT_SETTINGS.ha_itemsFormType),
       ha_itemsFormSlug: String(req.body.ha_itemsFormSlug || DEFAULT_SETTINGS.ha_itemsFormSlug),
-      
+      ha_locationMapJson: String(req.body.ha_locationMapJson || DEFAULT_SETTINGS.ha_locationMapJson),
       ha_clientId: String(req.body.ha_clientId || ''),
       ha_clientSecret: String(req.body.ha_clientSecret || ''),
       ha_organizationSlug: String(req.body.ha_organizationSlug || ''),
@@ -1412,8 +1387,7 @@ async function handleAdminSave(req, res) {
       timezone: String(req.body.timezone || DEFAULT_SETTINGS.timezone),
       paymentTimeoutMinutes: String(req.body.paymentTimeoutMinutes || DEFAULT_SETTINGS.paymentTimeoutMinutes),
       showRequesterToAll: (req.body.showRequesterToAll === '1' || req.body.showRequesterToAll === 'on') ? '1' : '0',
-    
-      ha_apiBaseUrl: String(req.body.ha_apiBaseUrl || DEFAULT_SETTINGS.ha_apiBaseUrl),};
+    };
 
     await meta.settings.set(SETTINGS_KEY, values);
     return res.redirect('/admin/plugins/equipment-calendar?saved=1');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "1.1.0",
+  "version": "2.0.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": "0.6.8",
+  "version": "0.7.1",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -1,139 +1,128 @@
+require(['jquery'], function ($) {
 'use strict';
-
-/* global define, require */
+/* global window, document, FullCalendar */
 
 (function () {
-  // NodeBB client environment: use requirejs to fetch jQuery safely
-  function init() {
-    require(['jquery'], function ($) {
-      // If this page isn't the equipment calendar page, do nothing
-      const calendarEl = document.getElementById('ec-calendar');
-      if (!calendarEl) return;
-
-      // Expose helpers globally (some inline scripts might call them)
-      window.getReservationDays = window.getReservationDays || function () { return 1; };
-      window.updateTotalPrice = window.updateTotalPrice || function () {};
-
-      function toUtcMidnightMs(dateObj) {
-        return Date.UTC(dateObj.getUTCFullYear(), dateObj.getUTCMonth(), dateObj.getUTCDate());
-      }
-      function formatDateInputValue(dateObj) {
-        const y = dateObj.getUTCFullYear();
-        const m = String(dateObj.getUTCMonth() + 1).padStart(2, '0');
-        const d = String(dateObj.getUTCDate()).padStart(2, '0');
-        return `${y}-${m}-${d}`;
-      }
-
-      function getReservationDays() {
-        const startMs = parseInt(document.getElementById('ec-start-ms')?.value || '0', 10);
-        const endMs = parseInt(document.getElementById('ec-end-ms')?.value || '0', 10);
-        if (!startMs || !endMs || endMs <= startMs) return 1;
-        const days = Math.round((endMs - startMs) / (24 * 60 * 60 * 1000));
-        return days > 0 ? days : 1;
-      }
-      window.getReservationDays = getReservationDays;
-
-      function updateTotalPrice() {
-        try {
-          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();
-          const finalTotal = unitTotal * days;
-          if (daysEl) {
-            daysEl.textContent = days + (days > 1 ? ' jours' : ' jour');
-          }
-          const txt = Number.isInteger(finalTotal) ? String(finalTotal) : finalTotal.toFixed(2);
-          out.textContent = txt + ' €';
-        } catch (e) {}
-      }
-      window.updateTotalPrice = updateTotalPrice;
-
-      function openCreateModal(startMs, endMs) {
-        const startDateEl = document.getElementById('ec-start-date');
-        const endDateEl = document.getElementById('ec-end-date');
-        const startMsEl = document.getElementById('ec-start-ms');
-        const endMsEl = document.getElementById('ec-end-ms');
-
-        if (startMsEl) startMsEl.value = String(startMs);
-        if (endMsEl) endMsEl.value = String(endMs);
-
-        if (startDateEl) startDateEl.value = formatDateInputValue(new Date(startMs));
-        if (endDateEl) endDateEl.value = formatDateInputValue(new Date(endMs - 24 * 60 * 60 * 1000));
-
-        updateTotalPrice();
-
-        const modalEl = document.getElementById('ec-create-modal');
-        if (modalEl && window.bootstrap && window.bootstrap.Modal) {
-          const modal = window.bootstrap.Modal.getOrCreateInstance(modalEl);
-          modal.show();
-        }
-      }
-
-      function syncDatesToMs() {
-        try {
-          const s = document.getElementById('ec-start-date')?.value;
-          const e = document.getElementById('ec-end-date')?.value;
-          if (!s || !e) return;
-
-          const sd = new Date(s + 'T00:00:00Z');
-          const ed = new Date(e + 'T00:00:00Z');
-
-          const startMs = toUtcMidnightMs(sd);
-          let endMs = toUtcMidnightMs(ed) + 24 * 60 * 60 * 1000;
-          if (endMs <= startMs) endMs = startMs + 24 * 60 * 60 * 1000;
-
-          const startMsEl = document.getElementById('ec-start-ms');
-          const endMsEl = document.getElementById('ec-end-ms');
-          if (startMsEl) startMsEl.value = String(startMs);
-          if (endMsEl) endMsEl.value = String(endMs);
-
-          updateTotalPrice();
-        } catch (e) {}
-      }
-
-      // Bind change events (no jQuery needed, but we already have it)
-      $('#ec-item-ids').off('change.ec').on('change.ec', updateTotalPrice);
-      $('#ec-start-date').off('change.ec').on('change.ec', syncDatesToMs);
-      $('#ec-end-date').off('change.ec').on('change.ec', syncDatesToMs);
-
-      // FullCalendar init
-      if (window.FullCalendar) {
-        const eventsJsonEl = document.getElementById('ec-events-json');
-        let events = [];
-        try {
-          events = eventsJsonEl ? JSON.parse(eventsJsonEl.textContent || '[]') : [];
-        } catch (e) { events = []; }
-
-        const calendar = new window.FullCalendar.Calendar(calendarEl, {
-          initialView: 'dayGridMonth',
-          selectable: true,
-          selectMirror: true,
-          events,
-          select: function (info) {
-            const startMs = toUtcMidnightMs(info.start);
-            const endMs = toUtcMidnightMs(info.end);
-            openCreateModal(startMs, endMs);
-          },
-          dateClick: function (info) {
-            const startMs = toUtcMidnightMs(info.date);
-            const endMs = startMs + 24 * 60 * 60 * 1000;
-            openCreateModal(startMs, endMs);
-          },
-        });
-        calendar.render();
-      }
+  function toIsoDateUTC(ms) {
+    const d = new Date(ms);
+    const y = d.getUTCFullYear();
+    const m = String(d.getUTCMonth() + 1).padStart(2, '0');
+    const day = String(d.getUTCDate()).padStart(2, '0');
+    return `${y}-${m}-${day}`;
+  }
+
+  function parseDateInputToMs(value) {
+    // value is YYYY-MM-DD
+    if (!value) return 0;
+    const d = new Date(value + 'T00:00:00Z');
+    return Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate());
+  }
+
+  function getReservationDays() {
+    const startVal = document.getElementById('ec-start-date')?.value;
+    const endVal = document.getElementById('ec-end-date')?.value;
+    const startMs = parseDateInputToMs(startVal);
+    const endMs = parseDateInputToMs(endVal);
+    if (!startMs || !endMs) return 1;
+    const days = Math.round((endMs - startMs) / (24 * 60 * 60 * 1000)) + 1;
+    return days > 0 ? days : 1;
+  }
+
+  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');
+    if (modalEl && window.bootstrap && window.bootstrap.Modal) {
+      window.bootstrap.Modal.getOrCreateInstance(modalEl).show();
+    }
+  }
+
+  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',
+      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;
+        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());
+        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', init);
-  $(init);
+  $(window).off('action:ajaxify.end.ec').on('action:ajaxify.end.ec', initCalendar);
+  $(initCalendar);
 })();
+});

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

@@ -13,72 +13,57 @@
 
     <div class="card card-body mb-3">
       <h5>Permissions</h5>
-
       <div class="mb-3">
         <label class="form-label">Groupes autorisés à créer une demande (creatorGroups)</label>
         <input class="form-control" type="text" name="creatorGroups" value="{settings.creatorGroups}">
-        <div class="form-text">Nom(s) de groupes NodeBB. Pour plusieurs groupes, sépare par des virgules. Ex: <code>registered-users, members</code></div>
       </div>
-
       <div class="mb-3">
         <label class="form-label">Groupe valideur (approverGroup)</label>
         <input class="form-control" type="text" name="approverGroup" value="{settings.approverGroup}">
-        <div class="form-text">Les membres de ce groupe voient /equipment/approvals et peuvent valider/refuser.</div>
       </div>
-
       <div class="mb-0">
         <label class="form-label">Groupe notifié (notifyGroup)</label>
         <input class="form-control" type="text" name="notifyGroup" value="{settings.notifyGroup}">
-        <div class="form-text">Envoi d’un email/notification au groupe lors d’une nouvelle demande.</div>
       </div>
     </div>
 
-    
     <div class="card card-body mb-3">
       <h5>Paiement</h5>
       <div class="mb-0">
         <label class="form-label">Timeout paiement (minutes)</label>
         <input class="form-control" type="number" min="1" name="paymentTimeoutMinutes" value="{settings.paymentTimeoutMinutes}">
-        <div class="form-text">Après validation, si le paiement n’est pas confirmé dans ce délai, la réservation est annulée et le matériel est débloqué.</div>
       </div>
     </div>
 
-<div class="card card-body mb-3">
+    <div class="card card-body mb-3">
       <h5>HelloAsso</h5>
-
       <div class="mb-3">
         <label class="form-label">API Base URL (prod/sandbox)</label>
         <input class="form-control" type="text" name="ha_apiBaseUrl" value="{settings.ha_apiBaseUrl}">
-        <div class="form-text">Production: <code>https://api.helloasso.com</code> — Sandbox: <code>https://api.helloasso-sandbox.com</code></div>
+        <div class="form-text">Prod: <code>https://api.helloasso.com</code> — Sandbox: <code>https://api.helloasso-sandbox.com</code></div>
       </div>
-
       <div class="mb-3">
         <label class="form-label">Organization slug</label>
         <input class="form-control" type="text" name="ha_organizationSlug" value="{settings.ha_organizationSlug}">
       </div>
-
       <div class="mb-3">
         <label class="form-label">Client ID</label>
         <input class="form-control" type="text" name="ha_clientId" value="{settings.ha_clientId}">
       </div>
-
       <div class="mb-3">
         <label class="form-label">Client Secret</label>
         <input class="form-control" type="password" name="ha_clientSecret" value="{settings.ha_clientSecret}">
       </div>
-
       <div class="row g-3">
         <div class="col-md-6">
           <label class="form-label">Form Type</label>
           <input class="form-control" type="text" name="ha_itemsFormType" value="{settings.ha_itemsFormType}" placeholder="shop">
-          <div class="form-text">Ex: <code>shop</code></div>
         </div>
         <div class="col-md-6">
           <label class="form-label">Form Slug</label>
           <input class="form-control" type="text" name="ha_itemsFormSlug" value="{settings.ha_itemsFormSlug}" placeholder="locations-materiel-2026">
         </div>
       </div>
-
       <div class="mb-0 mt-3">
         <label class="form-label">Préfixe itemName (checkout)</label>
         <input class="form-control" type="text" name="ha_calendarItemNamePrefix" value="{settings.ha_calendarItemNamePrefix}">

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

@@ -9,24 +9,24 @@
   <div class="alert alert-info">Tu peux consulter le calendrier, mais tu n’as pas les droits pour créer une demande.</div>
   {{{ end }}}
 
-  <div class="card card-body">
-    <div id="equipment-calendar"></div>
+  <div class="card card-body mb-3">
+    <div id="ec-calendar"></div>
   </div>
 
-  <!-- Modal création -->
+  <!-- Modal de demande -->
   <div class="modal fade" id="ec-create-modal" tabindex="-1" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered">
       <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title">Nouvelle demande</h5>
-          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-        </div>
-
         <form id="ec-create-form" method="post" action="{relative_path}/equipment/reservations/create">
+          <div class="modal-header">
+            <h5 class="modal-title">Demande de réservation</h5>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+          </div>
+
           <div class="modal-body">
             <input type="hidden" name="_csrf" value="{config.csrf_token}">
-            <input type="hidden" id="ec-start-ms" name="startMs" value="0">
-            <input type="hidden" id="ec-end-ms" name="endMs" value="0">
+            <input type="hidden" id="ec-start-iso" name="start" value="">
+            <input type="hidden" id="ec-end-iso" name="end" value="">
 
             <div class="row g-3 mb-3">
               <div class="col-6">
@@ -41,26 +41,30 @@
 
             <div class="mb-3">
               <label class="form-label">Matériel</label>
-              <select class="form-select" id="ec-item-ids" name="itemIds" multiple required></select>
+              <select class="form-select" id="ec-item-ids" name="itemIds" multiple required>
+                {{{ each items }}}
+                <option value="{@value.id}" data-price="{@value.price}">{@value.name} — {@value.price} €</option>
+                {{{ end }}}
+              </select>
               <div class="form-text">Tu peux sélectionner plusieurs matériels.</div>
             </div>
 
             <div class="mb-3">
+              <label class="form-label">Notes</label>
+              <textarea class="form-control" name="notesUser" rows="3" placeholder="Infos utiles..."></textarea>
+            </div>
+
+            <div class="mb-0">
               <div class="fw-semibold">Durée</div>
               <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>
-
-            <div class="mb-0">
-              <label class="form-label">Note</label>
-              <textarea class="form-control" name="notesUser" rows="3" placeholder="Optionnel"></textarea>
-            </div>
           </div>
 
           <div class="modal-footer">
-            <button type="button" class="btn btn-light" data-bs-dismiss="modal">Annuler</button>
+            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Annuler</button>
             <button type="submit" class="btn btn-primary">Envoyer la demande</button>
           </div>
         </form>
@@ -70,13 +74,11 @@
 </div>
 
 <script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.19/index.global.min.js"></script>
-<script src="/plugins/nodebb-plugin-equipment-calendar/js/client.js"></script>
+<script src="{relative_path}/plugins/nodebb-plugin-equipment-calendar/js/client.js"></script>
 
 <script>
   window.EC_EVENTS = JSON.parse(atob('{eventsB64}'));
   window.EC_BLOCKS = JSON.parse(atob('{blocksB64}'));
-  window.EC_ITEMS = JSON.parse(atob('{itemsB64}'));
-  window.EC_INITIAL_DATE = "{initialDateISO}";
-  window.EC_TZ = "{tz}";
   window.EC_CAN_CREATE = {canCreateJs};
+  window.EC_TZ = '{tz}';
 </script>