nodebb-plugin-onekite-calendar 2.0.73 → 2.0.75

package/lib/api.js

@@ -778,7 +778,7 @@ api.getCapabilities = async function (req, res) {
     isValidator: canMod,
     canCreateSpecial: canSpecialC,
     canDeleteSpecial: canSpecialD,
-    canCreateOuting: canReq,
+    canCreateOuting: canMod || canReq,
     canCreateReservation: canReq,
     specialEventCategoryCid: parseInt(settings && settings.specialEventCategoryId, 10) || 0,
   });
@@ -938,7 +938,7 @@ api.getOutingDetails = async function (req, res) {
   });
 
   const participants = normalizeUidList(o.participants);
-  const canEditOuting = uid ? await canRequest(uid, settings, Date.now()) : false;
+  const canEditOuting = uid ? (canMod || await canRequest(uid, settings, Date.now())) : false;
   const out = {
     oid: o.oid,
     title: o.title || '',
@@ -967,8 +967,7 @@ api.joinOuting = async function (req, res) {
   const settings = await getSettings();
   const uid = req.uid;
   if (!uid) return res.status(401).json({ error: 'not-logged-in' });
-  // Outings share the same rights as reservations/locations.
-  const ok = await canRequest(uid, settings, Date.now());
+  const ok = (await canValidate(uid, settings)) || (await canRequest(uid, settings, Date.now()));
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
   const oid = String(req.params.oid || '').replace(/^outing:/, '').trim();
@@ -999,8 +998,7 @@ api.leaveOuting = async function (req, res) {
   const settings = await getSettings();
   const uid = req.uid;
   if (!uid) return res.status(401).json({ error: 'not-logged-in' });
-  // Outings share the same rights as reservations/locations.
-  const ok = await canRequest(uid, settings, Date.now());
+  const ok = (await canValidate(uid, settings)) || (await canRequest(uid, settings, Date.now()));
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
   const oid = String(req.params.oid || '').replace(/^outing:/, '').trim();
@@ -1032,12 +1030,9 @@ api.createOuting = async function (req, res) {
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
 
   const startTs = toTs(req.body && req.body.start);
-  // Permissions for outings must match reservations/locations rights.
-  // We intentionally base the "auto" yearly group on the *current* year,
-  // not on the outing date, so members can plan future outings without
-  // requiring next-year group membership.
-  const ok = await canRequest(req.uid, settings, Date.now());
-  if (!ok) {
+  const isValidatorForOuting = await canValidate(req.uid, settings);
+  const canMakeOuting = isValidatorForOuting || (await canRequest(req.uid, settings, Date.now()));
+  if (!canMakeOuting) {
     return res.status(403).json({
       error: 'not-allowed',
       code: 'NOT_MEMBER',
@@ -1051,18 +1046,20 @@ api.createOuting = async function (req, res) {
     return res.status(400).json({ error: 'bad-dates' });
   }
 
-  // Business rule: nothing can be created in the past.
-  try {
-    const today0 = new Date();
-    today0.setHours(0, 0, 0, 0);
-    const today0ts = today0.getTime();
-    if (startTs < today0ts) {
-      return res.status(400).json({
-        error: 'date-too-soon',
-        message: "Impossible de créer pour une date passée.",
-      });
-    }
-  } catch (e) {}
+  // Validators can create outings in the past (regularization); others cannot.
+  if (!isValidatorForOuting) {
+    try {
+      const today0 = new Date();
+      today0.setHours(0, 0, 0, 0);
+      const today0ts = today0.getTime();
+      if (startTs < today0ts) {
+        return res.status(400).json({
+          error: 'date-too-soon',
+          message: "Impossible de créer pour une date passée.",
+        });
+      }
+    } catch (e) {}
+  }
 
   const address = String((req.body && req.body.address) || '').trim();
   const notes = String((req.body && req.body.notes) || '').trim();
@@ -1122,7 +1119,7 @@ api.deleteOuting = async function (req, res) {
 api.updateOuting = async function (req, res) {
   const settings = await getSettings();
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
-  const ok = await canRequest(req.uid, settings, Date.now());
+  const ok = (await canValidate(req.uid, settings)) || (await canRequest(req.uid, settings, Date.now()));
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
   const oid = String(req.params.oid || '').replace(/^outing:/, '').trim();
@@ -1465,6 +1462,22 @@ api.createReservation = async function (req, res) {
   res.json({ ok: true, rid, status: resv.status, autoPaid: !!(isValidatorFree || isRegularization) });
 };
 
+api.searchUsers = async function (req, res) {
+  const uid = req.uid;
+  if (!uid) return res.status(401).json({ error: 'not-logged-in' });
+  const settings = await getSettings();
+  if (!(await canValidate(uid, settings))) return res.status(403).json({ error: 'not-allowed' });
+  const q = String(req.query.q || '').trim();
+  if (q.length < 2) return res.json([]);
+  try {
+    const result = await user.search({ query: q, searchBy: 'username', resultsPerPage: 8, uid });
+    const list = (result && result.users) ? result.users : [];
+    return res.json(list.map(u => ({ uid: u.uid, username: u.username })));
+  } catch (e) {
+    return res.json([]);
+  }
+};
+
 // Validator actions (from calendar popup)
 api.approveReservation = async function (req, res) {
   const uid = req.uid;

package/library.js

@@ -65,6 +65,7 @@ Plugin.init = async function (params) {
   router.get('/api/v3/plugins/calendar-onekite/events', ...publicExpose, api.getEvents);
   router.get('/api/v3/plugins/calendar-onekite/items', ...publicExpose, api.getItems);
   router.get('/api/v3/plugins/calendar-onekite/capabilities', ...publicExpose, api.getCapabilities);
+  router.get('/api/v3/plugins/calendar-onekite/users/search', ...publicExpose, api.searchUsers);
 
   // Maintenance / audit (restricted to validator groups)
   router.get('/api/v3/plugins/calendar-onekite/maintenance', ...publicExpose, api.getMaintenance);

package/package.json

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

package/public/client.js

@@ -821,6 +821,107 @@ async function searchAddresses(query, limit) {
   }).filter(h => h && h.displayName);
 }
 
+async function searchUsers(q, limit) {
+  try {
+    const qs = new URLSearchParams({ q: String(q || ''), limit: String(limit || 8) });
+    const arr = await fetchJson(`/api/v3/plugins/calendar-onekite/users/search?${qs}`);
+    if (!Array.isArray(arr)) return [];
+    return arr;
+  } catch (e) {
+    return [];
+  }
+}
+
+function attachUserAutocomplete(inputEl) {
+  if (!inputEl) return;
+  if (inputEl.getAttribute('data-onekite-user-ac') === '1') return;
+  inputEl.setAttribute('data-onekite-user-ac', '1');
+
+  const host = inputEl.parentNode || document.body;
+  try {
+    const cs = window.getComputedStyle(host);
+    if (!cs || cs.position === 'static') host.style.position = 'relative';
+  } catch (e) {
+    host.style.position = 'relative';
+  }
+
+  const menu = document.createElement('div');
+  menu.className = 'onekite-autocomplete-menu';
+  menu.style.position = 'absolute';
+  menu.style.left = '0';
+  menu.style.right = '0';
+  menu.style.top = '100%';
+  menu.style.zIndex = '2000';
+  menu.style.background = '#fff';
+  menu.style.border = '1px solid rgba(0,0,0,.15)';
+  menu.style.borderTop = '0';
+  menu.style.maxHeight = '220px';
+  menu.style.overflowY = 'auto';
+  menu.style.display = 'none';
+  menu.style.borderRadius = '0 0 .375rem .375rem';
+  host.appendChild(menu);
+
+  let timer = null;
+  let busy = false;
+
+  function hide() { menu.style.display = 'none'; menu.innerHTML = ''; }
+
+  function show(hits) {
+    if (!hits || !hits.length) { hide(); return; }
+    menu.innerHTML = '';
+    hits.forEach((h) => {
+      const btn = document.createElement('button');
+      btn.type = 'button';
+      btn.className = 'onekite-autocomplete-item';
+      btn.textContent = h.username;
+      btn.style.display = 'block';
+      btn.style.width = '100%';
+      btn.style.textAlign = 'left';
+      btn.style.padding = '.35rem .5rem';
+      btn.style.border = '0';
+      btn.style.background = 'transparent';
+      btn.style.cursor = 'pointer';
+      btn.addEventListener('click', () => { inputEl.value = h.username; hide(); });
+      btn.addEventListener('mouseenter', () => { btn.style.background = 'rgba(0,0,0,.05)'; });
+      btn.addEventListener('mouseleave', () => { btn.style.background = 'transparent'; });
+      menu.appendChild(btn);
+    });
+    menu.style.display = 'block';
+  }
+
+  async function run(q) {
+    if (busy) return;
+    busy = true;
+    try {
+      const hits = await searchUsers(q, 8);
+      if (String(inputEl.value || '').trim() !== q) return;
+      show(hits);
+    } catch (e) {
+      hide();
+    } finally {
+      busy = false;
+    }
+  }
+
+  inputEl.addEventListener('input', () => {
+    const q = String(inputEl.value || '').trim();
+    if (timer) clearTimeout(timer);
+    if (q.length < 2) { hide(); return; }
+    timer = setTimeout(() => run(q), 250);
+  });
+
+  inputEl.addEventListener('focus', () => {
+    const q = String(inputEl.value || '').trim();
+    if (q.length >= 2) { if (timer) clearTimeout(timer); timer = setTimeout(() => run(q), 150); }
+  });
+
+  document.addEventListener('click', (e) => {
+    try { if (!host.contains(e.target)) hide(); } catch (err) {}
+  });
+
+  inputEl.addEventListener('keydown', (e) => { if (e.key === 'Escape') hide(); });
+}
+
 function attachAddressAutocomplete(inputEl, onPick) {
   if (!inputEl) return;
   // Avoid double attach
@@ -1187,6 +1288,10 @@ function toDatetimeLocalValue(date) {
 
       // live total update
       setTimeout(() => {
+        if (isValidatorMode) {
+          attachUserAutocomplete(document.getElementById('onekite-target-username'));
+        }
+
         const totalEl = document.getElementById('onekite-total');
         const periodEl = document.getElementById('onekite-period');
         const daysEl = document.getElementById('onekite-days');