nodebb-plugin-calendar-onekite 11.1.89 → 11.1.90

package/lib/admin.js

@@ -116,6 +116,15 @@ admin.approveReservation = async function (req, res) {
   r.pickupLon = String((req.body && req.body.pickupLon) || '').trim();
   r.approvedAt = Date.now();
 
+  try {
+    const approver = await user.getUserFields(req.uid, ['username']);
+    r.approvedBy = req.uid;
+    r.approvedByUsername = approver && approver.username ? approver.username : '';
+  } catch (e) {
+    r.approvedBy = req.uid;
+    r.approvedByUsername = '';
+  }
+
   // Create HelloAsso payment link if configured
   const settings = await meta.settings.get('calendar-onekite');
   const env = settings.helloassoEnv || 'prod';
@@ -184,6 +193,8 @@ admin.approveReservation = async function (req, res) {
         pickupLat: r.pickupLat || '',
         pickupLon: r.pickupLon || '',
         mapUrl,
+        validatedBy: r.approvedByUsername || '',
+        validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/users/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
       });
     }
   } catch (e) {}

package/lib/api.js

@@ -210,6 +210,8 @@ function eventsFor(resv) {
         rid: resv.rid,
         status,
         uid: resv.uid,
+        approvedBy: resv.approvedBy || 0,
+        approvedByUsername: resv.approvedByUsername || '',
         itemIds: itemIds.filter(Boolean),
         itemNames: itemNames.filter(Boolean),
         itemIdLine: itemId,
@@ -545,6 +547,14 @@ api.approveReservation = async function (req, res) {
   r.pickupLat = String((req.body && req.body.pickupLat) || '').trim();
   r.pickupLon = String((req.body && req.body.pickupLon) || '').trim();
   r.approvedAt = Date.now();
+  try {
+    const approver = await user.getUserFields(uid, ['username']);
+    r.approvedBy = uid;
+    r.approvedByUsername = approver && approver.username ? approver.username : '';
+  } catch (e) {
+    r.approvedBy = uid;
+    r.approvedByUsername = '';
+  }
   // Create HelloAsso payment link on validation
   try {
     const settings2 = await meta.settings.get('calendar-onekite');
@@ -613,6 +623,8 @@ api.approveReservation = async function (req, res) {
       pickupLon: r.pickupLon || '',
       mapUrl,
       paymentUrl: r.paymentUrl || '',
+      validatedBy: r.approvedByUsername || '',
+      validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/users/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
     });
   }
   return res.json({ ok: true });

package/package.json

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

package/public/client.js

@@ -105,6 +105,13 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           }
           const geocodeBtn = document.getElementById('onekite-se-geocode');
           const addrInput = document.getElementById('onekite-se-address');
