nodebb-plugin-equipment-calendar 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "1.0.0",
+  "version": "1.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.1",
+  "version": "0.6.2",
   "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/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>