nodebb-plugin-equipment-calendar 8.1.2 → 8.1.7

package/library.js

@@ -72,6 +72,28 @@ function parseDateInput(v) {
 }
 
 
+function formatDateTimeFR(ms) {
+  const n = Number(ms || 0);
+  if (!n) return '';
+  try {
+    return new Date(n).toLocaleString('fr-FR', {
+      timeZone: 'Europe/Paris',
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit',
+      hour12: false,
+    }).replace(',', ' :');
+  } catch (e) {
+    const d = new Date(n);
+    const pad = (x) => String(x).padStart(2,'0');
+    return `${pad(d.getDate())}/${pad(d.getMonth()+1)}/${d.getFullYear()} : ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+  }
+}
+
+
+
 const axios = require('axios');
 const { DateTime } = require('luxon');
 const { v4: uuidv4 } = require('uuid');
@@ -607,7 +629,7 @@ function toEvent(res, item, requesterName, canSeeRequester) {
     title: titleParts.join(' '),
     start,
     end,
-    allDay: false,
+    allDay: true,
     className,
     extendedProps: {
       status: res.status,
@@ -1236,6 +1258,9 @@ async function handleCreateReservation(req, res) {
     let endMs = Date.UTC(end.getUTCFullYear(), end.getUTCMonth(), end.getUTCDate());
     if (endMs <= startMs) endMs = startMs + 24 * 60 * 60 * 1000;
 
+    const endMsInclusive = endMs;
+    const endMsExclusive = endMsInclusive + 24 * 60 * 60 * 1000;
+    endMs = endMsExclusive;
     const days = Math.max(1, Math.round((endMs - startMs) / (24 * 60 * 60 * 1000)));
 
     const items = await getActiveItems(settings);
@@ -1260,7 +1285,7 @@ async function handleCreateReservation(req, res) {
         startMs,
         endMs,
         startIso: new Date(startMs).toISOString().slice(0, 10),
-        endIso: new Date(endMs).toISOString().slice(0, 10),
+        endIso: new Date(endMs - 24*60*60*1000).toISOString().slice(0, 10),
         days,
         unitPrice,
         total,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "8.1.2",
+  "version": "8.1.7",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {

package/plugin.json

@@ -25,6 +25,6 @@
   "scripts": [
     "public/js/client.js"
   ],
-  "version": "3.0.0-stable4c-datefix",
+  "version": "3.0.0-stable4e-delete-rangefix",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -28,7 +28,17 @@ require(['jquery', 'bootstrap'], function ($, bootstrap) {
     return days > 0 ? days : 1;
   }
 
-  function updateTotalPrice() {
+  
+  function ecSubtractOneDay(iso) {
+    try {
+      if (!iso) return iso;
+      const d = new Date(iso + 'T00:00:00Z');
+      d.setUTCDate(d.getUTCDate() - 1);
+      return d.toISOString().slice(0,10);
+    } catch (e) { return iso; }
+  }
+
+function updateTotalPrice() {
     try {
       const sel = document.getElementById('ec-item-ids');
       const out = document.getElementById('ec-total');
@@ -41,7 +51,7 @@ require(['jquery', 'bootstrap'], function ($, bootstrap) {
       let days = 1;
       if (start && end) {
         const ms = end.getTime() - start.getTime();
-        days = Math.max(1, Math.round(ms / (24 * 60 * 60 * 1000)));
+        days = Math.max(1, Math.round(ms / (24 * 60 * 60 * 1000)) + 1);
       }
 
       let sum = 0;

package/public/templates/admin/plugins/equipment-calendar-reservations.tpl

@@ -42,19 +42,14 @@
   {{{ if hasRows }}}
   <div class="table-responsive">
     <table class="table table-striped align-middle">
-      <thead>
-        <tr>
-          <th>RID</th>
-          <th>Matériel</th>
-          <th>UID</th>
-          <th>Début</th>
-          <th>Fin</th>
-          <th>Statut</th>
-          <th>Créé</th>
-          <th>Note</th>
-          <th>Actions</th>
-        </tr>
-      </thead>
+      <thead><tr>
+  <th>Matériel</th>
+  <th>Période</th>
+  <th>Créée le</th>
+  <th>Statut</th>
+  <th>Total</th>
+  <th class="text-end">Actions</th>
+</tr></thead>
       <tbody>
         {{{ each rows }}}
         <tr>