+          try {
+            attachAddressAutocomplete(addrInput, (h) => {
+              if (h && Number.isFinite(h.lat) && Number.isFinite(h.lon)) {
+                setMarker(h.lat, h.lon);
+              }
+            });
+          } catch (e) {}
           geocodeBtn?.addEventListener('click', async () => {
             const q = (addrInput?.value || '').trim();
             if (!q) return;
@@ -298,6 +305,145 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     return { lat, lon, displayName: hit.display_name || q };
   }
 
+async function searchAddresses(query, limit) {
+  const q = String(query || '').trim();
+  const lim = Math.min(10, Math.max(1, Number(limit) || 5));
+  if (q.length < 3) return [];
+  const url = `https://nominatim.openstreetmap.org/search?format=jsonv2&addressdetails=1&limit=${lim}&q=${encodeURIComponent(q)}`;
+  const res = await fetch(url, {
+    method: 'GET',
+    headers: {
+      'Accept': 'application/json',
+      'Accept-Language': 'fr',
+    },
+  });
+  if (!res.ok) return [];
+  const arr = await res.json();
+  if (!Array.isArray(arr)) return [];
+  return arr.map((hit) => {
+    const lat = Number(hit.lat);
+    const lon = Number(hit.lon);
+    return {
+      displayName: hit.display_name || q,
+      lat: Number.isFinite(lat) ? lat : null,
+      lon: Number.isFinite(lon) ? lon : null,
+    };
+  }).filter(h => h && h.displayName);
+}
+
+function attachAddressAutocomplete(inputEl, onPick) {
+  if (!inputEl) return;
+  // Avoid double attach
+  if (inputEl.getAttribute('data-onekite-autocomplete') === '1') return;
+  inputEl.setAttribute('data-onekite-autocomplete', '1');
+
+  const wrapper = document.createElement('div');
+  wrapper.style.position = 'relative';
+  inputEl.parentNode && inputEl.parentNode.insertBefore(wrapper, inputEl);
+  wrapper.appendChild(inputEl);
+
+  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';
+  wrapper.appendChild(menu);
+
+  let timer = null;
+  let lastQuery = '';
+  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.displayName;
+      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.displayName;
+        hide();
+        try { onPick && onPick(h); } catch (e) {}
+      });
+      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 searchAddresses(q, 6);
+      // Don't show stale results
+      if (String(inputEl.value || '').trim() !== q) return;
+      show(hits);
+    } catch (e) {
+      hide();
+    } finally {
+      busy = false;
+    }
+  }
+
+  inputEl.addEventListener('input', () => {
+    const q = String(inputEl.value || '').trim();
+    lastQuery = q;
+    if (timer) clearTimeout(timer);
+    if (q.length < 3) {
+      hide();
+      return;
+    }
+    timer = setTimeout(() => run(lastQuery), 250);
+  });
+
+  inputEl.addEventListener('focus', () => {
+    const q = String(inputEl.value || '').trim();
+    if (q.length >= 3) {
+      if (timer) clearTimeout(timer);
+      timer = setTimeout(() => run(q), 150);
+    }
+  });
+
+  // Close when clicking outside
+  document.addEventListener('click', (e) => {
+    try {
+      if (!wrapper.contains(e.target)) hide();
+    } catch (err) {}
+  });
+
+  inputEl.addEventListener('keydown', (e) => {
+    if (e.key === 'Escape') hide();
+  });
+}
+
+
   async function loadItems() {
     try {
       return await fetchJson('/api/v3/plugins/calendar-onekite/items');
@@ -721,6 +867,11 @@ function toDatetimeLocalValue(date) {
       })();
         const period = `${formatDt(ev.start)} → ${formatDt(ev.end)}`;
 
+        const approvedBy = String(p.approvedByUsername || '').trim();
+        const validatedByHtml = approvedBy
+          ? `<div class=\"mb-2\"><strong>Validée par</strong><br><a href=\"https://www.onekite.com/users/${encodeURIComponent(approvedBy)}\">${escapeHtml(approvedBy)}</a></div>`
+          : '';
+
         // Pickup details (address / time / notes) shown once validated
         const pickupAddress = String(p.pickupAddress || '').trim();
         const pickupTime = String(p.pickupTime || '').trim();
@@ -750,6 +901,7 @@ function toDatetimeLocalValue(date) {
           ${userLine}
           <div class="mb-2"><strong>Matériel</strong><br>${itemsHtml}</div>
           <div class="mb-2"><strong>Période</strong><br>${period}</div>
+          ${validatedByHtml}
           ${pickupHtml}
           <div class="text-muted" style="font-size: 12px;">Statut: ${statusLabel(status)}</div>
         `;
@@ -919,6 +1071,14 @@ function toDatetimeLocalValue(date) {
                   const geocodeBtn = document.getElementById('onekite-geocode');
                   const addrInput = document.getElementById('onekite-pickup-address');
 
+                  try {
+                    attachAddressAutocomplete(addrInput, (h) => {
+                      if (h && Number.isFinite(h.lat) && Number.isFinite(h.lon)) {
+                        setMarker(h.lat, h.lon, 16);
+                      }
+                    });
+                  } catch (e) {}
+
                   async function runGeocode() {
                     try {
                       const addr = (addrInput?.value || '').trim();
@@ -1013,11 +1173,14 @@ function toDatetimeLocalValue(date) {
         if (canCreateSpecial) {
           const modeBtn = document.createElement('button');
           modeBtn.type = 'button';
-          modeBtn.className = 'btn btn-sm btn-outline-primary';
+          modeBtn.className = 'btn btn-sm btn-outline-warning onekite-mode-btn';
           function refreshModeBtn() {
             const isSpecial = mode === 'special';
             modeBtn.textContent = isSpecial ? 'Mode évènement ✓' : 'Mode évènement';
             modeBtn.classList.toggle('active', isSpecial);
+            // Make the button visually distinct from the view buttons
+            modeBtn.classList.toggle('btn-warning', isSpecial);
+            modeBtn.classList.toggle('btn-outline-warning', !isSpecial);
           }
           modeBtn.addEventListener('click', () => {
             mode = (mode === 'special') ? 'reservation' : 'special';

package/templates/calendar-onekite.tpl

@@ -18,6 +18,16 @@
 
 
 <style>
+  /* Make the custom "Évènement" button distinct from view buttons */
+  .fc .fc-newSpecial-button {
+    background: #8e44ad;
+    border-color: #8e44ad;
+    color: #fff;
+  }
+  .fc .fc-newSpecial-button:hover {
+    filter: brightness(0.95);
+  }
+
   /* Mobile tweaks for FullCalendar */
   @media (max-width: 576px) {
     #onekite-calendar { margin-top: .5rem !important; }

package/templates/emails/calendar-onekite_approved.tpl

@@ -1,6 +1,10 @@
 <p>Bonjour {username},</p>
 <p>Votre réservation a été validée.</p>
 
+<!-- IF validatedBy -->
+<p><strong>Validée par :</strong> <a href="{validatedByUrl}">{validatedBy}</a></p>
+<!-- ENDIF validatedBy -->
+
 <p><strong>Matériel</strong></p>
 <ul>
 <!-- BEGIN itemNames -->