nodebb-plugin-equipment-calendar 0.7.1 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/library.js +35 -6
  2. package/package.json +1 -1
  3. package/plugin.json +1 -1
  4. package/public/templates/admin/plugins/equipment-calendar-helloasso-test.tpl +22 -0
  5. package/public/templates/admin/plugins/equipment-calendar.tpl +3 -2
package/library.js CHANGED
@@ -564,6 +564,8 @@ plugin.init = async function (params) {
564
564
  if (mid && mid.admin) {
565
565
  router.get('/admin/plugins/equipment-calendar', middleware.applyCSRF, mid.admin.buildHeader, renderAdminPage);
566
566
  router.get('/admin/plugins/equipment-calendar/reservations', middleware.applyCSRF, mid.admin.buildHeader, renderAdminReservationsPage);
567
+ router.get('/admin/plugins/equipment-calendar/helloasso-test', middleware.applyCSRF, mid.admin.buildHeader, handleHelloAssoTest);
568
+ router.get('/api/admin/plugins/equipment-calendar/helloasso-test', middleware.applyCSRF, handleHelloAssoTest);
567
569
  router.get('/api/admin/plugins/equipment-calendar/reservations', middleware.applyCSRF, renderAdminReservationsPage);
568
570
  router.get('/api/admin/plugins/equipment-calendar', middleware.applyCSRF, renderAdminPage);
569
571
  router.post('/admin/plugins/equipment-calendar/save', middleware.applyCSRF, handleAdminSave);
@@ -652,6 +654,8 @@ plugin.addAdminRoutes = async function (params) {
652
654
  const { router, middleware: mid } = params;
653
655
  router.get('/admin/plugins/equipment-calendar', middleware.applyCSRF, mid.admin.buildHeader, renderAdminPage);
654
656
  router.get('/admin/plugins/equipment-calendar/reservations', middleware.applyCSRF, mid.admin.buildHeader, renderAdminReservationsPage);
657
+ router.get('/admin/plugins/equipment-calendar/helloasso-test', middleware.applyCSRF, mid.admin.buildHeader, handleHelloAssoTest);
658
+ router.get('/api/admin/plugins/equipment-calendar/helloasso-test', middleware.applyCSRF, handleHelloAssoTest);
655
659
  router.get('/api/admin/plugins/equipment-calendar/reservations', middleware.applyCSRF, renderAdminReservationsPage);
656
660
  router.get('/api/admin/plugins/equipment-calendar', middleware.applyCSRF, renderAdminPage);
657
661
  };
@@ -781,13 +785,42 @@ async function handleAdminDelete(req, res) {
781
785
  return res.redirect('/admin/plugins/equipment-calendar/reservations?updated=1');
782
786
  }
783
787
 
788
+
789
+ async function handleHelloAssoTest(req, res) {
790
+ const isAdmin = req.uid ? await groups.isMember(req.uid, 'administrators') : false;
791
+ if (!isAdmin) return helpers.notAllowed(req, res);
792
+
793
+ const settings = await getSettings();
794
+ let ok = false;
795
+ let message = '';
796
+ let count = 0;
797
+
798
+ try {
799
+ await getHelloAssoAccessToken(settings);
800
+ const items = await fetchHelloAssoItems(settings);
801
+ const list = Array.isArray(items) ? items : (Array.isArray(items.data) ? items.data : []);
802
+ count = list.length;
803
+ ok = true;
804
+ message = `OK: token valide. Items récupérés: ${count}.`;
805
+ } catch (e) {
806
+ ok = false;
807
+ message = (e && e.message) ? e.message : String(e);
808
+ }
809
+
810
+ res.render('admin/plugins/equipment-calendar-helloasso-test', {
811
+ title: 'Equipment Calendar - Test HelloAsso',
812
+ ok,
813
+ message,
814
+ count,
815
+ settings,
816
+ });
817
+ }
818
+
784
819
  async function renderAdminPage(req, res) {
785
820
  const settings = await getSettings();
786
821
  res.render('admin/plugins/equipment-calendar', {
787
822
  title: 'Equipment Calendar',
788
823
  settings,
789
- view_itemsSourceManual: String(settings.itemsSource || 'manual') !== 'helloasso',
790
- view_itemsSourceHelloasso: String(settings.itemsSource || 'manual') === 'helloasso',
791
824
  saved: req.query && String(req.query.saved || '') === '1',
792
825
  purged: req.query && parseInt(req.query.purged, 10) || 0,
793
826
  view_dayGridMonth: (settings.defaultView || 'dayGridMonth') === 'dayGridMonth',
@@ -1335,10 +1368,6 @@ async function handleAdminSave(req, res) {
1335
1368
  approverGroup: String(req.body.approverGroup || DEFAULT_SETTINGS.approverGroup),
1336
1369
  notifyGroup: String(req.body.notifyGroup || DEFAULT_SETTINGS.notifyGroup),
1337
1370
  itemsJson: String(req.body.itemsJson || DEFAULT_SETTINGS.itemsJson),
1338
- itemsSource: String(req.body.itemsSource || DEFAULT_SETTINGS.itemsSource),
1339
- ha_itemsFormType: String(req.body.ha_itemsFormType || DEFAULT_SETTINGS.ha_itemsFormType),
1340
- ha_itemsFormSlug: String(req.body.ha_itemsFormSlug || DEFAULT_SETTINGS.ha_itemsFormSlug),
1341
- ha_locationMapJson: String(req.body.ha_locationMapJson || DEFAULT_SETTINGS.ha_locationMapJson),
1342
1371
  ha_clientId: String(req.body.ha_clientId || ''),
1343
1372
  ha_clientSecret: String(req.body.ha_clientSecret || ''),
1344
1373
  ha_organizationSlug: String(req.body.ha_organizationSlug || ''),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nodebb-plugin-equipment-calendar",
3
- "version": "0.7.1",
3
+ "version": "0.8.0",
4
4
  "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
5
5
  "main": "library.js",
6
6
  "scripts": {
package/plugin.json CHANGED
@@ -26,6 +26,6 @@
26
26
  "scripts": [
27
27
  "public/js/client.js"
28
28
  ],
29
- "version": "0.4.2",
29
+ "version": "0.4.4",
30
30
  "minver": "4.7.1"
31
31
  }
package/public/templates/admin/plugins/equipment-calendar-helloasso-test.tpl ADDED
@@ -0,0 +1,22 @@
1
+ <div class="acp-page-container">
2
+ <div class="d-flex align-items-center justify-content-between flex-wrap gap-2">
3
+ <h1 class="mb-0">Equipment Calendar</h1>
4
+ <div class="btn-group">
5
+ <a class="btn btn-outline-secondary" href="/admin/plugins/equipment-calendar">Paramètres</a>
6
+ <a class="btn btn-outline-secondary" href="/admin/plugins/equipment-calendar/reservations">Réservations</a>
7
+ <a class="btn btn-secondary active" href="/admin/plugins/equipment-calendar/helloasso-test">Test HelloAsso</a>
8
+ </div>
9
+ </div>
10
+
11
+ <div class="card card-body mt-3">
12
+ {{{ if ok }}}
13
+ <div class="alert alert-success">{message}</div>
14
+ {{{ else }}}
15
+ <div class="alert alert-danger">Échec : {message}</div>
16
+ {{{ end }}}
17
+
18
+ <div class="small text-muted">
19
+ Form: <code>{settings.ha_itemsFormType}</code> / <code>{settings.ha_itemsFormSlug}</code> — Orga: <code>{settings.ha_organizationSlug}</code>
20
+ </div>
21
+ </div>
22
+ </div>
package/public/templates/admin/plugins/equipment-calendar.tpl CHANGED
@@ -4,6 +4,7 @@
4
4
  <div class="btn-group">
5
5
  <a class="btn btn-secondary active" href="/admin/plugins/equipment-calendar">Paramètres</a>
6
6
  <a class="btn btn-outline-secondary" href="/admin/plugins/equipment-calendar/reservations">Réservations</a>
7
+ <a class="btn btn-outline-secondary" href="/admin/plugins/equipment-calendar/helloasso-test">Test HelloAsso</a>
7
8
  </div>
8
9
  </div>
9
10
 
@@ -58,8 +59,8 @@
58
59
  <div class="mb-3">
59
60
  <label class="form-label">Source</label>
60
61
  <select class="form-select" name="itemsSource">
61
- <option value="manual" {{{ if view_itemsSourceManual }}}selected{{{ end }}}>Manuel (JSON)</option>
62
- <option value="helloasso" {{{ if view_itemsSourceHelloasso }}}selected{{{ end }}}>HelloAsso (articles d’un formulaire)</option>
62
+ <option value="manual">Manuel (JSON)</option>
63
+ <option value="helloasso">HelloAsso (articles d’un formulaire)</option>
63
64
  </select>
64
65
  <div class="form-text">Si HelloAsso est choisi, la liste du matériel est récupérée via l’API HelloAsso (items d’un formulaire).</div>
65
66
  </div>