nodebb-plugin-equipment-calendar 8.9.7 → 9.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "8.9.7",
+  "version": "9.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": "3.0.0-stable4p-css-datefix-acp",
+  "version": "3.0.0-stable4p-admin-save-alert",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -1,4 +1,4 @@
-require(['jquery', 'bootstrap'], function ($, bootstrap) {
+require(['jquery', 'bootstrap', 'bootbox'], function ($, bootstrap, bootbox) {
 'use strict';
 /* global window, document, FullCalendar */
 
@@ -55,25 +55,30 @@ require(['jquery', 'bootstrap'], function ($, bootstrap) {
   }
 
 
-  function ecAction(rid, action, eventObj) {
+  function escapeHtml(str) {
+    return String(str || '').replace(/[&<>"']/g, function (c) {
+      return ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' })[c];
+    });
+  }
+
+  function ecDoAction(rid, action, eventObj) {
     try {
-      var csrf = window.EC_CSRF || (window.config && window.config.csrf_token) || '';
+      const csrf = window.EC_CSRF || (window.config && window.config.csrf_token) || '';
       return fetch((config.relative_path || '') + '/api/equipment/reservations/' + encodeURIComponent(rid) + '/action', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json', 'x-csrf-token': csrf },
         body: JSON.stringify({ action: action })
-      }).then(function(r){ return r.json().catch(function(){ return {}; }).then(function(j){ return { ok: r.ok, json: j };});})
-      .then(function(res){
+      }).then(function (r) {
+        return r.json().catch(function () { return {}; }).then(function (j) { return { ok: r.ok, json: j }; });
+      }).then(function (res) {
         if (!res.ok || (res.json && res.json.error)) {
-          if (window.app && app.alertError) app.alertError(res.json && res.json.error ? res.json.error : 'Erreur');
+          if (window.app && app.alertError) app.alertError((res.json && res.json.error) ? res.json.error : 'Erreur');
           return false;
         }
         if (action === 'delete') {
-          try { eventObj.remove(); } catch(e){}
-        } else if (action === 'approve') {
-          try { eventObj.setExtendedProp('status','approved'); } catch(e){}
-        } else if (action === 'reject') {
-          try { eventObj.setExtendedProp('status','rejected'); } catch(e){}
+          try { eventObj.remove(); } catch (e) {}
+        } else {
+          try { eventObj.setExtendedProp('status', action === 'approve' ? 'approved' : 'rejected'); } catch (e) {}
         }
         if (window.app && app.alertSuccess) app.alertSuccess('OK');
         return true;
@@ -166,7 +171,7 @@ function updateTotalPrice() {
       selectMirror: true,
       dayMaxEventRows: true,
       displayEventTime: false,
-        timeZone: 'local',
+        timeZone: 'UTC',
       events: events,
       select: function (info) {
         if (!window.EC_CAN_CREATE) return;
@@ -177,15 +182,34 @@ function updateTotalPrice() {
       },
       dateClick: function (info) {
         if (!window.EC_CAN_CREATE) return;
-        openCreateModal(info.dateStr, info.dateStr);
+        openCreateModal(String(info.dateStr||'').slice(0,10), String(info.dateStr||'').slice(0,10));
       },
       eventClick: function (info) {
-        // simple details popup
-        const r = info.event.extendedProps || {};
-        const title = info.event.title || 'Réservation';
-        const start = info.event.startStr || '';
-        const end = info.event.endStr ? addDaysIsoLocal(info.event.endStr, -1) : '';
-        bootbox.alert(`<strong>${title}</strong><br>Du ${start} au ${end}<br>Statut: ${r.status || ''}`);
+        try {
+          info.jsEvent && info.jsEvent.preventDefault && info.jsEvent.preventDefault();
+          const ep = info.event.extendedProps || {};
+          const rid = ep.rid || info.event.id;
+          const status = ep.status || 'pending';
+          const title = info.event.title || 'Reservation';
+          const start = String(info.event.startStr || '').slice(0,10);
+          const end = String(info.event.endStr || '').slice(0,10);
+          const total = ep.total || 0;
+
+          let msg = '<div><strong>' + escapeHtml(title) + '</strong></div>';
+          msg += '<div>Periode: ' + escapeHtml(start) + ' -> ' + escapeHtml(end) + '</div>';
+          msg += '<div>Statut: ' + escapeHtml(status) + '</div>';
+          if (total) msg += '<div>Total: ' + escapeHtml(String(total)) + ' EUR</div>';
+
+          const buttons = { close: { label: 'Fermer', className: 'btn-secondary' } };
+
+          if (window.EC_IS_APPROVER) {
+            buttons.approve = { label: 'Valider', className: 'btn-success', callback: function () { return ecDoAction(rid, 'approve', info.event); } };
+            buttons.reject = { label: 'Rejeter', className: 'btn-warning', callback: function () { return ecDoAction(rid, 'reject', info.event); } };
+            buttons.delete = { label: 'Supprimer', className: 'btn-danger', callback: function () { return ecDoAction(rid, 'delete', info.event); } };
+          }
+
+          bootbox.dialog({ title: 'Reservation', message: msg, buttons: buttons });
+        } catch (e) {}
       },
     });
 

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

@@ -53,23 +53,24 @@
       <tbody>
         {{{ each rows }}}
         <tr>
-          <td><code></code></td>
+          <td><code>{rows.rid}</code></td>
           <td>{rows.itemName}</td>
+          <td>{rows.uid}</td>
           <td><small>{rows.start}</small></td>
           <td><small>{rows.end}</small></td>
           <td><code>{rows.status}</code></td>
           <td><small>{rows.createdAt}</small></td>
           <td><small>{rows.notesUser}</small></td>
           <td class="text-nowrap">
-            <form method="post" action="/admin/plugins/equipment-calendar/reservations//approve" class="d-inline">
+            <form method="post" action="/admin/plugins/equipment-calendar/reservations/{rows.rid}/approve" class="d-inline">
               <input type="hidden" name="_csrf" value="{config.csrf_token}">
               <button class="btn btn-sm btn-success" type="submit">Approve</button>
             </form>
-            <form method="post" action="/admin/plugins/equipment-calendar/reservations//reject" class="d-inline ms-1">
+            <form method="post" action="/admin/plugins/equipment-calendar/reservations/{rows.rid}/reject" class="d-inline ms-1">
               <input type="hidden" name="_csrf" value="{config.csrf_token}">
               <button class="btn btn-sm btn-warning" type="submit">Reject</button>
             </form>
-            <form method="post" action="/admin/plugins/equipment-calendar/reservations//delete" class="d-inline ms-1" onsubmit="return confirm('Supprimer définitivement ?');">
+            <form method="post" action="/admin/plugins/equipment-calendar/reservations/{rows.rid}/delete" class="d-inline ms-1" onsubmit="return confirm('Supprimer définitivement ?');">
               <input type="hidden" name="_csrf" value="{config.csrf_token}">
               <button class="btn btn-sm btn-danger" type="submit">Delete</button>
             </form>

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

@@ -8,22 +8,20 @@
     </div>
   </div>
 
-  <form id="ec-admin-form" method="post" action="/admin/plugins/equipment-calendar/save" class="mb-3 mt-3">
-    <input type="hidden" name="_csrf" value="{config.csrf_token}">
-
+  <div class="equipment-calendar-settings mt-3">
     <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}">
+        <input class="form-control" type="text" name="creatorGroups" data-field="creatorGroups" value="{settings.creatorGroups}">
       </div>
       <div class="mb-3">
         <label class="form-label">Groupe valideur (approverGroup)</label>
-        <input class="form-control" type="text" name="approverGroup" value="{settings.approverGroup}">
+        <input class="form-control" type="text" name="approverGroup" data-field="approverGroup" value="{settings.approverGroup}">
       </div>
       <div class="mb-0">
         <label class="form-label">Groupe notifié (notifyGroup)</label>
-        <input class="form-control" type="text" name="notifyGroup" value="{settings.notifyGroup}">
+        <input class="form-control" type="text" name="notifyGroup" data-field="notifyGroup" value="{settings.notifyGroup}">
       </div>
     </div>
 
@@ -31,7 +29,7 @@
       <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}">
+        <input class="form-control" type="number" min="1" name="paymentTimeoutMinutes" data-field="paymentTimeoutMinutes" value="{settings.paymentTimeoutMinutes}">
       </div>
     </div>
 
@@ -39,45 +37,39 @@
       <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}">
+        <input class="form-control" type="text" name="ha_apiBaseUrl" data-field="ha_apiBaseUrl" value="{settings.ha_apiBaseUrl}">
         <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}">
+        <input class="form-control" type="text" name="ha_organizationSlug" data-field="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}">
+        <input class="form-control" type="text" name="ha_clientId" data-field="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}">
+        <input class="form-control" type="password" name="ha_clientSecret" data-field="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">
+          <input class="form-control" type="text" name="ha_itemsFormType" data-field="ha_itemsFormType" value="{settings.ha_itemsFormType}" placeholder="shop">
         </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">
+          <input class="form-control" type="text" name="ha_itemsFormSlug" data-field="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}">
+        <input class="form-control" type="text" name="ha_calendarItemNamePrefix" data-field="ha_calendarItemNamePrefix" value="{settings.ha_calendarItemNamePrefix}">
       </div>
     </div>
 
-    <button class="btn btn-primary" type="submit">Enregistrer</button>
-  </form>
+    <button id="save" class="btn btn-primary" type="button">Enregistrer</button>
+  </div>
 
-  {{{ if saved }}}
-  <script>
-    if (window.app && typeof window.app.alertSuccess === 'function') {
-      window.app.alertSuccess('Paramètres enregistrés');
-    }
-  </script>
-  {{{ end }}}
+  
 </div>