nodebb-plugin-equipment-calendar 1.0.7 → 2.0.0

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,
@@ -583,9 +583,8 @@ plugin.init = async function (params) {
     router.post('/admin/plugins/equipment-calendar/reservations/:rid/delete', middleware.applyCSRF, handleAdminDelete);
   }
 
-  // Public route
-    router.get('/calendar', middleware.buildHeader, renderCalendarPage);
-    router.get('/api/calendar', middleware.buildHeader, renderCalendarPage);
+  // Convenience alias (optional): /calendar -> /equipment/calendar
+  router.get('/calendar', (req, res) => res.redirect('/equipment/calendar'));
 
 
   // To verify webhook signature we need raw body; add a rawBody collector for this route only
@@ -674,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; });
@@ -741,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 })),
@@ -813,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;
@@ -837,7 +833,7 @@ async function handleHelloAssoTest(req, res) {
     message,
     count,
     settings,
-sampleItems,
+    sampleItems,
     hasSampleItems,
     hasSampleItems: sampleItems && sampleItems.length > 0,
   });
@@ -845,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',
@@ -874,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) {
@@ -1125,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) {
@@ -1170,8 +1162,7 @@ async function handleCreateReservation(req, res) {
     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');
+    return res.status(400).send('itemId required');
   }
     const item = items.find(i => i.id === itemId);
     if (!item) return res.status(400).send('Invalid item');
@@ -1251,8 +1242,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;
     }
@@ -1403,7 +1393,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 || ''),
@@ -1413,8 +1403,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.0.7",
+  "version": "2.0.0",
   "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.7",
+  "version": "0.7.0",
   "minver": "4.7.1"
 }

package/public/js/admin.js

