nodebb-plugin-equipment-calendar 2.0.6 → 3.0.0

package/library.js

@@ -16,6 +16,30 @@ const helpers = require.main.require('./src/controllers/helpers');
 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';
+    const icon = status === 'paid' ? '✅' : (status === 'approved' ? '✔️' : (status === 'pending' ? '⏳' : (status === 'cancelled' ? '❌' : '⚠️')));
+    const title = ev.title || '';
+    return Object.assign({}, ev, {
+      title: `${icon} ${title}`,
+      classNames: ['ec-status-' + status],
+      extendedProps: Object.assign({}, ev.extendedProps || {}, { status }),
+    });
+  });
+}
+
+function generateId() {
+  try {
+    // Node 14+ / modern: crypto.randomUUID
+    const crypto = require('crypto');
+    if (crypto.randomUUID) return crypto.randomUUID();
+    return crypto.randomBytes(16).toString('hex');
+  } catch (e) {
+    return String(Date.now()) + '-' + Math.random().toString(16).slice(2);
+  }
+}
 const axios = require('axios');
 const { DateTime } = require('luxon');
 const { v4: uuidv4 } = require('uuid');
@@ -24,6 +48,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',
@@ -287,7 +316,7 @@ async function getActiveItems() {
   const items = (Array.isArray(rawItems) ? rawItems : []).map((it) => ({
     id: String(it.id || '').trim(),
     name: String(it.name || '').trim(),
-    price: String(it.price || '0').trim(),
+    price: Number(it.price || 0) || 0,
     active: true,
   })).filter(it => it.id && it.name);
   return items;
@@ -670,90 +699,26 @@ 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(EC_KEYS.reservationsZset, 0, 199);
+  const rowsRaw = await db.getObjects(ids.map(id => EC_KEYS.reservationKey(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,
+      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: parseInt(r.days, 10) || 1,
+      status: r.status || 'pending',
+      total: r.total || '0',
+    };
   });
+  res.render('admin/plugins/equipment-calendar-reservations', { title: 'Réservations', rows, hasRows: rows.length>0 });
 }
 
 async function handleAdminApprove(req, res) {
@@ -978,6 +943,8 @@ async function renderCalendarPage(req, res) {
     }));
 
   res.render('equipment-calendar/calendar', {
+    defaultView: settings.defaultView,
+
     title: 'Réservation de matériel',
     items,
     view,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "2.0.6",
+  "version": "3.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": "0.7.3",
+  "version": "0.7.5",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -93,10 +93,12 @@ 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,listMonth,listWeek'},
+      initialView: (window.EC_DEFAULT_VIEW || 'dayGridMonth'),
       selectable: canCreate,
       selectMirror: true,
       events,
+        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,20 @@
       </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="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

@@ -74,6 +74,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 +83,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>