nodebb-plugin-calendar-onekite 1.4.0 → 1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "description": "",
   "repository": {
     "type": "git",

package/plugin.json

@@ -3,7 +3,7 @@
   "name": "Calendar Onekite",
   "description": "Calendrier + réservation de matériel + validation admin + paiement HelloAsso pour NodeBB v4",
   "url": "",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "library": "./library.js",
   "staticDirs": {
     "static": "static"
@@ -14,5 +14,8 @@
     { "hook": "filter:widgets.getWidgets", "method": "defineWidgets" },
     { "hook": "filter:widget.render:calendarUpcoming", "method": "renderUpcomingWidget" }
   ],
+  "acpScripts": [
+    "static/js/admin.js"
+  ],
   "templates": "templates"
 }

package/static/js/admin.js

@@ -1,37 +1,45 @@
-'use strict';
-
-$(document).ready(function () {
-  if (!$('#calendar-onekite-admin').length && !$('#calendar-planning').length) return;
-
-  const AdminCalendar = {
-
-    initSettings: function () {
-      if (!$('#calendar-onekite-admin').length) return;
-      AdminCalendar.bindSettingsSave();
-      AdminCalendar.loadPending();
-    },
-
-    initPlanning: function () {
-      if (!$('#calendar-planning').length) return;
-      AdminCalendar.loadPlanning();
-    },
-
-    bindSettingsSave: function () {
-      $('#calendar-onekite-save').on('click', () => {
-        const settings = {
-          allowedGroups: $('#calendar-onekite-groups').val(),
-          allowedBookingGroups: $('#calendar-onekite-book-groups').val(),
-          limit: $('#calendar-onekite-widget-limit').val()
-        };
-
-        api.put('/admin/plugins/nodebb-plugin-calendar-onekite', settings)
-          .then(() => app.alertSuccess('Paramètres enregistrés'))
-          .catch(err => app.alertError(err.message || err));
-      });
-    },
+define('plugins/nodebb-plugin-calendar-onekite/static/js/admin', [
+  'api',
+  'alerts',
+], function (api, alerts) {
+  'use strict';
+
+  const AdminCalendar = {};
 
-    loadPending: function () {
-      $.get('/api/admin/calendar/pending').then(list => {
+  AdminCalendar.init = function () {
+    AdminCalendar.initSettings();
+    AdminCalendar.initPlanning();
+  };
+
+  AdminCalendar.initSettings = function () {
+    if (!$('#calendar-onekite-admin').length) return;
+    AdminCalendar.bindSettingsSave();
+    AdminCalendar.loadPending();
+  };
+
+  AdminCalendar.initPlanning = function () {
+    if (!$('#calendar-planning').length) return;
+    AdminCalendar.loadPlanning();
+  };
+
+  AdminCalendar.bindSettingsSave = function () {
+    $('#calendar-onekite-save').off('click').on('click', function () {
+      const settings = {
+        allowedGroups: $('#calendar-onekite-groups').val(),
+        allowedBookingGroups: $('#calendar-onekite-book-groups').val(),
+        limit: $('#calendar-onekite-widget-limit').val(),
+      };
+
+      // ✅ RECOMMANDÉ: endpoint standard
+      api.put('/admin/plugins/calendar-onekite', settings)
+        .then(() => alerts.success('Paramètres enregistrés'))
+        .catch(err => alerts.error(err?.message || err));
+    });
+  };
+
+  AdminCalendar.loadPending = function () {
+    api.get('/admin/calendar/pending')
+      .then(list => {
         const container = $('#pending-reservations');
         if (!container.length) return;
 
@@ -83,45 +91,47 @@ $(document).ready(function () {
 
           container.append(card);
         });
-      });
-    },
-
-    validateReservation: function (rid, row) {
-      $.post('/api/admin/calendar/reservation/' + rid + '/validate')
-        .then(res => {
-          row.css('background', '#d4edda');
-          row.find('.validate-btn').remove();
-          row.find('.cancel-btn').remove();
-          row.append('<p><strong>Validée.</strong> Lien de paiement envoyé.</p>');
-        })
-        .catch(err => {
-          app.alertError(err.responseJSON?.error || err.message);
-        });
-    },
+      })
+      .catch(err => alerts.error(err?.message || err));
+  };
 
-    cancelReservation: function (rid, row) {
+  AdminCalendar.validateReservation = function (rid, row) {
+    api.post('/admin/calendar/reservation/' + rid + '/validate', {})
+      .then(() => {
+        row.css('background', '#d4edda');
+        row.find('.validate-btn').remove();
+        row.find('.cancel-btn').remove();
+        row.append('<p><strong>Validée.</strong> Lien de paiement envoyé.</p>');
+      })
+      .catch(err => alerts.error(err?.message || err));
+  };
+
+  AdminCalendar.cancelReservation = function (rid, row) {
+    require(['bootbox'], function (bootbox) {
       bootbox.confirm('Annuler cette réservation ?', ok => {
         if (!ok) return;
-        $.post('/api/admin/calendar/reservation/' + rid + '/cancel')
+        api.post('/admin/calendar/reservation/' + rid + '/cancel', {})
           .then(() => {
             row.css('background', '#f8d7da');
             row.find('.validate-btn').remove();
             row.find('.cancel-btn').remove();
             row.append('<p><strong>Annulée.</strong></p>');
           })
-          .catch(err => app.alertError(err.responseJSON?.error || err.message));
+          .catch(err => alerts.error(err?.message || err));
       });
-    },
+    });
+  };
 
-    loadPlanning: function () {
-      $.get('/api/admin/calendar/planning').then(rows => {
+  AdminCalendar.loadPlanning = function () {
+    api.get('/admin/calendar/planning')
+      .then(rows => {
         const tbody = $('#planning-body');
         if (!tbody.length) return;
 
         tbody.empty();
 
         if (!rows.length) {
-          tbody.append('<tr><td colspan="8">Aucune réservation future.</td></tr>');
+          tbody.append('<tr><td colspan="9">Aucune réservation future.</td></tr>');
           return;
         }
 
@@ -141,10 +151,9 @@ $(document).ready(function () {
           `);
           tbody.append(tr);
         });
-      });
-    }
+      })
+      .catch(err => alerts.error(err?.message || err));
   };
 
-  AdminCalendar.initSettings();
-  AdminCalendar.initPlanning();
+  return AdminCalendar;
 });

package/templates/admin/calendar-planning.tpl

@@ -0,0 +1,30 @@
+<div id="calendar-planning">
+  <h2>Planning des réservations de matériel</h2>
+
+  <p>
+    <a href="/admin/plugins/calendar-onekite" class="btn btn-default btn-sm">
+      ← Retour au plugin Calendar Onekite
+    </a>
+  </p>
+
+  <table class="table table-striped">
+    <thead>
+      <tr>
+        <th>Événement</th>
+        <th>Matériel</th>
+        <th>Lieu de retrait</th>
+        <th>UID</th>
+        <th>Quantité</th>
+        <th>Début</th>
+        <th>Fin</th>
+        <th>Jours</th>
+        <th>Statut</th>
+      </tr>
+    </thead>
+    <tbody id="planning-body">
+      <tr><td colspan="9">Chargement…</td></tr>
+    </tbody>
+  </table>
+</div>
+
+<script src="/plugins/nodebb-plugin-calendar-onekite/static/js/admin.js"></script>

package/templates/admin/plugins/calendar-onekite.tpl

@@ -14,16 +14,16 @@
     <small>Ex : administrators, moderators</small>
   </div>
 
-
   <div class="form-group">
     <label>Nombre d’événements dans le widget</label>
     <input id="calendar-onekite-widget-limit" type="number" class="form-control" value="{settings.limit}">
+  </div>
+
+  <div class="form-group">
     <label>Groupes autorisés à réserver</label>
     <input id="calendar-onekite-book-groups" class="form-control" value="{settings.allowedBookingGroups}">
     <small>Ex : registered-users, membres, vip</small>
   </div>
 
   <button id="calendar-onekite-save" class="btn btn-primary">Enregistrer</button>
-</div>
-
-<script src="/plugins/nodebb-plugin-calendar-onekite/static/js/admin.js"></script>
+</div>