nodebb-plugin-onekite-calendar 2.0.16 → 2.0.18

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog – calendar-onekite
 
+## 1.3.12
+- Expiration automatique : envoi d’un email au demandeur avec la raison :
+  - « Demande non prise en charge dans le temps imparti » (demande en attente)
+  - « Paiement non reçu dans le temps imparti » (paiement en attente)
+- ACP : ajout de 2 paramètres pour envoyer un rappel email aux validateurs sur les demandes en attente / paiement en attente.
+- Emails validateurs : nouveaux templates (rappel + expiration) avec lien vers l’ACP.
+
+## 1.3.11
+- ACP (Demandes en attente) : affichage du pseudo du demandeur avec lien vers sa fiche utilisateur.
+
+## 1.3.10
+- Mobile FAB : surlignage de la sélection de dates rendu lisible en light mode (contraste renforcé, start/end en primary).
+
 ## 1.3.9
 - Mobile FAB : correction de la sélection de plage (tous les jours sélectionnés sont désormais bien inclus dans la surbrillance).
 - Mobile FAB : amélioration du rendu en mode sombre (bordures/fonds adaptés, contraste renforcé).

package/lib/admin.js

@@ -101,6 +101,30 @@ admin.listPending = async function (req, res) {
   const rows = await dbLayer.getReservations(ids);
   const pending = (rows || []).filter(r => r && r.status === 'pending');
   pending.sort((a, b) => parseInt(a.start, 10) - parseInt(b.start, 10));
+
+  // Enrich with user info for ACP display (username + userslug)
+  try {
+    const uids = Array.from(new Set(pending
+      .map(r => r && r.uid)
+      .map(v => (v ? parseInt(v, 10) : NaN))
+      .filter(v => Number.isInteger(v) && v > 0)));
+
+    if (uids.length) {
+      // user.getUsersFields exists in NodeBB 4.x
+      const users = await user.getUsersFields(uids, ['uid', 'username', 'userslug']);
+      const byUid = new Map((users || []).filter(Boolean).map(u => [String(u.uid), u]));
+      for (const r of pending) {
+        const u = byUid.get(String(r.uid));
+        if (u) {
+          r.username = u.username || r.username || '';
+          r.userslug = u.userslug || r.userslug || '';
+        }
+      }
+    }
+  } catch (e) {
+    // Best-effort only; keep API working even if user lookups fail
+  }
+
   res.json(pending);
 };
 

package/lib/scheduler.js

@@ -4,6 +4,8 @@ const meta = require.main.require('./src/meta');
 const db = require.main.require('./src/database');
 const dbLayer = require('./db');
 const discord = require('./discord');
+const nconf = require.main.require('nconf');
+const groups = require.main.require('./src/groups');
 
 let timer = null;
 
@@ -14,12 +16,136 @@ function getSetting(settings, key, fallback) {
   return v;
 }
 
