nodebb-plugin-equipment-calendar 9.0.6 → 9.0.7

package/library.js

@@ -132,7 +132,6 @@ const { v4: uuidv4 } = require('uuid');
 const crypto = require('crypto');
 
 const plugin = {};
-const SETTINGS_DB_KEY = 'equipmentCalendar:settings';
 const SETTINGS_KEY = 'equipmentCalendar';
 
 const DEFAULT_SETTINGS = {
@@ -160,6 +159,39 @@ const DEFAULT_SETTINGS = {
   showRequesterToAll: '0', // 0/1
 };
 
+function normalizeSettings(raw) {
+  const out = {};
+  const keys = Object.keys(DEFAULT_SETTINGS);
+  keys.forEach((k) => {
+    const def = DEFAULT_SETTINGS[k];
+    const str = raw && raw[k];
+    if (typeof str !== 'string') {
+      out[k] = def;
+      return;
+    }
+    try {
+      const v = JSON.parse(str);
+      out[k] = (typeof v === typeof def) ? v : def;
+    } catch (e) {
+      out[k] = def;
+    }
+  });
+  return out;
+}
+async function getSettings() {
+  const raw = await meta.settings.get('equipmentCalendar');
+  return normalizeSettings(raw);
+}
+async function setSettings(payload) {
+  const sets = {};
+  Object.keys(payload || {}).forEach((k) => {
+    sets[k] = JSON.stringify(payload[k]);
+  });
+  await setSettings(payload);
+}
+
+
+
 
 function parseLocationMap(locationMapJson) {
   try {
@@ -407,18 +439,6 @@ async function getActiveItems() {
   return items;
 }
 
-async function getSettings() {
-  const defaults = DEFAULT_SETTINGS;
-  try {
-    const saved = await db.getObject(SETTINGS_DB_KEY);
-    const merged = Object.assign({}, defaults, saved || {});
-    // normalize numbers
-    merged.paymentTimeoutMinutes = parseInt(merged.paymentTimeoutMinutes, 10) || defaults.paymentTimeoutMinutes;
-    return merged;
-  } catch (e) {
-    return Object.assign({}, defaults);
-  }
-}
 
 // --- Data layer ---
 // Keys:
@@ -1593,8 +1613,8 @@ async function handleAdminSave(req, res) {
       showRequesterToAll: (req.body.showRequesterToAll === '1' || req.body.showRequesterToAll === 'on') ? '1' : '0',
     };
 
-    await meta.settings.set(SETTINGS_KEY, values);
-    return res.redirect('/admin/plugins/equipment-calendar?saved=1');
+    await setSettings(payload);
+return res.redirect('/admin/plugins/equipment-calendar?saved=1');
   } catch (e) {
     return res.status(500).send(e.message || 'error');
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "9.0.6",
+  "version": "9.0.7",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {

package/plugin.json

@@ -25,6 +25,9 @@
   "scripts": [
     "public/js/client.js"
   ],
-  "version": "3.0.0-stable4t-db-settings",
-  "minver": "4.7.1"
+  "version": "3.0.0-stable4u-official-acp",
+  "minver": "4.7.1",
+  "acpScripts": [
+    "public/js/admin.js"
+  ]
 }

package/public/js/admin.js

@@ -1,20 +1,14 @@
-'use strict';
-
-/* global define */
 
-define('admin/plugins/equipment-calendar', ['jquery', 'settings', 'alerts'], function ($, Settings, alerts) {
+'use strict';
+define('admin/plugins/equipment-calendar', ['settings', 'alerts'], function (Settings, alerts) {
   const Admin = {};
-
   Admin.init = function () {
-    const $container = $('.equipment-calendar-settings');
-    Settings.load('equipmentCalendar', $container);
-
+    Settings.load('equipmentCalendar', $('.equipment-calendar-settings'));
     $('#save').on('click', function () {
-      Settings.save('equipmentCalendar', $container, function () {
-        alerts.success('Sauvegardé');
+      Settings.save('equipmentCalendar', $('.equipment-calendar-settings'), function () {
+        alerts.success('[[admin/settings:settings-saved]]');
       });
     });
   };
-
   return Admin;
 });

package/public/js/client.js

@@ -174,16 +174,20 @@ function updateTotalPrice() {
         timeZone: 'UTC',
       events: events,
       select: function (info) {
-        if (!window.EC_CAN_CREATE) return;
-        const startIso = String(info.startStr || '').slice(0,10); // YYYY-MM-DD
-        const endEnd = String(info.endStr || '').slice(0,10);
-        const endIsoInclusive = addDaysIsoLocal(endEnd, -1); // endStr is exclusive
-        openCreateModal(startIso, endIsoInclusive);
-      },
+      var startIso = String(info.startStr || '').slice(0, 10);
+      var endExcl = String(info.endStr || '').slice(0, 10);
+      var endIso = endExcl;
+      if (endExcl) {
+        var d = new Date(endExcl + 'T00:00:00Z');
+        d.setUTCDate(d.getUTCDate() - 1);
+        endIso = d.toISOString().slice(0, 10);
+      }
+      window.EC_openReservationModal(startIso, endIso);
+    },
       dateClick: function (info) {
-        if (!window.EC_CAN_CREATE) return;
-        openCreateModal(String(info.dateStr||'').slice(0,10), String(info.dateStr||'').slice(0,10));
-      },
+      var startIso = String(info.dateStr || '').slice(0, 10);
+      window.EC_openReservationModal(startIso, startIso);
+    },
       eventClick: function (info) {
         try {
           info.jsEvent && info.jsEvent.preventDefault && info.jsEvent.preventDefault();

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

@@ -1,83 +1,74 @@
+
 <div class="acp-page-container">
-  <div class="d-flex align-items-center justify-content-between flex-wrap gap-2">
-    <h1 class="mb-0">Equipment Calendar</h1>
-    <div class="btn-group">
-      <a class="btn btn-secondary active" href="{config.relative_path}/admin/plugins/equipment-calendar">Paramètres</a>
-      <a class="btn btn-outline-secondary" href="{config.relative_path}/admin/plugins/equipment-calendar/reservations">Réservations</a>
-    </div>
-  </div>
+  <h1 class="mb-3">Equipment Calendar</h1>
 
-  <form class="equipment-calendar-settings mt-3" method="post" action="{config.relative_path}/admin/plugins/equipment-calendar/save">
-    <input type="hidden" name="_csrf" value="{csrf_token}">
+  <form role="form" class="equipment-calendar-settings">
     <div class="card card-body mb-3">
-      <h5>Permissions</h5>
+      <h5 class="mb-3">Permissions</h5>
       <div class="mb-3">
         <label class="form-label">creatorGroups (séparés par virgule)</label>
-        <input class="form-control" type="text" name="creatorGroups" value="{settings.creatorGroups}">
+        <input class="form-control" type="text" data-field="creatorGroups" value="{settings.creatorGroups}">
       </div>
       <div class="mb-3">
         <label class="form-label">approverGroup</label>
-        <input class="form-control" type="text" name="approverGroup" value="{settings.approverGroup}">
+        <input class="form-control" type="text" data-field="approverGroup" value="{settings.approverGroup}">
       </div>
       <div class="mb-0">
         <label class="form-label">notifyGroup</label>
-        <input class="form-control" type="text" name="notifyGroup" value="{settings.notifyGroup}">
+        <input class="form-control" type="text" data-field="notifyGroup" value="{settings.notifyGroup}">
       </div>
     </div>
 
     <div class="card card-body mb-3">
-      <h5>HelloAsso</h5>
+      <h5 class="mb-3">HelloAsso</h5>
       <div class="row g-3">
         <div class="col-md-6">
-          <label class="form-label">API base URL</label>
-          <input class="form-control" type="text" name="ha_apiBaseUrl" value="{settings.ha_apiBaseUrl}" placeholder="https://api.helloasso.com ou https://api.helloasso-sandbox.com">
+          <label class="form-label">API base URL (prod ou sandbox)</label>
+          <input class="form-control" type="text" data-field="ha_apiBaseUrl" value="{settings.ha_apiBaseUrl}" placeholder="https://api.helloasso.com ou https://api.helloasso-sandbox.com">
         </div>
         <div class="col-md-6">
           <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" data-field="ha_organizationSlug" value="{settings.ha_organizationSlug}">
         </div>
         <div class="col-md-6">
           <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" data-field="ha_clientId" value="{settings.ha_clientId}">
         </div>
         <div class="col-md-6">
           <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" data-field="ha_clientSecret" value="{settings.ha_clientSecret}">
         </div>
         <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" 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" data-field="ha_itemsFormSlug" value="{settings.ha_itemsFormSlug}" placeholder="locations-materiel-2026">
         </div>
         <div class="col-12">
           <label class="form-label">Return URL base (callback)</label>
-          <input class="form-control" type="text" name="ha_returnUrl" value="{settings.ha_returnUrl}" placeholder="https://www.onekite.com">
+          <input class="form-control" type="text" data-field="ha_returnUrl" value="{settings.ha_returnUrl}" placeholder="https://www.onekite.com">
         </div>
       </div>
     </div>
 
     <div class="card card-body mb-3">
-      <h5>Paiement</h5>
+      <h5 class="mb-3">Paiement</h5>
       <div class="row g-3">
         <div class="col-md-6">
           <label class="form-label">paymentTimeoutMinutes</label>
-          <input class="form-control" type="number" min="1" name="paymentTimeoutMinutes" value="{settings.paymentTimeoutMinutes}">
+          <input class="form-control" type="number" min="1" data-field="paymentTimeoutMinutes" value="{settings.paymentTimeoutMinutes}">
         </div>
       </div>
     </div>
 
-    <button class="btn btn-primary" type="submit">Enregistrer</button>
+    <button id="save" type="button" class="btn btn-primary">Enregistrer</button>
   </form>
-
-  <script>
-    (function () {
-      var params = new URLSearchParams(window.location.search || '');
-      if (params.get('saved') === '1') {
-        require(['alerts'], function (alerts) { alerts.success('Paramètres enregistrés'); });
-      }
-    })();
-  </script>
 </div>
+
+<script>
+require(['admin/plugins/equipment-calendar'], function (mod) {
+  mod.init();
+});
+</script>