nodebb-plugin-onekite-calendar 2.0.46 → 2.0.48

package/lib/api.js

@@ -507,7 +507,7 @@ function eventsForOuting(o) {
     type: 'outing',
     id: String(o.oid),
     uid: Number(o.uid) || 0,
-    title: String(o.title || 'Prévision de sortie'),
+    title: String(o.title || 'Sortie'),
     details: String(o.notes || ''),
     location: String(o.address || ''),
     allDay: false,
@@ -516,7 +516,7 @@ function eventsForOuting(o) {
   });
   return {
     id: `outing:${o.oid}`,
-    title: `${o.title || 'Prévision de sortie'}`.trim(),
+    title: `${o.title || 'Sortie'}`.trim(),
     allDay: false,
     start: startIso,
     end: endIso,
@@ -882,6 +882,19 @@ api.getSpecialEventDetails = async function (req, res) {
   const ev = await dbLayer.getSpecialEvent(eid);
   if (!ev) return res.status(404).json({ error: 'not-found' });
 
+  // Calendar export links (ICS / Google Calendar)
+  const links = buildCalendarLinks({
+    type: 'special',
+    id: String(ev.eid),
+    uid: Number(ev.uid) || 0,
+    title: String(ev.title || 'Évènement'),
+    details: String(ev.notes || ''),
+    location: String(ev.address || ''),
+    allDay: false,
+    start: new Date(parseInt(ev.start, 10)),
+    end: new Date(parseInt(ev.end, 10)),
+  });
+
   // Anyone who can see the calendar can view special events, but creator username
   // is only visible to moderators/allowed users or the creator.
   const out = {
@@ -894,6 +907,8 @@ api.getSpecialEventDetails = async function (req, res) {
     lon: ev.lon || '',
     notes: ev.notes || '',
     canDeleteSpecial: canSpecialDelete,
+    icsUrl: links.icsUrl,
+    googleCalUrl: links.googleCalUrl,
   };
   if (ev.username && (canMod || canSpecialDelete || (uid && String(uid) === String(ev.uid)))) {
     out.username = String(ev.username);
@@ -998,6 +1013,19 @@ api.getOutingDetails = async function (req, res) {
   const o = await dbLayer.getOuting(oid);
   if (!o) return res.status(404).json({ error: 'not-found' });
 
+  // Calendar export links (ICS / Google Calendar)
+  const links = buildCalendarLinks({
+    type: 'outing',
+    id: String(o.oid),
+    uid: Number(o.uid) || 0,
+    title: String(o.title || 'Sortie'),
+    details: String(o.notes || ''),
+    location: String(o.address || ''),
+    allDay: false,
+    start: new Date(parseInt(o.start, 10)),
+    end: new Date(parseInt(o.end, 10)),
+  });
+
   const out = {
     oid: o.oid,
     title: o.title || '',
@@ -1008,6 +1036,8 @@ api.getOutingDetails = async function (req, res) {
     lon: o.lon || '',
     notes: o.notes || '',
     canDeleteOuting: canMod || (uid && String(uid) === String(o.uid)),
+    icsUrl: links.icsUrl,
+    googleCalUrl: links.googleCalUrl,
   };
   if (o.username && (canMod || (uid && String(uid) === String(o.uid)))) {
     out.username = String(o.username);
@@ -1020,10 +1050,14 @@ api.createOuting = async function (req, res) {
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
 
   const startTs = toTs(req.body && req.body.start);
-  const ok = await canRequest(req.uid, settings, startTs);
+  // Permissions for outings must match reservations/locations rights.
+  // We intentionally base the "auto" yearly group on the *current* year,
+  // not on the outing date, so members can plan future outings without
+  // requiring next-year group membership.
+  const ok = await canRequest(req.uid, settings, Date.now());
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
-  const title = String((req.body && req.body.title) || '').trim() || 'Prévision de sortie';
+  const title = String((req.body && req.body.title) || '').trim() || 'Sortie';
   const endTs = toTs(req.body && req.body.end);
   if (!Number.isFinite(startTs) || !Number.isFinite(endTs) || !(startTs < endTs)) {
     return res.status(400).json({ error: 'bad-dates' });
@@ -1934,7 +1968,7 @@ api.getIcs = async function (req, res) {
       const end = new Date(parseInt(o.end, 10));
       ics = buildIcs({
         uid: `outing-${id}@onekite`,
-        summary: String(o.title || 'Prévision de sortie'),
+        summary: String(o.title || 'Sortie'),
         description: String(o.notes || ''),
         location: String(o.address || ''),
         allDay: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.46",
+  "version": "2.0.48",
   "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.46"
+  "version": "2.0.48"
 }

package/public/client.js

@@ -62,33 +62,24 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           }
         }
 
-        /* Calendar item action buttons (match calendar colors) */
+        /* Creation chooser buttons: outline only, match calendar colors */
+        .btn-onekite-special,
+        .btn-onekite-outing,
+        .btn-onekite-location {
+          background: transparent;
+          border-width: 2px;
+        }
         .btn-onekite-special {
-          background: #8e44ad;
           border-color: #8e44ad;
-          color: #fff;
-        }
-        .btn-onekite-special:hover {
-          filter: brightness(0.95);
-          color: #fff;
+          color: #8e44ad;
         }
         .btn-onekite-outing {
-          background: #2980b9;
           border-color: #2980b9;
-          color: #fff;
-        }
-        .btn-onekite-outing:hover {
-          filter: brightness(0.95);
-          color: #fff;
+          color: #2980b9;
         }
         .btn-onekite-location {
-          background: #27ae60;
           border-color: #27ae60;
-          color: #fff;
-        }
-        .btn-onekite-location:hover {
-          filter: brightness(0.95);
-          color: #fff;
+          color: #27ae60;
         }
 
 /* Mobile FAB date range picker (single calendar) */
@@ -294,8 +285,10 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
 
     const seStartTime = timeString(seStart);
     const seEndTime = timeString(seEnd);
-    const defaultTitlePlaceholder = kind === 'outing' ? 'Prévision de sortie' : 'Ex: ...';
-    const defaultTitleValue = kind === 'outing' ? 'Prévision de sortie' : '';
+    // Same UX for all types: an example placeholder, but never pre-fill the value.
+    // If left empty, the server can still apply its own default label.
+    const defaultTitlePlaceholder = 'Ex: ...';
+    const defaultTitleValue = '';
 
     const html = `
       <div class="mb-3">
@@ -472,8 +465,6 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     // a different title.
     const payload = await openSpecialEventDialog(selectionInfo, { kind: 'outing' });
     if (!payload) return null;
-    // Default title if empty
-    if (!payload.title) payload.title = 'Prévision de sortie';
     return payload;
   }
 
@@ -1503,12 +1494,13 @@ function toDatetimeLocalValue(date) {
             }
           } catch (e) {}
 
-          // IMPORTANT: align "special" event display exactly like reservation icons.
+          // IMPORTANT: align "special" events and "outings" display exactly like
+          // reservation icons.
           // We inject the clock + time range directly into the event title so FC
           // doesn't reserve a separate time column (which creates a leading gap).
           const mapped = (Array.isArray(data) ? data : []).map((ev) => {
             try {
-              if (ev && ev.extendedProps && ev.extendedProps.type === 'special' && ev.start && ev.end) {
+              if (ev && ev.extendedProps && (ev.extendedProps.type === 'special' || ev.extendedProps.type === 'outing') && ev.start && ev.end) {
                 // Force the same visual layout as reservations in month view
                 // (avoid the "dot" layout which introduces a leading gap).
                 ev.display = 'block';
@@ -1534,15 +1526,18 @@ function toDatetimeLocalValue(date) {
         }
       },
       eventDidMount: function (arg) {
-        // Keep special event colors consistent.
+        // Keep special event + outing colors consistent even if a theme overrides
+        // FullCalendar defaults.
         try {
           const ev = arg && arg.event;
           if (!ev) return;
-          if (ev.extendedProps && ev.extendedProps.type === 'special') {
+          const t = ev.extendedProps && ev.extendedProps.type;
+          if (t === 'special' || t === 'outing') {
             const el2 = arg.el;
             if (el2 && el2.style) {
-              el2.style.backgroundColor = '#8e44ad';
-              el2.style.borderColor = '#8e44ad';
+              const bg = (t === 'outing') ? '#2980b9' : '#8e44ad';
+              el2.style.backgroundColor = bg;
+              el2.style.borderColor = bg;
               el2.style.color = '#ffffff';
             }
           }
@@ -1696,7 +1691,7 @@ function toDatetimeLocalValue(date) {
             `;
             const canDel = !!(p.canDeleteOuting);
             const dlg = bootbox.dialog({
-              title: 'Prévision de sortie',
+              title: 'Sortie',
               message: html,
               buttons: {
                 close: { label: 'Fermer', className: 'btn-secondary' },