nodebb-plugin-equipment-calendar 0.1.0 → 0.1.2

package/library.js

@@ -350,6 +350,7 @@ plugin.init = async function (params) {
       title: 'Paiement',
       rid: req.query.rid || '',
       status: req.query.status || 'ok',
+      statusError: String(req.query.status || '') === 'error',
     });
   });
 
@@ -389,6 +390,10 @@ async function renderAdminPage(req, res) {
   res.render('admin/plugins/equipment-calendar', {
     title: 'Equipment Calendar',
     settings,
+    view_dayGridMonth: (settings.defaultView || 'dayGridMonth') === 'dayGridMonth',
+    view_timeGridWeek: (settings.defaultView || '') === 'timeGridWeek',
+    view_timeGridDay: (settings.defaultView || '') === 'timeGridDay',
+    view_showRequesterToAll: String(settings.showRequesterToAll || '0') === '1',
   });
 }
 
@@ -397,10 +402,13 @@ async function renderCalendarPage(req, res) {
   const settings = await getSettings();
   const items = parseItems(settings.itemsJson).filter(i => i.active);
 
+  const rawItems = items;
+
   const tz = settings.timezone || 'Europe/Paris';
 
-  const itemId = String(req.query.itemId || (items[0]?.id || '')).trim();
-  const chosenItem = items.find(i => i.id === itemId) || items[0] || null;
+  const itemId = String(req.query.itemId || (rawItems[0]?.id || '')).trim();
+  const chosenItem = rawItems.find(i => i.id === itemId) || rawItems[0] || null;
+  const itemsView = rawItems.map(it => ({ ...it, selected: chosenItem ? it.id === chosenItem.id : false }));
 
   // Determine range to render
   const now = DateTime.now().setZone(tz);
@@ -437,7 +445,7 @@ async function renderCalendarPage(req, res) {
 
   res.render('equipment-calendar/calendar', {
     title: 'Réservation de matériel',
-    items,
+    items: itemsView,
     chosenItemId: chosenItem ? chosenItem.id : '',
     chosenItemName: chosenItem ? chosenItem.name : '',
     chosenItemPriceCents: chosenItem ? chosenItem.priceCents : 0,
@@ -499,6 +507,7 @@ async function renderApprovalsPage(req, res) {
   res.render('equipment-calendar/approvals', {
     title: 'Validation des réservations',
     rows,
+    hasRows: Array.isArray(rows) && rows.length > 0,
     csrf: req.csrfToken,
   });
 }

package/package.json

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

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

@@ -26,7 +26,7 @@
           <input id="notifyGroup" class="form-control" value="{{settings.notifyGroup}}">
         </div>
         <div class="form-check">
-          <input class="form-check-input" type="checkbox" id="showRequesterToAll" {{#if (eq settings.showRequesterToAll "1")}}checked{{/if}}>
+          <input class="form-check-input" type="checkbox" id="showRequesterToAll" {{#if view_showRequesterToAll}}checked{{/if}}>
           <label class="form-check-label" for="showRequesterToAll">Afficher le demandeur à tout le monde</label>
         </div>
       </div>
@@ -49,9 +49,9 @@
         <h5>Calendrier</h5>
         <div class="mb-3"><label class="form-label">Vue par défaut</label>
           <select id="defaultView" class="form-select">
-            <option value="dayGridMonth" {{#if (eq settings.defaultView "dayGridMonth")}}selected{{/if}}>Mois</option>
-            <option value="timeGridWeek" {{#if (eq settings.defaultView "timeGridWeek")}}selected{{/if}}>Semaine</option>
-            <option value="timeGridDay" {{#if (eq settings.defaultView "timeGridDay")}}selected{{/if}}>Jour</option>
+            <option value="dayGridMonth" {{#if view_dayGridMonth}}selected{{/if}}>Mois</option>
+            <option value="timeGridWeek" {{#if view_timeGridWeek}}selected{{/if}}>Semaine</option>
+            <option value="timeGridDay" {{#if view_timeGridDay}}selected{{/if}}>Jour</option>
           </select>
         </div>
         <div class="mb-3"><label class="form-label">Timezone</label><input id="timezone" class="form-control" value="{{settings.timezone}}"></div>

package/public/templates/equipment-calendar/approvals.tpl

@@ -1,7 +1,7 @@
 <div class="equipment-approvals-page">
   <h1>Validation des réservations</h1>
 
-  {{#if rows.length}}
+  {{#if hasRows}}
   <div class="table-responsive">
     <table class="table table-striped align-middle">
       <thead>
@@ -16,7 +16,7 @@
         </tr>
       </thead>
       <tbody>
-        {{#rows}}
+        {{#each rows}}
         <tr>
           <td>{{itemName}}</td>
           <td>{{requester}}</td>
@@ -41,7 +41,7 @@
             </form>
           </td>
         </tr>
-        {{/rows}}
+        {{/each}}
       </tbody>
     </table>
   </div>

package/public/templates/equipment-calendar/calendar.tpl

@@ -6,9 +6,9 @@
       <div>
         <label class="form-label">Matériel</label>
         <select name="itemId" class="form-select" onchange="this.form.submit()">
-          {{#items}}
-          <option value="{{id}}" {{#if (eq ../chosenItemId id)}}selected{{/if}}>{{name}} — {{location}}</option>
-          {{/items}}
+          {{#each items}}
+          <option value="{{id}}" {{#if selected}}selected{{/if}}>{{name}} — {{location}}</option>
+          {{/each}}
         </select>
       </div>
       <div class="text-muted small">
@@ -55,13 +55,16 @@
 <script src="/plugins/nodebb-plugin-equipment-calendar/lib/client.js"></script>
 
 <script>
-  window.EC_EVENTS = {{{eventsJson}}};
+  // eventsJson is already JSON, we output it unescaped by using data attribute trick
+  window.EC_EVENTS = JSON.parse(document.getElementById('ec-events-json').textContent);
   window.EC_INITIAL_DATE = "{{initialDateISO}}";
   window.EC_INITIAL_VIEW = "{{view}}";
   window.EC_TZ = "{{tz}}";
   window.EC_CAN_CREATE = {{#if canCreate}}true{{else}}false{{/if}};
 </script>
 
+<script type="application/json" id="ec-events-json">{{{eventsJson}}}</script>
+
 <style>
   .ec-status-pending .fc-event-title { font-weight: 600; }
   .ec-status-valid .fc-event-title { font-weight: 700; }

package/public/templates/equipment-calendar/payment-return.tpl

@@ -1,6 +1,6 @@
 <div class="equipment-payment-return">
   <h1>Paiement</h1>
-  {{#if (eq status "error")}}
+  {{#if statusError}}
     <div class="alert alert-danger">Le paiement semble avoir échoué. Référence réservation: <code>{{rid}}</code></div>
   {{else}}
     <div class="alert alert-info">Merci. Si le paiement est confirmé, la réservation passera en "validée". Référence: <code>{{rid}}</code></div>