nodebb-plugin-calendar-onekite 11.2.2 → 11.2.4

package/package.json

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

package/public/client.js

@@ -3,6 +3,27 @@
 define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alerts, bootbox, hooks) {
   'use strict';
 
+  // Ensure small UI tweaks are applied even when themes override bootstrap defaults.
+  (function ensureOneKiteStyles() {
+    try {
+      if (document.getElementById('onekite-inline-styles')) return;
+      const style = document.createElement('style');
+      style.id = 'onekite-inline-styles';
+      style.textContent = `
+        /* Fix clipped time text in selects on desktop */
+        .onekite-time-select.form-select {
+          min-height: 38px;
+          padding-top: .375rem;
+          padding-bottom: .375rem;
+          line-height: 1.25;
+        }
+      `;
+      document.head.appendChild(style);
+    } catch (e) {
+      // ignore
+    }
+  })();
+
   // Prevent the reservation dialog from opening twice due to select/dateClick
   // interactions or quick re-renders.
   let isDialogOpen = false;
@@ -16,9 +37,78 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       .replace(/'/g, ''');
   }
 
+  function pad2(n) { return String(n).padStart(2, '0'); }
+
+  function toDateInputValue(d) {
+    const dt = (d instanceof Date) ? d : new Date(d);
+    return `${dt.getFullYear()}-${pad2(dt.getMonth() + 1)}-${pad2(dt.getDate())}`;
+  }
+
+  function roundTo5Minutes(dt) {
+    const d = new Date(dt);
+    const m = d.getMinutes();
+    const rounded = Math.round(m / 5) * 5;
+    d.setMinutes(rounded, 0, 0);
+    return d;
+  }
+
+  function timeString(dt) {
+    const d = (dt instanceof Date) ? dt : new Date(dt);
+    return `${pad2(d.getHours())}:${pad2(d.getMinutes())}`;
+  }
+
+  function buildLocalDatetime(dateStr, timeStr) {
+    return `${dateStr}T${timeStr}`;
+  }
+
+  function seTimeOptions(selected, include2359) {
+    const opts = [];
+    for (let h = 7; h < 24; h++) {
+      for (let m = 0; m < 60; m += 5) {
+        const t = `${pad2(h)}:${pad2(m)}`;
+        opts.push(`<option value="${t}" ${t === selected ? 'selected' : ''}>${t}</option>`);
+      }
+    }
+    if (include2359) {
+      const t = '23:59';
+      opts.push(`<option value="${t}" ${t === selected ? 'selected' : ''}>${t}</option>`);
+    }
+    return opts.join('');
+  }
+
   async function openSpecialEventDialog(selectionInfo) {
     const start = selectionInfo.start;
     const end = selectionInfo.end;
+
+    // Prefer event times starting at 07:00 for day-clicks (all-day selections).
+    let seStart = new Date(start);
+    let seEnd = new Date(end);
+
+    const isAllDayClick = selectionInfo && (selectionInfo.allDay || (
+      seStart.getHours() === 0 && seStart.getMinutes() === 0 &&
+      seEnd.getHours() === 0 && seEnd.getMinutes() === 0 &&
+      Math.abs(seEnd.getTime() - seStart.getTime() - 24 * 60 * 60 * 1000) < 1000
+    ));
+
+    if (isAllDayClick) {
+      // Keep same day; default start at 07:00 and end at 23:59
+      seStart.setHours(7, 0, 0, 0);
+      seEnd = new Date(seStart);
+      seEnd.setHours(23, 59, 0, 0);
+    } else {
+      seStart = roundTo5Minutes(seStart);
+      seEnd = roundTo5Minutes(seEnd);
+      if (seStart.getHours() < 7) {
+        seStart.setHours(7, 0, 0, 0);
+        if (seEnd <= seStart) {
+          seEnd = new Date(seStart);
+          seEnd.setHours(8, 0, 0, 0);
+        }
+      }
+    }
+
+    const seStartTime = timeString(seStart);
+    const seEndTime = timeString(seEnd);
     const html = `
       <div class="mb-3">
         <label class="form-label">Titre</label>
@@ -27,11 +117,25 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       <div class="row g-2">
         <div class="col-12 col-md-6">
           <label class="form-label">Début</label>
-          <input type="datetime-local" class="form-control" id="onekite-se-start" value="${escapeHtml(toDatetimeLocalValue(start))}" />
+          <div class="row g-2">
+            <div class="col-7">
+              <input type="date" class="form-control" id="onekite-se-start-date" value="${escapeHtml(toDateInputValue(seStart))}" />
+            </div>
+            <div class="col-5">
+              <select class="form-select onekite-time-select" id="onekite-se-start-time">${seTimeOptions(seStartTime, false)}</select>
+            </div>
+          </div>
         </div>
         <div class="col-12 col-md-6">
           <label class="form-label">Fin</label>
-          <input type="datetime-local" class="form-control" id="onekite-se-end" value="${escapeHtml(toDatetimeLocalValue(end))}" />
+          <div class="row g-2">
+            <div class="col-7">
+              <input type="date" class="form-control" id="onekite-se-end-date" value="${escapeHtml(toDateInputValue(seEnd))}" />
+            </div>
+            <div class="col-5">
+              <select class="form-select onekite-time-select" id="onekite-se-end-time">${seTimeOptions(seEndTime, true)}</select>
+            </div>
+          </div>
         </div>
       </div>
       <div class="mt-3">
@@ -65,8 +169,12 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
             className: 'btn-primary',
             callback: () => {
               const title = (document.getElementById('onekite-se-title')?.value || '').trim();
-              const startVal = (document.getElementById('onekite-se-start')?.value || '').trim();
-              const endVal = (document.getElementById('onekite-se-end')?.value || '').trim();
+              const sd = (document.getElementById('onekite-se-start-date')?.value || '').trim();
+              const st = (document.getElementById('onekite-se-start-time')?.value || '').trim();
+              const ed = (document.getElementById('onekite-se-end-date')?.value || '').trim();
+              const et = (document.getElementById('onekite-se-end-time')?.value || '').trim();
+              const startVal = (sd && st) ? buildLocalDatetime(sd, st) : '';
+              const endVal = (ed && et) ? buildLocalDatetime(ed, et) : '';
               const address = (document.getElementById('onekite-se-address')?.value || '').trim();
               const notes = (document.getElementById('onekite-se-notes')?.value || '').trim();
               const lat = (document.getElementById('onekite-se-lat')?.value || '').trim();
@@ -848,7 +956,16 @@ function toDatetimeLocalValue(date) {
           } else if (code === '409') {
             showAlert('error', 'Impossible : au moins un matériel est déjà réservé ou en attente sur cette période.');
           } else {
-            const msg = payload && (payload.message || payload.error || payload.msg) ? String(payload.message || payload.error || payload.msg) : '';
+            const msgRaw = payload && (payload.message || payload.error || payload.msg)
+              ? String(payload.message || payload.error || payload.msg)
+              : '';
+
+            // NodeBB can return a plain "not-logged-in" string when the user is not authenticated.
+            // We want a user-friendly message consistent with the membership requirement.
+            const msg = (/\bnot-logged-in\b/i.test(msgRaw) || /\[\[error:not-logged-in\]\]/i.test(msgRaw))
+              ? 'Vous devez être adhérent Onekite'
+              : msgRaw;
+
             showAlert('error', msg || ((e && (e.status === 401 || e.status === 403)) ? 'Vous devez être adhérent Onekite' : 'Erreur lors de la création de la demande.'));
           }
           calendar.unselect();