nodebb-plugin-equipment-calendar 2.0.0 → 2.0.3

package/library.js

@@ -1158,63 +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) {
-    return res.status(400).send('itemId required');
-  }
-    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');
   }
 }
 

package/package.json

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

package/public/js/client.js

@@ -1,179 +1,134 @@
-require(['jquery'], function ($) {
+require(['jquery', 'bootstrap'], function ($, bootstrap) {
 'use strict';
-/* global window, document, FullCalendar, bootbox */
+/* global window, document, FullCalendar */
 
 (function () {
-  function overlaps(aStartMs, aEndMs, bStartMs, bEndMs) {
-    return aStartMs < bEndMs && aEndMs > bStartMs;
+  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 fmt(dt) {
-    try {
-      return new Intl.DateTimeFormat('fr-FR', { dateStyle: 'full', timeStyle: 'short' }).format(dt);
-    } catch (e) {
-      return dt.toISOString();
-    }
+  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 buildAvailability(startMs, endMs) {
-    const blocks = Array.isArray(window.EC_BLOCKS) ? window.EC_BLOCKS : [];
-    const items = Array.isArray(window.EC_ITEMS) ? window.EC_ITEMS : [];
-
-    const blockedByItem = {};
-    for (const b of blocks) {
-      if (!blockedByItem[b.itemId]) blockedByItem[b.itemId] = [];
-      blockedByItem[b.itemId].push(b);
-    }
-
-    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;
+  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 submitReservation(startISO, endISO, itemId, notes) {
-    const form = document.getElementById('ec-create-form');
-    if (!form) return;
+  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;
 
-    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"]');
+    let unitTotal = 0;
+    Array.from(sel.selectedOptions || []).forEach((opt) => {
+      const p = parseFloat(opt.getAttribute('data-price') || '0');
+      if (!Number.isNaN(p)) unitTotal += p;
+    });
 
-    if (startInput) startInput.value = startISO;
-    if (endInput) endInput.value = endISO;
-    if (itemInput) itemInput.value = itemId;
-    if (notesInput) notesInput.value = notes || '';
+    const days = getReservationDays();
+    if (daysEl) daysEl.textContent = days + (days > 1 ? ' jours' : ' jour');
 
-    form.submit();
+    const finalTotal = unitTotal * days;
+    const txt = Number.isInteger(finalTotal) ? String(finalTotal) : finalTotal.toFixed(2);
+    out.textContent = txt + ' €';
   }
 
-  function openNodeBBModal(startISO, endISO) {
-    const startDate = new Date(startISO);
-    const endDate = new Date(endISO);
-    const startMs = startDate.getTime();
-    const endMs = endDate.getTime();
-
-    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;
-    }
-
-    // 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>`;
-    }
+  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();
+  }
 
-    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;
+  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' });
     }
-
-    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 initCalendar() {
-    const el = document.getElementById('equipment-calendar');
-    if (!el || typeof FullCalendar === 'undefined') return;
-
-    const events = window.EC_EVENTS || [];
-    const initialDate = window.EC_INITIAL_DATE;
-    const initialView = window.EC_INITIAL_VIEW || 'dayGridMonth';
-
-    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,
+    const calendarEl = document.getElementById('ec-calendar');
+    if (!calendarEl || !window.FullCalendar) return;
 
-      // Range selection (drag)
-      select: function (info) {
-        openNodeBBModal(info.startStr, info.endStr);
-      },
+    const canCreate = !!window.EC_CAN_CREATE;
+    const events = Array.isArray(window.EC_EVENTS) ? window.EC_EVENTS : [];
 
-      // Single date click
+    const calendar = new window.FullCalendar.Calendar(calendarEl, {
+      initialView: 'dayGridMonth',
+      selectable: canCreate,
+      selectMirror: true,
+      events,
       dateClick: function (info) {
-        // Default: 1h slot
-        const start = info.date;
-        const end = new Date(start.getTime() + 60 * 60 * 1000);
-        openNodeBBModal(start.toISOString(), end.toISOString());
+        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);
       },
-
-      headerToolbar: {
-        left: 'prev,next today',
-        center: 'title',
-        right: 'dayGridMonth,timeGridWeek,timeGridDay'
+      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();
-  }
 
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', initCalendar);
-  } else {
-    initCalendar();
+    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);
+})();
 });

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

@@ -9,34 +9,76 @@
   <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>
 
-  <!-- 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>
+  <!-- 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">
+        <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-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">
+                <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>
+                {{{ 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>
+
+          <div class="modal-footer">
+            <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>
+      </div>
+    </div>
+  </div>
 </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_INITIAL_VIEW = "{view}";
-  window.EC_TZ = "{tz}";
   window.EC_CAN_CREATE = {canCreateJs};
+  window.EC_TZ = '{tz}';
 </script>
-
-<style>
-  .ec-status-pending .fc-event-title { font-weight: 600; }
-  .ec-status-valid .fc-event-title { font-weight: 700; }
-</style>