nodebb-plugin-onekite-calendar 2.0.86 → 2.0.88

package/lib/admin.js

@@ -180,6 +180,19 @@ admin.approveReservation = async function (req, res) {
 
   await dbLayer.saveReservation(r);
 
+  // Audit
+  try {
+    const year = new Date().getFullYear();
+    await dbLayer.addAuditEntry({
+      ts: Date.now(), year, action: 'reservation_approved',
+      targetType: 'reservation', targetId: String(rid),
+      reservationUid: Number(r.uid) || 0,
+      reservationUsername: String(r.username || ''),
+      actorUid: req.uid || 0,
+      actorUsername: r.approvedByUsername || '',
+    });
+  } catch (e) {}
+
   // Real-time refresh for all viewers
   realtime.emitCalendarUpdated({ kind: 'reservation', action: 'approved', rid: String(rid), status: r.status });
 
@@ -259,7 +272,6 @@ admin.markReservationPaid = async function (req, res) {
     const requesterUid = parseInt(r.uid, 10);
     const requester = await user.getUserFields(requesterUid, ['username']);
     if (requesterUid) {
-      const { sendEmail, formatFR, buildCalendarLinks } = shared;
       await sendEmail('calendar-onekite_paid', requesterUid, 'Location matériel - Paiement reçu', {
         uid: requesterUid,
         username: requester && requester.username ? requester.username : '',
@@ -294,6 +306,19 @@ admin.refuseReservation = async function (req, res) {
   r.refusedReason = String((req.body && (req.body.reason || req.body.refusedReason || req.body.refuseReason)) || '').trim();
   await dbLayer.saveReservation(r);
 
+  // Audit
+  try {
+    const year = new Date().getFullYear();
+    await dbLayer.addAuditEntry({
+      ts: Date.now(), year, action: 'reservation_refused',
+      targetType: 'reservation', targetId: String(rid),
+      reservationUid: Number(r.uid) || 0,
+      reservationUsername: String(r.username || ''),
+      actorUid: req.uid || 0,
+      refusedReason: r.refusedReason || '',
+    });
+  } catch (e) {}
+
   // Real-time refresh for all viewers
   realtime.emitCalendarUpdated({ kind: 'reservation', action: 'refused', rid: String(rid), status: r.status });
 
@@ -327,12 +352,11 @@ admin.purgeByYear = async function (req, res) {
   const endTs = new Date(Date.UTC(y + 1, 0, 1)).getTime() - 1;
 
   const ids = await dbLayer.listReservationIdsByStartRange(startTs, endTs, 100000);
+  const rows = ids && ids.length ? await dbLayer.getReservations(ids) : [];
   let removed = 0;
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
-    if (!r) continue;
-
-    await dbLayer.removeReservation(rid);
+  for (let i = 0; i < ids.length; i++) {
+    if (!rows[i]) continue;
+    await dbLayer.removeReservation(ids[i]);
     removed++;
   }
   try {

package/lib/api.js

@@ -1192,8 +1192,15 @@ api.getItems = async function (req, res) {
     maint = new Set((ids || []).map(String));
   } catch (e) {}
 
+  const itemIds = normalized.map((it) => String(it.id));
+  let locations = {};
+  try {
+    locations = await dbLayer.getMaintenanceLocations(itemIds);
+  } catch (e) {}
+
   const out = normalized.map((it) => Object.assign({}, it, {
     maintenance: maint.has(String(it.id)),
+    location: locations[String(it.id)] || '',
   }));
 
   res.json(out);
@@ -1963,15 +1970,27 @@ api.setMaintenance = async function (req, res) {
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
   const itemId = String(req.params.itemId || '').trim();
   if (!itemId) return res.status(400).json({ error: 'missing-itemId' });
-  const enabled = !!(req.body && (req.body.enabled === true || req.body.enabled === '1' || req.body.enabled === 1));
-  await dbLayer.setItemMaintenance(itemId, enabled);
-  await auditLog(enabled ? 'maintenance_on' : 'maintenance_off', uid, {
-    targetType: 'item',
-    targetId: itemId,
-  });
-  // Maintenance impacts availability; ask clients to refetch.
-  realtime.emitCalendarUpdated({ kind: 'maintenance', action: enabled ? 'on' : 'off', itemId });
-  return res.json({ ok: true, itemId, enabled });
+
+  const hasEnabled = req.body && 'enabled' in req.body;
+  const hasLocation = req.body && 'location' in req.body;
+  if (!hasEnabled && !hasLocation) return res.status(400).json({ error: 'missing-fields' });
+
+  if (hasLocation) {
+    await dbLayer.setMaintenanceLocation(itemId, String(req.body.location || ''));
+  }
+
+  if (hasEnabled) {
+    const enabled = !!(req.body.enabled === true || req.body.enabled === '1' || req.body.enabled === 1);
+    await dbLayer.setItemMaintenance(itemId, enabled);
+    await auditLog(enabled ? 'maintenance_on' : 'maintenance_off', uid, {
+      targetType: 'item',
+      targetId: itemId,
+    });
+    // Maintenance impacts availability; ask clients to refetch.
+    realtime.emitCalendarUpdated({ kind: 'maintenance', action: enabled ? 'on' : 'off', itemId });
+  }
+
+  return res.json({ ok: true, itemId });
 };
 
 // Bulk toggle: enable/disable maintenance for ALL catalog items.

package/lib/db.js

@@ -16,6 +16,7 @@ const KEY_OUTING_OBJ = (oid) => `calendar-onekite:outings:${oid}`;
 
 // Maintenance (simple ON/OFF per item, no dates)
 const KEY_MAINTENANCE_ZSET = 'calendar-onekite:maintenance:itemIds';
+const KEY_MAINTENANCE_META = (itemId) => `calendar-onekite:maintenance:meta:${itemId}`;
 
 // Audit log (partitioned by year)
 const KEY_AUDIT_ZSET = (year) => `calendar-onekite:audit:${year}`;
@@ -103,6 +104,27 @@ async function setItemMaintenance(itemId, enabled) {
   }
 }
 
+async function getMaintenanceLocations(itemIds) {
+  if (!Array.isArray(itemIds) || !itemIds.length) return {};
+  const keys = itemIds.map((id) => KEY_MAINTENANCE_META(String(id)));
+  let metas = [];
+  try {
+    metas = await db.getObjects(keys);
+  } catch (e) {}
+  const result = {};
+  itemIds.forEach((id, i) => {
+    const meta = metas && metas[i];
+    result[String(id)] = (meta && meta.location) ? String(meta.location) : '';
+  });
+  return result;
+}
+
+async function setMaintenanceLocation(itemId, location) {
+  const id = String(itemId || '').trim();
+  if (!id) return;
+  await db.setObjectField(KEY_MAINTENANCE_META(id), 'location', String(location || '').trim());
+}
+
 async function setAllMaintenance(enabled, itemIds) {
   // Clear set first (fast)
   await db.delete(KEY_MAINTENANCE_ZSET);
@@ -242,6 +264,8 @@ module.exports = {
   isItemInMaintenance,
   setItemMaintenance,
   setAllMaintenance,
+  getMaintenanceLocations,
+  setMaintenanceLocation,
 
   // Audit
   addAuditEntry,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.86",
+  "version": "2.0.88",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/public/admin.js

@@ -1518,15 +1518,17 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
         const id = String(it.id);
         const name = String(it.name || '').replace(/</g, '&lt;').replace(/>/g, '&gt;');
         const checked = it.maintenance ? 'checked' : '';
+        const location = String(it.location || '').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
         return `<tr data-itemid="${id}">
           <td>${name}</td>
+          <td><input type="text" class="form-control form-control-sm onekite-maint-location" value="${location}" placeholder="Emplacement..." style="min-width:180px;"></td>
           <td>
             <div class="form-check form-switch">
               <input class="form-check-input onekite-maint-toggle" type="checkbox" ${checked} />
             </div>
           </td>
         </tr>`;
-      }).join('') || '<tr><td colspan="2" class="text-muted">Aucun matériel.</td></tr>';
+      }).join('') || '<tr><td colspan="3" class="text-muted">Aucun matériel.</td></tr>';
     }
 
     async function refreshMaintenance() {
@@ -1585,6 +1587,33 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
           showAlert('error', 'Impossible de modifier la maintenance.');
         }
       });
+
+      maintTableBody.addEventListener('input', (ev) => {
+        const el = ev && ev.target;
+        if (!el || !el.classList || !el.classList.contains('onekite-maint-location')) return;
+        const tr = el.closest('tr');
+        const itemId = tr ? tr.getAttribute('data-itemid') : '';
+        if (!itemId) return;
+        // Keep cache in sync so re-renders preserve typed value
+        maintItemsCache = maintItemsCache.map((it) => (String(it.id) === String(itemId) ? Object.assign({}, it, { location: el.value }) : it));
+      });
+
+      maintTableBody.addEventListener('focusout', async (ev) => {
+        const el = ev && ev.target;
+        if (!el || !el.classList || !el.classList.contains('onekite-maint-location')) return;
+        const tr = el.closest('tr');
+        const itemId = tr ? tr.getAttribute('data-itemid') : '';
+        if (!itemId) return;
+        const location = String(el.value || '');
+        try {
+          await fetchJson(`/api/v3/plugins/calendar-onekite/maintenance/${encodeURIComponent(String(itemId))}`, {
+            method: 'PUT',
+            body: JSON.stringify({ location }),
+          });
+        } catch (e) {
+          showAlert('error', 'Impossible de sauvegarder l\'emplacement.');
+        }
+      });
     }
 
     // Load once

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

@@ -314,7 +314,7 @@
         <div class="table-responsive">
           <table class="table table-sm" id="onekite-maint-table">
             <thead>
-              <tr><th>Matériel</th><th style="width: 140px;">Maintenance</th></tr>
+              <tr><th>Matériel</th><th>Emplacement</th><th style="width: 140px;">Maintenance</th></tr>
             </thead>
             <tbody></tbody>
           </table>