@@ -6,10 +6,10 @@ define('admin/plugins/equipment-calendar', ['jquery', 'settings', 'alerts'], fun
   const Admin = {};
 
   Admin.init = function () {
-    const $container = /*$removed*/('.equipment-calendar-settings');
+    const $container = $('.equipment-calendar-settings');
     Settings.load('equipmentCalendar', $container);
 
-    /*$removed*/('#save').on('click', function () {
+    $('#save').on('click', function () {
       Settings.save('equipmentCalendar', $container, function () {
         alerts.success('Sauvegardé');
       });

package/public/js/client.js

@@ -1,145 +1,179 @@
+require(['jquery'], function ($) {
 'use strict';
+/* global window, document, FullCalendar, bootbox */
 
 (function () {
-  // Expose as globals for templates that might call them
-  window.updateTotalPrice = window.updateTotalPrice || function () {};
-  window.getReservationDays = window.getReservationDays || function () { return 1; };
-
-  function toUtcMidnightMs(dateObj) {
-    return Date.UTC(dateObj.getUTCFullYear(), dateObj.getUTCMonth(), dateObj.getUTCDate());
+  function overlaps(aStartMs, aEndMs, bStartMs, bEndMs) {
+    return aStartMs < bEndMs && aEndMs > bStartMs;
   }
 
-  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 fmt(dt) {
+    try {
+      return new Intl.DateTimeFormat('fr-FR', { dateStyle: 'full', timeStyle: 'short' }).format(dt);
+    } catch (e) {
+      return dt.toISOString();
+    }
   }
 
-  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 buildAvailability(startMs, endMs) {
+    const blocks = Array.isArray(window.EC_BLOCKS) ? window.EC_BLOCKS : [];
+    const items = Array.isArray(window.EC_ITEMS) ? window.EC_ITEMS : [];
 
-  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 blockedByItem = {};
+    for (const b of blocks) {
+      if (!blockedByItem[b.itemId]) blockedByItem[b.itemId] = [];
+      blockedByItem[b.itemId].push(b);
+    }
 
-      const txt = Number.isInteger(finalTotal) ? String(finalTotal) : finalTotal.toFixed(2);
-      out.textContent = txt + ' €';
-    } catch (e) {}
+    const available = [];
+    for (const it of items) {
+      const bks = blockedByItem[it.id] || [];
+      const hasOverlap = bks.some(b => overlaps(startMs, endMs, Number(b.startMs), Number(b.endMs)));
+      if (!hasOverlap) available.push(it);
+    }
+    return available;
   }
-  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);
+  function submitReservation(startISO, endISO, itemId, notes) {
+    const form = document.getElementById('ec-create-form');
+    if (!form) return;
 
-    if (startDateEl) startDateEl.value = formatDateInputValue(new Date(startMs));
-    if (endDateEl) endDateEl.value = formatDateInputValue(new Date(endMs - 24 * 60 * 60 * 1000));
+    const startInput = form.querySelector('input[name="start"]');
+    const endInput = form.querySelector('input[name="end"]');
+    const itemInput = form.querySelector('input[name="itemIds"]');
+    const notesInput = form.querySelector('input[name="notesUser"]');
 
-    updateTotalPrice();
+    if (startInput) startInput.value = startISO;
+    if (endInput) endInput.value = endISO;
+    if (itemInput) itemInput.value = itemId;
+    if (notesInput) notesInput.value = notes || '';
 
-    const modalEl = document.getElementById('ec-create-modal');
-    if (modalEl && window.bootstrap && window.bootstrap.Modal) {
-      const modal = window.bootstrap.Modal.getOrCreateInstance(modalEl);
-      modal.show();
-    }
+    form.submit();
   }
 
-  function syncDatesToMs() {
-    try {
-      const s = document.getElementById('ec-start-date')?.value;
-      const e = document.getElementById('ec-end-date')?.value;
-      if (!s || !e) return;
+  function openNodeBBModal(startISO, endISO) {
+    const startDate = new Date(startISO);
+    const endDate = new Date(endISO);
+    const startMs = startDate.getTime();
+    const endMs = endDate.getTime();
 
-      const sd = new Date(s + 'T00:00:00Z');
-      const ed = new Date(e + 'T00:00:00Z');
+    const available = buildAvailability(startMs, endMs);
+
+    if (!available.length) {
+      if (typeof bootbox !== 'undefined') {
+        bootbox.alert('Aucun matériel n’est disponible sur cette plage.');
+      } else {
+        alert('Aucun matériel n’est disponible sur cette plage.');
+      }
+      return;
+    }
 
-      const startMs = toUtcMidnightMs(sd);
-      let endMs = toUtcMidnightMs(ed) + 24 * 60 * 60 * 1000;
-      if (endMs <= startMs) endMs = startMs + 24 * 60 * 60 * 1000;
+    // Build modal HTML
+    let optionsHtml = '';
+    for (const it of available) {
+      const label = it.location ? `${it.name} — ${it.location}` : it.name;
+      optionsHtml += `<option value="${it.id}">${label}</option>`;
+    }
 
-      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);
+    const body = `
+      <div class="mb-3">
+        <label class="form-label">Début</label>
+        <input class="form-control" type="text" value="${fmt(startDate)}" readonly>
+      </div>
+      <div class="mb-3">
+        <label class="form-label">Fin</label>
+        <input class="form-control" type="text" value="${fmt(endDate)}" readonly>
+      </div>
+      <div class="mb-3">
+        <label class="form-label">Matériel (Ctrl/Cmd pour multi-sélection)</label>
+        <select class="form-select" id="ec-modal-item" multiple size="6">
+          ${optionsHtml}
+        </select>
+      </div>
+      <div class="mb-3">
+        <label class="form-label">Note (optionnel)</label>
+        <input class="form-control" type="text" id="ec-modal-notes" maxlength="2000" placeholder="Ex: besoin de trépied, etc.">
+      </div>
+    `;
+
+    if (typeof bootbox === 'undefined') {
+      // Fallback without bootbox (should be rare on NodeBB pages)
+      const itemId = available[0].id;
+      submitReservation(startDate.toISOString(), endDate.toISOString(), itemId, '');
+      return;
+    }
 
-      updateTotalPrice();
-    } catch (e) {}
+    bootbox.dialog({
+      title: 'Demande de réservation',
+      message: body,
+      buttons: {
+        cancel: {
+          label: 'Annuler',
+          className: 'btn-outline-secondary',
+        },
+        ok: {
+          label: 'Envoyer la demande',
+          className: 'btn-primary',
+          callback: function () {
+            const itemEl = document.getElementById('ec-modal-item');
+            const notesEl = document.getElementById('ec-modal-notes');
+            let ids = [];
+            if (itemEl && itemEl.options) {
+              for (const opt of itemEl.options) { if (opt.selected) ids.push(opt.value); }
+            }
+            if (!ids.length) ids = [available[0].id];
+            const notes = notesEl ? notesEl.value : '';
+            submitReservation(startDate.toISOString(), endDate.toISOString(), ids.join(','), notes);
+          }
+        }
+      }
+    });
   }
 
-  function initEquipmentCalendar() {
-    const calendarEl = document.getElementById('ec-calendar');
-    if (!calendarEl || !window.FullCalendar) return;
+  function initCalendar() {
+    const el = document.getElementById('equipment-calendar');
+    if (!el || typeof FullCalendar === 'undefined') return;
 
-    const eventsJsonEl = document.getElementById('ec-events-json');
-    let events = [];
-    try {
-      events = eventsJsonEl ? JSON.parse(eventsJsonEl.textContent || '[]') : [];
-    } catch (e) {
-      events = [];
-    }
+    const events = window.EC_EVENTS || [];
+    const initialDate = window.EC_INITIAL_DATE;
+    const initialView = window.EC_INITIAL_VIEW || 'dayGridMonth';
 
-    const calendar = new window.FullCalendar.Calendar(calendarEl, {
-      initialView: 'dayGridMonth',
-      selectable: true,
+    const calendar = new FullCalendar.Calendar(el, {
+      initialView: initialView,
+      initialDate: initialDate,
+      timeZone: window.EC_TZ || 'local',
+      selectable: window.EC_CAN_CREATE === true,
       selectMirror: true,
-      events,
+      events: events,
+
+      // Range selection (drag)
       select: function (info) {
-        const startMs = toUtcMidnightMs(info.start);
-        const endMs = toUtcMidnightMs(info.end);
-        openCreateModal(startMs, endMs);
+        openNodeBBModal(info.startStr, info.endStr);
       },
+
+      // Single date click
       dateClick: function (info) {
-        const startMs = toUtcMidnightMs(info.date);
-        const endMs = startMs + 24 * 60 * 60 * 1000;
-        openCreateModal(startMs, endMs);
+        // Default: 1h slot
+        const start = info.date;
+        const end = new Date(start.getTime() + 60 * 60 * 1000);
+        openNodeBBModal(start.toISOString(), end.toISOString());
+      },
+
+      headerToolbar: {
+        left: 'prev,next today',
+        center: 'title',
+        right: 'dayGridMonth,timeGridWeek,timeGridDay'
       },
     });
 
     calendar.render();
-
-    const sel = document.getElementById('ec-item-ids');
-    if (sel) {
-      sel.addEventListener('change', updateTotalPrice);
-    }
-    const s = document.getElementById('ec-start-date');
-    const e = document.getElementById('ec-end-date');
-    if (s) s.addEventListener('change', syncDatesToMs);
-    if (e) e.addEventListener('change', syncDatesToMs);
-
-    updateTotalPrice();
   }
 
-  // Init on normal page load
-  document.addEventListener('DOMContentLoaded', initEquipmentCalendar);
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', initCalendar);
+  } else {
+    initCalendar();
+  }
+}());
 
-  // Init after ajaxify navigation (NodeBB emits this on window)
-  window.addEventListener('action:ajaxify.end', initEquipmentCalendar);
-})();
+});

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

@@ -13,60 +13,14 @@
     <div id="equipment-calendar"></div>
   </div>
 
-  <!-- Modal création -->
-  <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="/equipment/reservations/create">
-          <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">
-
-            <div class="row g-3 mb-3">
-              <div class="col-6">
-                <label class="form-label">Début</label>
-                <input class="form-control" type="date" id="ec-start-date" required>
-              </div>
-              <div class="col-6">
-                <label class="form-label">Fin</label>
-                <input class="form-control" type="date" id="ec-end-date" required>
-              </div>
-            </div>
-
-            <div class="mb-3">
-              <label class="form-label">Matériel</label>
-              <select class="form-select" id="ec-item-ids" name="itemIds" multiple required></select>
-              <div class="form-text">Tu peux sélectionner plusieurs matériels.</div>
-            </div>
-
-            <div class="mb-3">
-              <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="submit" class="btn btn-primary">Envoyer la demande</button>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
+  <!-- Formulaire de soumission (utilisé par la modale JS) -->
+  <form id="ec-create-form" method="post" action="/equipment/reservations/create" class="d-none">
+    <input type="hidden" name="_csrf" value="{config.csrf_token}">
+    <input type="hidden" name="start" value="">
+    <input type="hidden" name="end" value="">
+    <input type="hidden" name="itemIds" value="">
+    <input type="hidden" name="notesUser" value="">
+  </form>
 </div>
 
 <script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.19/index.global.min.js"></script>
@@ -77,7 +31,12 @@
   window.EC_BLOCKS = JSON.parse(atob('{blocksB64}'));
   window.EC_ITEMS = JSON.parse(atob('{itemsB64}'));
   window.EC_INITIAL_DATE = "{initialDateISO}";
+  window.EC_INITIAL_VIEW = "{view}";
   window.EC_TZ = "{tz}";
   window.EC_CAN_CREATE = {canCreateJs};
 </script>
-<script type="application/json" id="ec-events-json">{eventsJson}</script>
+
+<style>
+  .ec-status-pending .fc-event-title { font-weight: 600; }
+  .ec-status-valid .fc-event-title { font-weight: 700; }
+</style>