nodebb-plugin-equipment-calendar 1.0.0 → 1.0.3

package/library.js

@@ -29,7 +29,7 @@ const DEFAULT_SETTINGS = {
   notifyGroup: 'administrators',
   // JSON array of items: [{ "id": "cam1", "name": "Caméra A", "price": 5000, "location": "Stock A", "active": true }]
   itemsJson: '[]',
-  itemsSource: 'manual',
+  
   ha_itemsFormType: '',
   ha_itemsFormSlug: '',
   
@@ -275,47 +275,20 @@ async function fetchHelloAssoItems(settings) {
   return out;
 }
 
-function parseItems(itemsJson) {
-  try {
-    const arr = JSON.parse(itemsJson || '[]');
-    if (!Array.isArray(arr)) return [];
-    return arr.map(it => ({
-      id: String(it.id || '').trim(),
-      name: String(it.name || '').trim(),
-      price: Number(it.price || 0),
-      location: String(it.location || '').trim(),
-      active: it.active !== false,
-    })).filter(it => it.id && it.name);
-  } catch (e) {
-    return [];
-  }
-}
 
-async function getActiveItems(settings) {
-  const source = String(settings.itemsSource || 'manual');
-  if (source === 'helloasso') {
-    const rawItems = await fetchHelloAssoItems(settings);    return (rawItems || []).map((it) => {
-      const id = String(it.id || it.itemId || it.reference || it.slug || it.name || '').trim();
-      const name = String(it.name || it.label || it.title || id).trim();
-      // Price handling is not displayed in the public calendar, keep a field if you want later
-      const priceRaw =
-        (it.price && (it.price.value || it.price.amount)) ||
-        (it.amount && (it.amount.value || it.amount)) ||
-        it.price;
-      const price = (typeof priceRaw === 'number' ? priceRaw : parseInt(priceRaw, 10)) || 0;
-
-      return {
-        id: id || name,
-        name,
-        price,
-        active: true,
-        source: 'helloasso',
-      };
-    }).filter(i => i.id);
-  }
 
-  // manual
-  return parseItems(settings.itemsJson).filter(i => i.active);
+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;
 }
 
 async function getSettings() {
@@ -1426,8 +1399,7 @@ async function handleAdminSave(req, res) {
       creatorGroups: String(req.body.creatorGroups || DEFAULT_SETTINGS.creatorGroups),
       approverGroup: String(req.body.approverGroup || DEFAULT_SETTINGS.approverGroup),
       notifyGroup: String(req.body.notifyGroup || DEFAULT_SETTINGS.notifyGroup),
-      itemsJson: String(req.body.itemsJson || DEFAULT_SETTINGS.itemsJson),
-      itemsSource: String(req.body.itemsSource || DEFAULT_SETTINGS.itemsSource),
+      itemsJson: '[]',
       ha_itemsFormType: String(req.body.ha_itemsFormType || DEFAULT_SETTINGS.ha_itemsFormType),
       ha_itemsFormSlug: String(req.body.ha_itemsFormSlug || DEFAULT_SETTINGS.ha_itemsFormSlug),
       

package/package.json

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

package/public/js/client.js

@@ -2,6 +2,23 @@
 /* global window, document, FullCalendar, bootbox */
 
 (function () {
+  function populateItemsSelect() {
+    const sel = document.getElementById('ec-item-ids');
+    if (!sel) return;
+    const items = Array.isArray(window.EC_ITEMS) ? window.EC_ITEMS : [];
+    sel.innerHTML = '';
+    items.forEach((it) => {
+      if (!it || it.active === false) return;
+      const opt = document.createElement('option');
+      opt.value = String(it.id);
+      const p = parseFloat(it.price || '0') || 0;
+      const label = (Number.isInteger(p) ? String(p) : p.toFixed(2)) + ' €';
+      opt.textContent = `${it.name} — ${label}`;
+      opt.setAttribute('data-price', String(p));
+      sel.appendChild(opt);
+    });
+  }
+
 
   function toUtcMidnightMs(dateObj) {
     return Date.UTC(dateObj.getUTCFullYear(), dateObj.getUTCMonth(), dateObj.getUTCDate());
@@ -171,19 +188,25 @@
 
     const events = window.EC_EVENTS || [];
     const initialDate = window.EC_INITIAL_DATE;
-    const initialView = window.EC_INITIAL_VIEW || 'dayGridMonth';
+    const initialView = 'dayGridMonth';
 
     const calendar = new FullCalendar.Calendar(el, {
       initialView: initialView,
       initialDate: initialDate,
       timeZone: window.EC_TZ || 'local',
       selectable: window.EC_CAN_CREATE === true,
+      allDaySlot: true,
+      slotDuration: '24:00',
+      eventTimeFormat: { hour: '2-digit', minute: '2-digit', hour12: false },
       selectMirror: true,
       events: events,
+      displayEventTime: false,
 
       // Range selection (drag)
-      select: function (info) {
-        openNodeBBModal(info.startStr, info.endStr);
+      select: function(info) {
+        const startMs = toUtcMidnightMs(info.start);
+        const endMs = toUtcMidnightMs(info.end);
+        openCreateModal(startMs, endMs);
       },
 
       // Single date click
@@ -193,13 +216,10 @@
         openCreateModal(startMs, endMs);
       },
 
-      headerToolbar: {
-        left: 'prev,next today',
-        center: 'title',
-        right: 'dayGridMonth,timeGridWeek,timeGridDay'
-      },
+      headerToolbar: { left: 'prev,next today', center: 'title', right: '' },
     });
 
+    populateItemsSelect();
     calendar.render();
   }
 

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

@@ -33,23 +33,9 @@
       </div>
     </div>
 
+    
     <div class="card card-body mb-3">
-      <h5>Matériel</h5>
-
-      <div class="mb-3">
-        <label class="form-label">Source du matériel</label>
-        <select class="form-select" name="itemsSource">
-          <option value="manual" {{{ if view_itemsSourceManual }}}selected{{{ end }}}>Manuel (JSON)</option>
-          <option value="helloasso" {{{ if view_itemsSourceHelloasso }}}selected{{{ end }}}>HelloAsso (catalogue)</option>
-        </select>
-      </div>
-
-      <div class="mb-3">
-        <label class="form-label">Matériel (JSON) — utilisé si Source = Manuel</label>
-        <textarea class="form-control" name="itemsJson" rows="8">{settings.itemsJson}</textarea>
-        <div class="form-text">Format: <code>[{"id":"cam1","name":"Caméra","price":50,"active":true}]</code> — <code>price</code> en euros (unitaire / jour).</div>
-      </div>
-
+      <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}">
@@ -57,7 +43,7 @@
       </div>
     </div>
 
-    <div class="card card-body mb-3">
+<div class="card card-body mb-3">
       <h5>HelloAsso</h5>
 
       <div class="mb-3">

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

@@ -13,14 +13,60 @@
     <div id="equipment-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 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>
 </div>
 
 <script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.19/index.global.min.js"></script>
@@ -31,12 +77,6 @@
   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>
-
-<style>
-  .ec-status-pending .fc-event-title { font-weight: 600; }
-  .ec-status-valid .fc-event-title { font-weight: 700; }
-</style>