nodebb-plugin-equipment-calendar 2.2.2 → 4.9.0

package/library.js

@@ -17,6 +17,16 @@ const nconf = require.main.require('nconf');
 
 const winston = require.main.require('winston');
 
+function decorateCalendarEvents(events) {
+  return (events || []).map((ev) => {
+    const status = ev.status || (ev.extendedProps && ev.extendedProps.status) || 'pending';
+    return Object.assign({}, ev, {
+      classNames: (ev.classNames || []).concat(['ec-status-' + status]),
+      extendedProps: Object.assign({}, ev.extendedProps || {}, { status }),
+    });
+  });
+}
+
 function generateId() {
   try {
     // Node 14+ / modern: crypto.randomUUID
@@ -35,6 +45,11 @@ const crypto = require('crypto');
 const plugin = {};
 const SETTINGS_KEY = 'equipmentCalendar';
 
+const EC_KEYS = {
+  reservationsZset: 'ec:reservations',
+  reservationKey: (id) => `ec:reservation:${id}`,
+};
+
 const DEFAULT_SETTINGS = {
   creatorGroups: 'registered-users',
   approverGroup: 'administrators',
@@ -345,9 +360,13 @@ async function getBookingRids(bookingId) {
   return await db.getSetMembers(`equipmentCalendar:booking:${bookingId}:rids`) || [];
 }
 
+const GLOBAL_INDEX_KEY = 'ec:reservations';
+
 async function saveReservation(res) {
   await db.setObject(resKey(res.id), res);
   await db.sortedSetAdd(itemIndexKey(res.itemId), res.startMs, res.id);
+  // Global index for ACP listing
+  await db.sortedSetAdd(GLOBAL_INDEX_KEY, res.startMs, res.id);
 }
 
 async function getReservation(id) {
@@ -681,90 +700,29 @@ plugin.addAdminRoutes = async function (params) {
 };
 
 
-async function renderAdminReservationsPage(req, res) {
-  if (!(await ensureIsAdmin(req, res))) return;
-
-  const settings = await getSettings();
-  const items = await getActiveItems(settings);
-  const itemById = {};
-  items.forEach(it => { itemById[it.id] = it; });
-
-  const status = String(req.query.status || ''); // optional filter
-  const itemId = String(req.query.itemId || ''); // optional filter
-  const q = String(req.query.q || '').trim();    // search rid/user/notes
-
-  const page = Math.max(1, parseInt(req.query.page, 10) || 1);
-  const perPage = Math.min(100, Math.max(10, parseInt(req.query.perPage, 10) || 50));
-
-  const allRids = await db.getSortedSetRevRange('equipmentCalendar:reservations', 0, -1);
-  const totalAll = allRids.length;
-
-  const rows = [];
-  for (const rid of allRids) {
-    // eslint-disable-next-line no-await-in-loop
-    const r = await db.getObject(`equipmentCalendar:reservation:${rid}`);
-    if (!r || !r.rid) continue;
-
-    if (status && String(r.status) !== status) continue;
-    if (itemId && String(r.itemId) !== itemId) continue;
-
-    const notes = String(r.notesUser || '');
-    const ridStr = String(r.rid || rid);
-    if (q) {
-      const hay = (ridStr + ' ' + String(r.uid || '') + ' ' + notes).toLowerCase();
-      if (!hay.includes(q.toLowerCase())) continue;
-    }
 
+async function renderAdminReservationsPage(req, res) {
+  const isAdmin = await user.isAdminOrGlobalMod(req.uid);
+  if (!isAdmin) return res.status(403).render('403', {});
+  const ids = await db.getSortedSetRevRange(GLOBAL_INDEX_KEY, 0, 199);
+  const rowsRaw = await db.getObjects(ids.map(id => resKey(id)));
+  const rows = (rowsRaw || []).filter(Boolean).map((r) => {
     const startMs = parseInt(r.startMs, 10) || 0;
     const endMs = parseInt(r.endMs, 10) || 0;
-    const createdAt = parseInt(r.createdAt, 10) || 0;
-
-    rows.push({
-      rid: ridStr,
-      itemId: String(r.itemId || ''),
-      itemName: (itemById[String(r.itemId || '')] && itemById[String(r.itemId || '')].name) || String(r.itemId || ''),
-      uid: String(r.uid || ''),
-      status: String(r.status || ''),
-      start: startMs ? new Date(startMs).toISOString() : '',
-      end: endMs ? new Date(endMs).toISOString() : '',
-      createdAt: createdAt ? new Date(createdAt).toISOString() : '',
-      notesUser: notes,
-    });
-  }
-
-  const total = rows.length;
-  const totalPages = Math.max(1, Math.ceil(total / perPage));
-  const safePage = Math.min(page, totalPages);
-  const startIndex = (safePage - 1) * perPage;
-  const pageRows = rows.slice(startIndex, startIndex + perPage);
-
-  const itemOptions = [{ id: '', name: 'Tous' }].concat(items.map(i => ({ id: i.id, name: i.name })));
-  const statusOptions = [
-    { id: '', name: 'Tous' },
-    { id: 'pending', name: 'pending' },
-    { id: 'approved', name: 'approved' },
-    { id: 'paid', name: 'paid' },
-    { id: 'rejected', name: 'rejected' },
-    { id: 'cancelled', name: 'cancelled' },
-  ];
-
-  res.render('admin/plugins/equipment-calendar-reservations', {
-    title: 'Equipment Calendar - Réservations',
-    settings,
-    rows: pageRows,
-    hasRows: pageRows.length > 0,
-    itemOptions: itemOptions.map(o => ({ ...o, selected: o.id === itemId })),
-    statusOptions: statusOptions.map(o => ({ ...o, selected: o.id === status })),
-    q,
-    page: safePage,
-    perPage,
-    total,
-    totalAll,
-    totalPages,
-    prevPage: safePage > 1 ? safePage - 1 : 0,
-    nextPage: safePage < totalPages ? safePage + 1 : 0,
-    actionBase: '/admin/plugins/equipment-calendar/reservations',
+    return {
+      id: r.id,
+      bookingId: r.bookingId || '',
+      itemName: r.itemName || r.itemId,
+      startIso: startMs ? new Date(startMs).toISOString().slice(0,10) : '',
+      endIso: endMs ? new Date(endMs - 24*60*60*1000).toISOString().slice(0,10) : '',
+      days: Math.max(1, Math.round((endMs - startMs) / (24*60*60*1000))),
+      status: r.status || 'pending',
+      total: r.total || '0',
+      uid: r.uid,
+      createdAt: r.createdAt || 0,
+    };
   });
+  res.render('admin/plugins/equipment-calendar-reservations', { title: 'Réservations', rows, hasRows: rows.length>0 });
 }
 
 async function handleAdminApprove(req, res) {
@@ -989,6 +947,8 @@ async function renderCalendarPage(req, res) {
     }));
 
   res.render('equipment-calendar/calendar', {
+    defaultView: settings.defaultView,
+
     title: 'Réservation de matériel',
     items,
     view,
@@ -1203,7 +1163,7 @@ async function handleCreateReservation(req, res) {
     const created = [];
     for (const itemId of itemIds) {
       const rid = await createReservationForItem(req, res, settings, itemId, startMs, endMs, notesUser, bookingId);
-      created.push(rid);
+      created.push(rid.id || rid);
     }
 
     // Redirect to calendar with a success flag

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "2.2.2",
+  "version": "4.9.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": "0.7.4",
+  "version": "0.7.7",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -93,10 +93,26 @@ require(['jquery', 'bootstrap'], function ($, bootstrap) {
     const events = Array.isArray(window.EC_EVENTS) ? window.EC_EVENTS : [];
 
     const calendar = new window.FullCalendar.Calendar(calendarEl, {
-      initialView: 'dayGridMonth',
+        headerToolbar: { left: 'prev,next today', center: 'title', right: 'dayGridMonth,dayGridWeek,timeGridWeek,listMonth,listWeek' },
+      initialView: (window.EC_DEFAULT_VIEW || 'dayGridMonth'),
       selectable: canCreate,
       selectMirror: true,
       events,
+        eventContent: function(arg) {
+          const status = (arg.event.extendedProps && arg.event.extendedProps.status) || 'pending';
+          const wrap = document.createElement('div');
+          wrap.className = 'ec-event';
+          const dot = document.createElement('span');
+          dot.className = 'ec-dot';
+          const title = document.createElement('span');
+          title.className = 'ec-title';
+          title.textContent = arg.event.title || '';
+          wrap.appendChild(dot);
+          wrap.appendChild(title);
+          return { domNodes: [wrap] };
+        },
+        eventClassNames:function(arg){return (arg.event.classNames||[]);},
+        eventDidMount:function(info){try{const s=info.event.extendedProps&&info.event.extendedProps.status;info.el.title=(s?('Statut: '+s+' — '):'')+info.event.title;}catch(e){}},
       dateClick: function (info) {
         if (!canCreate) return;
         const startMs = Date.UTC(info.date.getUTCFullYear(), info.date.getUTCMonth(), info.date.getUTCDate());

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

@@ -35,7 +35,22 @@
       </div>
     </div>
 
+    
     <div class="card card-body mb-3">
+      <h5>Affichage calendrier</h5>
+      <div class="mb-0">
+        <label class="form-label">Vue par défaut</label>
+        <select class="form-select" name="defaultView">
+          <option value="dayGridMonth" {{{ if view_dayGridMonth }}}selected{{{ end }}}>Mois</option>
+          <option value="dayGridWeek" {{{ if view_dayGridWeek }}}selected{{{ end }}}>Semaine</option>
+          <option value="timeGridWeek" {{{ if view_timeGridWeek }}}selected{{{ end }}}>Semaine (grille)</option>
+          <option value="listMonth" {{{ if view_listMonth }}}selected{{{ end }}}>Liste (mois)</option>
+          <option value="listWeek" {{{ if view_listWeek }}}selected{{{ end }}}>Liste (semaine)</option>
+        </select>
+      </div>
+    </div>
+
+<div class="card card-body mb-3">
       <h5>HelloAsso</h5>
       <div class="mb-3">
         <label class="form-label">API Base URL (prod/sandbox)</label>

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

@@ -1,3 +1,24 @@
+
+<style>
+  /* Professional status styling */
+  .fc .ec-event { display:flex; align-items:center; gap:.4rem; padding:.05rem .35rem; border-radius:.5rem; }
+  .fc .ec-dot { width:.55rem; height:.55rem; border-radius:999px; display:inline-block; }
+  .fc .ec-title { white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
+
+  .fc-event.ec-status-pending { border-color: rgba(108,117,125,.35); }
+  .fc-event.ec-status-approved { border-color: rgba(13,110,253,.35); }
+  .fc-event.ec-status-paid { border-color: rgba(25,135,84,.35); }
+  .fc-event.ec-status-cancelled { opacity:.55; text-decoration: line-through; }
+
+  .fc-event.ec-status-pending .ec-dot { background: #6c757d; }
+  .fc-event.ec-status-approved .ec-dot { background: #0d6efd; }
+  .fc-event.ec-status-paid .ec-dot { background: #198754; }
+  .fc-event.ec-status-cancelled .ec-dot { background: #dc3545; }
+
+  /* list view rows */
+  .fc .fc-list-event.ec-status-cancelled { opacity:.6; text-decoration: line-through; }
+</style>
+
 <div class="equipment-calendar-page">
   <h1>Réservation de matériel</h1>
 
@@ -10,7 +31,15 @@
   {{{ end }}}
 
   <div class="card card-body mb-3">
-    <div id="ec-calendar"></div>
+    
+<div class="d-flex flex-wrap gap-2 align-items-center mb-2" id="ec-legend">
+  <span class="badge text-bg-secondary"><i class="fa fa-hourglass-half me-1"></i>En attente</span>
+  <span class="badge text-bg-primary"><i class="fa fa-check me-1"></i>Validée</span>
+  <span class="badge text-bg-success"><i class="fa fa-check-double me-1"></i>Payée</span>
+  <span class="badge text-bg-danger"><i class="fa fa-times me-1"></i>Annulée</span>
+</div>
+
+<div id="ec-calendar"></div>
   </div>
 
   <!-- Modal de demande -->
@@ -74,6 +103,7 @@
 </div>
 
 <script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.19/index.global.min.js"></script>
+<script>window.EC_DEFAULT_VIEW = '{defaultView}';</script>
 <script src="{relative_path}/plugins/nodebb-plugin-equipment-calendar/js/client.js"></script>
 
 <script>
@@ -82,3 +112,5 @@
   window.EC_CAN_CREATE = {canCreateJs};
   window.EC_TZ = '{tz}';
 </script>
+
+<style>.ec-status-pending{opacity:.85}.ec-status-paid{font-weight:600}.ec-status-cancelled,.ec-status-expired{opacity:.6;text-decoration:line-through}</style>