+function formatFR(ts) {
+  const d = new Date(ts);
+  const dd = String(d.getDate()).padStart(2, '0');
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  const yyyy = d.getFullYear();
+  return `${dd}/${mm}/${yyyy}`;
+}
+
+function forumBaseUrl() {
+  const base = String(nconf.get('url') || '').trim().replace(/\/$/, '');
+  return base;
+}
+
+// Resolve group identifiers from ACP (name or slug) and return UIDs.
+async function getMembersByGroupIdentifier(groupIdentifier) {
+  const id = String(groupIdentifier || '').trim();
+  if (!id) return [];
+
+  let members = [];
+  try {
+    members = await groups.getMembers(id, 0, -1);
+  } catch (e) {
+    members = [];
+  }
+  if (Array.isArray(members) && members.length) return members;
+
+  if (typeof groups.getGroupNameByGroupSlug === 'function') {
+    let groupName = null;
+    try {
+      if (groups.getGroupNameByGroupSlug.length >= 2) {
+        groupName = await new Promise((resolve) => {
+          groups.getGroupNameByGroupSlug(id, (err, name) => resolve(err ? null : name));
+        });
+      } else {
+        groupName = await groups.getGroupNameByGroupSlug(id);
+      }
+    } catch (e) {
+      groupName = null;
+    }
+
+    if (groupName && String(groupName).trim() && String(groupName).trim() !== id) {
+      try {
+        members = await groups.getMembers(String(groupName).trim(), 0, -1);
+      } catch (e) {
+        members = [];
+      }
+      if (Array.isArray(members) && members.length) return members;
+    }
+  }
+
+  return Array.isArray(members) ? members : [];
+}
+
+function normalizeUids(members) {
+  if (!Array.isArray(members)) return [];
+  const out = [];
+  for (const m of members) {
+    if (Number.isInteger(m)) { out.push(m); continue; }
+    if (typeof m === 'string' && m.trim() && !Number.isNaN(parseInt(m, 10))) { out.push(parseInt(m, 10)); continue; }
+    if (m && typeof m === 'object' && (Number.isInteger(m.uid) || (typeof m.uid === 'string' && m.uid.trim()))) {
+      const u = Number.isInteger(m.uid) ? m.uid : parseInt(m.uid, 10);
+      if (!Number.isNaN(u)) out.push(u);
+    }
+  }
+  return Array.from(new Set(out)).filter((u) => Number.isInteger(u) && u > 0);
+}
+
+function normalizeAllowedGroups(raw) {
+  if (!raw) return [];
+  if (Array.isArray(raw)) {
+    return raw.map((s) => String(s || '').trim()).filter(Boolean);
+  }
+  return String(raw)
+    .split(',')
+    .map((s) => String(s || '').trim())
+    .filter(Boolean);
+}
+
+async function getValidatorUids(settings) {
+  const out = new Set();
+  // Always include administrators
+  try {
+    const admins = await getMembersByGroupIdentifier('administrators');
+    normalizeUids(admins).forEach((u) => out.add(u));
+  } catch (e) {}
+
+  const groupsCsv = normalizeAllowedGroups(settings && settings.validatorGroups);
+  for (const g of groupsCsv) {
+    try {
+      const members = await getMembersByGroupIdentifier(g);
+      normalizeUids(members).forEach((u) => out.add(u));
+    } catch (e) {}
+  }
+  return Array.from(out);
+}
+
 // Pending holds: short lock after a user creates a request (defaults to 5 minutes)
 async function expirePending() {
   const settings = await meta.settings.get('calendar-onekite');
   const holdMins = parseInt(getSetting(settings, 'pendingHoldMinutes', '5'), 10) || 5;
+  const validatorReminderMins = parseInt(getSetting(settings, 'validatorReminderMinutesPending', '0'), 10) || 0;
   const now = Date.now();
 
+  const emailer = require.main.require('./src/emailer');
+  const user = require.main.require('./src/user');
+
+  async function sendEmail(template, uid, subject, data) {
+    const toUid = Number.isInteger(uid) ? uid : (uid ? parseInt(uid, 10) : NaN);
+    if (!Number.isInteger(toUid) || toUid <= 0) return;
+    const params = Object.assign({}, data || {}, subject ? { subject } : {});
+    try {
+      if (typeof emailer.send !== 'function') return;
+      await emailer.send(template, toUid, params);
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.warn('[calendar-onekite] Failed to send email (scheduler)', {
+        template,
+        uid: toUid,
+        err: String((err && err.message) || err),
+      });
+    }
+  }
+
+  const adminUrl = (() => {
+    const base = forumBaseUrl();
+    return base ? `${base}/admin/plugins/calendar-onekite` : '/admin/plugins/calendar-onekite';
+  })();
+
+  const validatorUids = validatorReminderMins > 0 ? await getValidatorUids(settings) : [];
+
   const ids = await dbLayer.listAllReservationIds(5000);
   if (!ids || !ids.length) {
     return;
@@ -32,8 +158,66 @@ async function expirePending() {
     }
     const createdAt = parseInt(resv.createdAt, 10) || 0;
     const expiresAt = createdAt + holdMins * 60 * 1000;
+
+    // Reminder to validators while still pending
+    if (validatorReminderMins > 0 && createdAt && now >= (createdAt + validatorReminderMins * 60 * 1000) && now < expiresAt) {
+      const reminderKey = 'calendar-onekite:email:validatorReminder:pending';
+      const first = await db.setAdd(reminderKey, rid);
+      if (first && validatorUids.length) {
+        const requesterUid = parseInt(resv.uid, 10) || 0;
+        const requester = requesterUid ? await user.getUserFields(requesterUid, ['username']) : null;
+        const requesterUsername = requester && requester.username ? requester.username : (resv.username || '');
+        for (const vuid of validatorUids) {
+          await sendEmail('calendar-onekite_validator_reminder', vuid, 'Location matériel - Demande en attente', {
+            rid,
+            requesterUsername,
+            itemNames: (Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : [])).filter(Boolean),
+            dateRange: `Du ${formatFR(resv.start)} au ${formatFR(resv.end)}`,
+            adminUrl,
+            kind: 'pending',
+            delayMinutes: validatorReminderMins,
+          });
+        }
+      }
+    }
+
     if (now > expiresAt) {
-      // Expire (remove from calendar)
+      // Expire (remove from calendar) + notify requester + validators
+      const expiredKey = 'calendar-onekite:email:expiredSent:pending';
+      const firstExpired = await db.setAdd(expiredKey, rid);
+
+      const requesterUid = parseInt(resv.uid, 10) || 0;
+      const requester = requesterUid ? await user.getUserFields(requesterUid, ['username']) : null;
+      const requesterUsername = requester && requester.username ? requester.username : (resv.username || '');
+
+      const reason = 'Demande non prise en charge dans le temps imparti.';
+
+      if (firstExpired && requesterUid) {
+        await sendEmail('calendar-onekite_expired', requesterUid, 'Location matériel - Demande expirée', {
+          uid: requesterUid,
+          username: requesterUsername,
+          itemNames: (Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : [])).filter(Boolean),
+          dateRange: `Du ${formatFR(resv.start)} au ${formatFR(resv.end)}`,
+          delayMinutes: holdMins,
+          reason,
+        });
+      }
+
+      // Validators info email (best-effort)
+      if (firstExpired) {
+        const validators = await getValidatorUids(settings);
+        for (const vuid of validators) {
+          await sendEmail('calendar-onekite_validator_expired', vuid, 'Location matériel - Demande expirée', {
+            rid,
+            requesterUsername,
+            itemNames: (Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : [])).filter(Boolean),
+            dateRange: `Du ${formatFR(resv.start)} au ${formatFR(resv.end)}`,
+            adminUrl,
+            reason,
+          });
+        }
+      }
+
       await dbLayer.removeReservation(rid);
     }
   }
