nodebb-plugin-onekite-calendar 2.0.53 → 2.0.55

package/lib/widgets.js

@@ -331,7 +331,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 de validation',
+              pending: 'En attente de validation de validation',
               awaiting_payment: 'Validée – paiement en attente',
               paid: 'Payée',
               rejected: 'Rejetée',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.53",
+  "version": "2.0.55",
   "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": "2.0.53"
+  "version": "2.0.55"
 }

package/public/client.js

@@ -549,7 +549,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
 
   function statusLabel(s) {
     const map = {
-      pending: 'En attente de validation',
+      pending: 'En attente de validation de validation',
       awaiting_payment: 'Validée – paiement en attente',
       paid: 'Payée',
       rejected: 'Rejetée',
@@ -1571,15 +1571,17 @@ function toDatetimeLocalValue(date) {
                 const te = `${pad2(e.getHours())}:${pad2(e.getMinutes())}`;
                 const baseTitle = (ev.title || '').trim();
                 // Avoid double prefix on rerenders.
-                // UX request: no clock icon for "prévision de sortie" (outing).
+                // UX request:
+                // - Outing forecast: no time displayed in the calendar title.
+                // - Special event: display only the start time (keep the clock icon).
                 const isOuting = ev.extendedProps.type === 'outing';
-                const prefix = isOuting ? `${ts}-${te} ` : `🕒 ${ts}-${te} `;
+                const prefix = isOuting ? `` : `🕒 ${ts} `;
                 if (isOuting) {
-                  if (!/^\d{2}:\d{2}-\d{2}:\d{2}\s/.test(baseTitle)) {
-                    ev.title = `${prefix}${baseTitle}`.trim();
-                  }
+                  // No prefix for outings.
+                  ev.title = `${baseTitle}`.trim();
                 } else {
-                  if (!baseTitle.startsWith('🕒 ')) {
+                  // Prefix only if not already present.
+                  if (!/^🕒\s\d{2}:\d{2}\s/.test(baseTitle)) {
                     ev.title = `${prefix}${baseTitle}`.trim();
                   }
                 }

package/templates/calendar-onekite.tpl

@@ -3,7 +3,7 @@
     <div class="col-12">
       <h1>Calendrier</h1>
       <div class="onekite-calendar-legend" aria-label="Légende des couleurs" style="margin:.25rem 0 .75rem;">
-        <span class="onekite-legend-item"><span class="onekite-legend-dot" style="background:#f39c12"></span>En attente</span>
+        <span class="onekite-legend-item"><span class="onekite-legend-dot" style="background:#f39c12"></span>En attente de validation</span>
         <span class="onekite-legend-item"><span class="onekite-legend-dot" style="background:#d35400"></span>Paiement en attente</span>
         <span class="onekite-legend-item"><span class="onekite-legend-dot" style="background:#27ae60"></span>Payée</span>
         <span class="onekite-legend-item"><span class="onekite-legend-dot" style="background:#8e44ad"></span>Évènement</span>