nodebb-plugin-onekite-calendar 1.0.27 → 1.0.29

package/lib/api.js

@@ -404,6 +404,7 @@ api.getEvents = async function (req, res) {
 
   const settings = await meta.settings.get('calendar-onekite');
   const canMod = req.uid ? await canValidate(req.uid, settings) : false;
+  const widgetMode = String((req.query && req.query.widget) || '') === '1';
   const canSpecialCreate = req.uid ? await canCreateSpecial(req.uid, settings) : false;
   const canSpecialDelete = req.uid ? await canDeleteSpecial(req.uid, settings) : false;
 
@@ -414,8 +415,37 @@ api.getEvents = async function (req, res) {
   const out = [];
   // Batch fetch = major perf win when there are many reservations.
   const reservations = await dbLayer.getReservations(ids);
+
+  // Username map (needed for widget tooltip: "Réservée par ...")
+  let uidToUsername = {};
+  try {
+    const uids = Array.from(new Set((reservations || [])
+      .map((r) => String((r && r.uid) || ''))
+      .filter(Boolean)));
+    if (uids.length) {
+      let rows = [];
+      if (typeof user.getUsersFields === 'function') {
+        rows = await user.getUsersFields(uids, ['username']);
+        // Some NodeBB versions omit uid in returned rows; re-attach from input order.
+        if (Array.isArray(rows)) {
+          rows = rows.map((row, idx) => (row ? Object.assign({ uid: uids[idx] }, row) : null));
+        }
+      } else {
+        rows = await Promise.all(uids.map(async (uid) => {
+          try { return Object.assign({ uid }, await user.getUserFields(uid, ['username'])); } catch (e) { return { uid, username: '' }; }
+        }));
+      }
+      uidToUsername = (rows || []).reduce((acc, row) => {
+        if (row && row.uid) acc[String(row.uid)] = String(row.username || '');
+        return acc;
+      }, {});
+    }
+  } catch (e) {}
   for (const r of (reservations || [])) {
     if (!r) continue;
+    if (!r.username && r.uid && uidToUsername[String(r.uid)]) {
+      r.username = uidToUsername[String(r.uid)];
+    }
     // Only show active statuses
     if (!['pending', 'awaiting_payment', 'paid'].includes(r.status)) continue;
     const rStart = parseInt(r.start, 10);
@@ -439,6 +469,7 @@ api.getEvents = async function (req, res) {
           status: p.status,
           uid: p.uid,
           canModerate: canMod,
+          ...(widgetMode ? { reservedByUsername: String(r.username || '') } : {}),
         },
       };
       // Only expose username on the event list to owner/moderators.

package/lib/widgets.js

@@ -127,10 +127,41 @@ widgets.renderTwoWeeksWidget = async function (data) {
       tip.innerHTML = html;
     }
 
-    function showTipAt(x, y) {
-      tip.style.left = Math.max(8, x + 12) + 'px';
-      tip.style.top = Math.max(8, y + 12) + 'px';
+    function clamp(n, min, max) {
+      return Math.max(min, Math.min(n, max));
+    }
+
+    function showTipAt(pageX, pageY) {
+      // Robust mobile positioning: keep the tooltip inside the viewport.
+      const pad = 8;
+
+      // Ensure the tooltip is measurable.
+      tip.style.maxWidth = 'calc(100vw - 16px)';
       tip.style.display = 'block';
+      tip.style.visibility = 'hidden';
+
+      const rect = tip.getBoundingClientRect();
+      const vw = window.innerWidth || document.documentElement.clientWidth || 0;
+      const vh = window.innerHeight || document.documentElement.clientHeight || 0;
+      const sx = window.scrollX || window.pageXOffset || 0;
+      const sy = window.scrollY || window.pageYOffset || 0;
+
+      // Default: below the pointer/anchor, centered.
+      let left = pageX - (rect.width / 2);
+      let top = pageY + 12;
+
+      // If it would go below the viewport, try above.
+      if ((top - sy + rect.height) > (vh - pad)) {
+        top = pageY - rect.height - 12;
+      }
+
+      // Clamp inside viewport (document coordinates).
+      left = clamp(left, sx + pad, sx + vw - rect.width - pad);
+      top = clamp(top, sy + pad, sy + vh - rect.height - pad);
+
+      tip.style.left = left + 'px';
+      tip.style.top = top + 'px';
+      tip.style.visibility = 'visible';
     }
 
     function hideTip() {
@@ -241,7 +272,7 @@ widgets.renderTwoWeeksWidget = async function (data) {
         return { domNodes: [wrap] };
       },
       events: function(info, successCallback, failureCallback) {
-        const qs = new URLSearchParams({ start: info.startStr, end: info.endStr });
+        const qs = new URLSearchParams({ start: info.startStr, end: info.endStr, widget: '1' });
         fetch(eventsEndpoint + '?' + qs.toString(), { credentials: 'same-origin' })
           .then((r) => r.json())
           .then((json) => successCallback(json || []))
@@ -279,7 +310,7 @@ dateClick: function() { window.location.href = calUrl; },
           const title = (ep.itemNameLine || ep.title || ev.title || '').toString();
           const statusLabel = (function(s){
             const map = {
-              pending: 'En attente',
+              pending: 'En attente de validation',
               awaiting_payment: 'Validée – paiement en attente',
               paid: 'Payée',
               rejected: 'Rejetée',
@@ -289,8 +320,10 @@ dateClick: function() { window.location.href = calUrl; },
             return map[k] || '';
           });
           const status = (String(ep.type || '') === 'reservation') ? statusLabel(ep.status) : '';
+          const reservedBy = (String(ep.type || '') === 'reservation') ? String(ep.reservedByUsername || '') : '';
           const html = '' +
             '<div style="font-weight:600; margin-bottom:2px;">' + escapeHtml(title) + '</div>' +
+            (reservedBy ? ('<div style="opacity:.85; margin-top:2px; font-size:.85em;">Réservée par ' + escapeHtml(reservedBy) + '.</div>') : '') +
             (status ? ('<div style="opacity:.75; margin-top:2px; font-size:.85em;">' + escapeHtml(status) + '</div>') : '');
 
           // Hover (desktop)

package/package.json

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

package/plugin.json

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

package/public/client.js

@@ -387,7 +387,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
 
   function statusLabel(s) {
     const map = {
-      pending: 'En attente',
+      pending: 'En attente de validation',
       awaiting_payment: 'Validée – paiement en attente',
       paid: 'Payée',
       rejected: 'Rejetée',