@@ -87,6 +271,11 @@ async function processAwaitingPayment() {
     return `${dd}/${mm}/${yyyy}`;
   }
 
+  const adminUrl = (() => {
+    const base = forumBaseUrl();
+    return base ? `${base}/admin/plugins/calendar-onekite` : '/admin/plugins/calendar-onekite';
+  })();
+
   for (const rid of ids) {
     const r = await dbLayer.getReservation(rid);
     if (!r || r.status !== 'awaiting_payment') continue;
@@ -146,16 +335,33 @@ async function processAwaitingPayment() {
       const u = await user.getUserFields(toUid, ['username']);
 
       if (shouldEmail && toUid) {
-        await sendEmail('calendar-onekite_expired', toUid, 'Location matériel - Rappel', {
+        await sendEmail('calendar-onekite_expired', toUid, 'Location matériel - Demande expirée', {
           uid: toUid,
           username: (u && u.username) ? u.username : '',
           itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
           itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
           dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
           delayMinutes: holdMins,
+          reason: 'Paiement non reçu dans le temps imparti.',
         });
       }
 
+      // Validators info email (best-effort)
+      if (shouldEmail) {
+        const validators = await getValidatorUids(settings);
+        for (const vuid of validators) {
+          await sendEmail('calendar-onekite_validator_expired', vuid, 'Location matériel - Demande expirée', {
+            rid: r.rid || rid,
+            requesterUsername: (u && u.username) ? u.username : (r.username || ''),
+            itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
+            dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
+            adminUrl,
+            reason: 'Paiement non reçu dans le temps imparti.',
+            paymentUrl: r.paymentUrl || '',
+          });
+        }
+      }
+
       if (shouldDiscord) {
         try {
           await discord.notifyReservationCancelled(settings, {

package/package.json

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

package/pkg/package/lib/admin.js

@@ -101,6 +101,29 @@ admin.listPending = async function (req, res) {
   const rows = await dbLayer.getReservations(ids);
   const pending = (rows || []).filter(r => r && r.status === 'pending');
   pending.sort((a, b) => parseInt(a.start, 10) - parseInt(b.start, 10));
+
+  // Enrich with user info for ACP display (username + userslug)
+  try {
+    const uids = Array.from(new Set(pending
+      .map(r => r && r.uid)
+      .map(v => (v ? parseInt(v, 10) : NaN))
+      .filter(v => Number.isInteger(v) && v > 0)));
+
+    if (uids.length) {
+      const users = await user.getUsersFields(uids, ['uid', 'username', 'userslug']);
+      const byUid = new Map((users || []).filter(Boolean).map(u => [String(u.uid), u]));
+      for (const r of pending) {
+        const u = byUid.get(String(r.uid));
+        if (u) {
+          r.username = u.username || r.username || '';
+          r.userslug = u.userslug || r.userslug || '';
+        }
+      }
+    }
+  } catch (e) {
+    // Best-effort only
+  }
+
   res.json(pending);
 };
 

package/pkg/package/package.json

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

package/pkg/package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.3.9"
+  "version": "1.3.11"
 }

package/pkg/package/public/admin.js

@@ -458,6 +458,11 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     for (const r of list) {
       if (r && r.rid) pendingCache.set(String(r.rid), r);
       const created = r.createdAt ? fmtFR(r.createdAt) : '';
+      const userSlug = (r && (r.userslug || r.username)) ? String(r.userslug || r.username) : '';
+      const userName = (r && r.username) ? String(r.username) : '';
+      const userLink = (userSlug && userName)
+        ? `<a href="${escapeHtml('/user/' + userSlug)}" target="_blank" rel="noopener">${escapeHtml(userName)}</a>`
+        : '';
       const itemNames = Array.isArray(r.itemNames) && r.itemNames.length ? r.itemNames : [r.itemName || r.itemId].filter(Boolean);
       const itemsHtml = `<ul style="margin: 0 0 10px 18px;">${itemNames.map(n => `<li>${escapeHtml(String(n))}</li>`).join('')}</ul>`;
       const div = document.createElement('div');
@@ -471,6 +476,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
             <div style="min-width:0;">
             <div><strong>${itemsHtml || escapeHtml(r.itemName || '')}</strong></div>
             <div class="text-muted" style="font-size: 12px;">Créée: ${escapeHtml(created)}</div>
+            ${userLink ? `<div class="text-muted" style="font-size: 12px;">Réservée par: ${userLink}</div>` : ''}
             <div class="text-muted" style="font-size: 12px;">Période: ${escapeHtml(new Date(parseInt(r.start, 10)).toLocaleDateString('fr-FR'))} → ${escapeHtml(new Date(parseInt(r.end, 10)).toLocaleDateString('fr-FR'))}</div>
             </div>
           </div>

package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "2.0.16"
+  "version": "2.0.18"
 }

package/public/admin.js

@@ -458,6 +458,11 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     for (const r of list) {
       if (r && r.rid) pendingCache.set(String(r.rid), r);
       const created = r.createdAt ? fmtFR(r.createdAt) : '';
+      const userSlug = (r && (r.userslug || r.username)) ? String(r.userslug || r.username) : '';
+      const userName = (r && r.username) ? String(r.username) : '';
+      const userLink = (userSlug && userName)
+        ? `<a href="${escapeHtml('/user/' + userSlug)}" target="_blank" rel="noopener">${escapeHtml(userName)}</a>`
+        : '';
       const itemNames = Array.isArray(r.itemNames) && r.itemNames.length ? r.itemNames : [r.itemName || r.itemId].filter(Boolean);
       const itemsHtml = `<ul style="margin: 0 0 10px 18px;">${itemNames.map(n => `<li>${escapeHtml(String(n))}</li>`).join('')}</ul>`;
       const div = document.createElement('div');
@@ -471,6 +476,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
             <div style="min-width:0;">
             <div><strong>${itemsHtml || escapeHtml(r.itemName || '')}</strong></div>
             <div class="text-muted" style="font-size: 12px;">Créée: ${escapeHtml(created)}</div>
+            ${userLink ? `<div class="text-muted" style="font-size: 12px;">Réservée par: ${userLink}</div>` : ''}
             <div class="text-muted" style="font-size: 12px;">Période: ${escapeHtml(new Date(parseInt(r.start, 10)).toLocaleDateString('fr-FR'))} → ${escapeHtml(new Date(parseInt(r.end, 10)).toLocaleDateString('fr-FR'))}</div>
             </div>
           </div>

package/public/client.js

@@ -72,14 +72,24 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
 .onekite-range-day { border:1px solid var(--bs-border-color, rgba(0,0,0,.18)); border-radius:10px; padding:8px 0; text-align:center; cursor:pointer; background:var(--bs-body-bg,#fff); color:var(--bs-body-color,#212529); }
 .onekite-range-day.is-empty { border-color:transparent; background:transparent; cursor:default; }
 .onekite-range-day.is-disabled { opacity:.35; cursor:not-allowed; }
-.onekite-range-day.is-start, .onekite-range-day.is-end { border-color:var(--bs-border-color, rgba(0,0,0,.28)); font-weight:700; background:var(--bs-primary-bg-subtle, var(--bs-secondary-bg, var(--bs-tertiary-bg, rgba(0,0,0,.06)))); }
-.onekite-range-day.is-inrange { background:var(--bs-secondary-bg, var(--bs-tertiary-bg, rgba(0,0,0,.04))); }
+.onekite-range-day.is-start, .onekite-range-day.is-end {
+  /* Use strong, theme-aware contrast so the selection is always visible in light mode */
+  border-color: var(--bs-primary, var(--bs-link-color, #0d6efd));
+  font-weight: 700;
+  background: var(--bs-primary, #0d6efd);
+  color: var(--bs-white, #fff);
+}
+.onekite-range-day.is-inrange {
+  /* Some NodeBB themes set secondary-bg ~= body-bg, making the range invisible. */
+  background: var(--bs-primary-bg-subtle, rgba(13,110,253,.12));
+  box-shadow: inset 0 0 0 1px var(--bs-primary-border-subtle, rgba(13,110,253,.25));
+}
 .onekite-range-day:focus { outline: none; }
 
 @media (prefers-color-scheme: dark) {
   .onekite-range-day { border-color: var(--bs-border-color, rgba(255,255,255,.18)); }
   .onekite-range-day.is-inrange { background: rgba(255,255,255,.08); }
-  .onekite-range-day.is-start, .onekite-range-day.is-end { background: rgba(255,255,255,.14); }
+  .onekite-range-day.is-start, .onekite-range-day.is-end { background: rgba(255,255,255,.14); color: var(--bs-body-color,#f8f9fa); border-color: var(--bs-border-color, rgba(255,255,255,.22)); }
 }
 .onekite-range-summary { margin-top:10px; font-size:.9rem; }
 

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

@@ -53,6 +53,12 @@
             <input class="form-control" name="pendingHoldMinutes" placeholder="5">
           </div>
 
+          <div class="mb-3">
+            <label class="form-label">Rappel validateurs (demande en attente) après (minutes)</label>
+            <input class="form-control" name="validatorReminderMinutesPending" placeholder="0">
+            <div class="form-text">Si &gt; 0, un email de rappel est envoyé aux validateurs après ce délai tant que la demande est toujours en attente.</div>
+          </div>
+
           <div class="mb-3">
             <label class="form-label">Délai rappel paiement (minutes)</label>
             <input class="form-control" name="paymentHoldMinutes" placeholder="60">

package/templates/emails/calendar-onekite_expired.tpl

@@ -1,5 +1,6 @@
 <p>Bonjour {username},</p>
-<p>Votre demande de location de matériel a expiré (paiement non reçu à temps).</p>
+<p>Votre demande de location de matériel a expiré.</p>
+<p><strong>Raison :</strong> {reason}</p>
 
 <p><strong>Matériel</strong></p>
 <ul>

package/templates/emails/calendar-onekite_validator_expired.tpl

@@ -0,0 +1,17 @@
+<p>Bonjour,</p>
+
+<p>Une demande de location de matériel a expiré automatiquement.</p>
+
+<p><strong>Demandeur :</strong> {requesterUsername}</p>
+<p><strong>Raison :</strong> {reason}</p>
+
+<p><strong>Matériel</strong></p>
+<ul>
+<!-- BEGIN itemNames -->
+  <li>{itemNames}</li>
+<!-- END itemNames -->
+</ul>
+
+<p>{dateRange}</p>
+
+<p><a href="{adminUrl}">Ouvrir l'ACP</a></p>

package/templates/emails/calendar-onekite_validator_reminder.tpl

@@ -0,0 +1,16 @@
+<p>Bonjour,</p>
+
+<p>Une demande de location de matériel nécessite une action.</p>
+
+<p><strong>Demandeur :</strong> {requesterUsername}</p>
+
+<p><strong>Matériel</strong></p>
+<ul>
+<!-- BEGIN itemNames -->
+  <li>{itemNames}</li>
+<!-- END itemNames -->
+</ul>
+
+<p>{dateRange}</p>
+
+<p><a href="{adminUrl}">Ouvrir l'ACP (Demandes en attente)</a></p>