From 9724f0b732c982cb5d60d74d8f9a731f813799a8 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sun, 27 Sep 2026 13:58:29 +0200 Subject: [PATCH 1/8] Move calendar script to js/, read its options from JSON, write its modal once --- bin/release | 3 +- calendar.js => js/calendar.js | 46 +++++-------- templates/default/calendar.html.twig | 64 ++++++++++--------- .../Crud/tests/units/EventsController.php | 9 ++- webpack.config.js | 2 +- 5 files changed, 61 insertions(+), 63 deletions(-) rename calendar.js => js/calendar.js (55%) diff --git a/bin/release b/bin/release index 02e0202b..e9d8045f 100755 --- a/bin/release +++ b/bin/release @@ -413,7 +413,6 @@ def add_libs(rel_name, galette_archive): '.gitignore', '.php-cs-fixer.dist.php', '.phpcs.xml', - 'calendar.js', 'package-lock.json', 'package.json', 'phpstan.neon', @@ -424,7 +423,7 @@ def add_libs(rel_name, galette_archive): if os.path.exists(target): os.remove(target) - for todrop in ['.github', 'bin', 'node_modules', 'tests']: + for todrop in ['.github', 'bin', 'js', 'node_modules', 'tests']: target = os.path.join(npm_dir, todrop) if os.path.exists(target): shutil.rmtree(target) diff --git a/calendar.js b/js/calendar.js similarity index 55% rename from calendar.js rename to js/calendar.js index 8ebce7e4..60658525 100644 --- a/calendar.js +++ b/js/calendar.js @@ -17,49 +17,38 @@ import 'fullcalendar/themes/classic/palette.css'; $(function() { var calendarEl = document.getElementById('calendar'); + var options = JSON.parse(document.getElementById('calendar_options').textContent); + //modal is written in the page, only its content changes + var $modal = $('#calendar_event'); + var $edit = $modal.find('[data-action="edit"]'); + var $booking = $modal.find('[data-action="booking"]'); var calendar = new Calendar(calendarEl, { plugins: [ themePlugin, interactionPlugin, dayGridPlugin, listPlugin ], - views: _fullcalendar_views, + views: options.views, headerToolbar: { left: 'title', right: 'dayGridMonth,listDay,listWeek,listMonth prevYear,prev,today,next,nextYear' }, height: 'auto', locales: allLocales, - locale: _fullcalendar_locale, + locale: options.locale, weekNumbers: true, - events: _calendar_dataurl, + events: options.dataurl, selectable: true, eventClick: function(info) { - var _infos = JSON.parse(JSON.stringify(info.event.extendedProps)); - _infos.url = _calendar_event_url.replace('PLACEBO', _infos.id_event); - _infos.booking = _calendar_booking_url.replace('PLACEBO', _infos.id_event); - var _actions = []; - if (_infos.can_edit) { - _actions.push(_edit_action); - } - _actions.push(Object.assign({}, _booking_action, { - click: function() { - window.location.href = _infos.booking; - } - })); - _actions.push(_close_action); + var infos = info.event.extendedProps; //description is built and escaped server side, other values must be displayed as text - var _elt = $('
'); - _elt.find('.header').text(_infos.name + ' (' + _infos.begin_date_fmt + ' - ' + _infos.end_date_fmt + ')'); - _elt.find('.content').html(_infos.description); - _elt.appendTo('body'); - _elt.modal({ - onApprove: function() { - window.location.href = _infos.url; - }, - actions: _actions - }).modal('show'); + $modal.find('.header').text(infos.name + ' (' + infos.begin_date_fmt + ' - ' + infos.end_date_fmt + ')'); + $modal.find('.content').html(infos.description); + $edit + .attr('href', options.event_url.replace('PLACEBO', infos.id_event)) + .toggleClass('displaynone', !infos.can_edit); + $booking.attr('href', options.booking_url.replace('PLACEBO', infos.id_event)); + $modal.modal('show'); }, eventMouseEnter: function(info) { - var _el = $(info.el); - _el.popup({ + $(info.el).popup({ exclusive: true, hoverable: true, variation: 'basic', @@ -70,4 +59,3 @@ $(function() { calendar.render(); }); - diff --git a/templates/default/calendar.html.twig b/templates/default/calendar.html.twig index c95d1a48..dc09bbe0 100644 --- a/templates/default/calendar.html.twig +++ b/templates/default/calendar.html.twig @@ -8,37 +8,41 @@ {% block content %}
+ {% endblock %} {% block javascripts %} - - + {% set calendar_options = { + 'dataurl': url_for("ajax-events_calendar"), + 'event_url': url_for("events_event_edit", {"id": "PLACEBO"}), + 'booking_url': url_for("events_booking_add") ~ '?event=PLACEBO', + 'locale': i18n.getWebID(), + 'views': { + 'listDay': {'buttonText': _T("Daily list", "events")}, + 'listWeek': {'buttonText': _T("Weekly list", "events")}, + 'listMonth': {'buttonText': _T("Monthly list", "events")}, + 'dayGridMonth': {'buttonText': _T("Month calendar", "events")}, + 'today': {'buttonText': _T("Today", "events")} + } + } %} + + {% endblock %} diff --git a/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php b/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php index 9e510ed6..22ca1928 100644 --- a/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php +++ b/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php @@ -445,6 +445,13 @@ public function testCalendarPage(): void $body = (string)$test_response->getBody(); $this->assertStringContainsString('
', $body); $this->assertStringContainsString('js/calendar.bundle.js', $body); - $this->assertStringContainsString($this->routeparser->urlFor('ajax-events_calendar'), $body); + $this->assertStringContainsString(' {% endblock %} - -{% block javascripts %} - {{ parent() }} - -{% endblock %} diff --git a/templates/default/booking.html.twig b/templates/default/booking.html.twig index b249b93c..b05c28be 100644 --- a/templates/default/booking.html.twig +++ b/templates/default/booking.html.twig @@ -146,17 +146,12 @@ {% endblock %} {% block javascripts %} + {% if login.isAdmin() or login.isStaff() or login.isGroupManager() %} + {% endif %} {% endblock %} diff --git a/templates/default/bookings.html.twig b/templates/default/bookings.html.twig index d373d746..7c7dc096 100644 --- a/templates/default/bookings.html.twig +++ b/templates/default/bookings.html.twig @@ -279,47 +279,11 @@ {% block batch_selection %} else if (value == 'sendmail') { - {% if existing_mailing == true %} - _sendmail(true); - {% else %} _sendmail(); - {% endif %} } {% endblock %} {% block javascripts %} {% set batch_selection = ['sendmail'] %} {{ parent() }} - {% endblock %} diff --git a/templates/default/event.html.twig b/templates/default/event.html.twig index fd08bca5..ddf87448 100644 --- a/templates/default/event.html.twig +++ b/templates/default/event.html.twig @@ -121,7 +121,7 @@ {% endfor %} - @@ -134,7 +134,7 @@ {% endfor %} - @@ -169,23 +169,3 @@ {% endblock %} - -{% block javascripts %} - -{% endblock %} diff --git a/templates/default/scripts.html.twig b/templates/default/scripts.html.twig new file mode 100644 index 00000000..60cae56b --- /dev/null +++ b/templates/default/scripts.html.twig @@ -0,0 +1,10 @@ +{# + # This file is part of Galette Events plugin (https://galette.eu). + # SPDX-FileCopyrightText: Copyright © 2018-2026 The Galette Team + # SPDX-License-Identifier: GPL-3.0-or-later + #} + +{# plugin pages only #} +{% if cur_route starts with 'events_' %} + +{% endif %} diff --git a/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php b/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php index 22ca1928..9c29b86d 100644 --- a/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php +++ b/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php @@ -454,4 +454,21 @@ public function testCalendarPage(): void $this->assertSame('Daily list', $options['views']['listDay']['buttonText']); $this->assertSame('en-US', $options['locale']); } + + /** + * Plugin pages load their script from a file, other pages do not + */ + public function testScriptFile(): void + { + $this->logSuperAdmin(); + $this->linkActivity($this->insertEvent('Event'), $this->insertActivity('Dinner')); + + $body = (string)$this->app->handle($this->createRequest('events_event_add'))->getBody(); + $this->assertStringContainsString('events.js', $body); + $this->assertStringNotContainsString('alert(', $body); + $this->assertStringContainsString('aria-controls="attach_activity"', $body); + + $body = (string)$this->app->handle($this->createRequest('dashboard'))->getBody(); + $this->assertStringNotContainsString('events.js', $body); + } } diff --git a/webroot/events.js b/webroot/events.js new file mode 100644 index 00000000..26c27953 --- /dev/null +++ b/webroot/events.js @@ -0,0 +1,46 @@ +/** + * This file is part of Galette Events plugin (https://galette.eu). + * SPDX-FileCopyrightText: Copyright © 2018-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +/* Event form: activities are attached or detached once one has been chosen */ +var _eventsActivities = function() { + $('#add_activity, #remove_activity').on('click', function(e) { + var $button = $(this); + if ($('#' + $button.attr('aria-controls')).val() !== '') { + return; + } + e.preventDefault(); + $.modal({ + content: $button.data('message'), + class: 'tiny', + actions: [{ + text: $button.data('close'), + icon: 'times', + class: 'icon labeled cancel' + }] + }).modal('show'); + }); +}; + +/* Booking form: choosing another event reloads the form with its activities */ +var _eventsBookingEvent = function() { + $('#modifform #event').on('change', function() { + $(this).closest('form').trigger('submit'); + }); +}; + +/* Bookings list: mailing to the members of selected bookings */ +var _sendmail = function() { + $('#listform') + .append('') + .append('') + .append('') + .trigger('submit'); +}; + +$(function() { + _eventsActivities(); + _eventsBookingEvent(); +}); From 70698fba292c1e118c146b32c67e78bae8b560c4 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sun, 27 Sep 2026 14:05:38 +0200 Subject: [PATCH 3/8] Use core components for activities of an event, label their status --- templates/default/bookings.html.twig | 2 +- templates/default/event.html.twig | 84 +++++++++++-------- .../Crud/tests/units/EventsController.php | 16 ++++ 3 files changed, 66 insertions(+), 36 deletions(-) diff --git a/templates/default/bookings.html.twig b/templates/default/bookings.html.twig index 7c7dc096..28906fe7 100644 --- a/templates/default/bookings.html.twig +++ b/templates/default/bookings.html.twig @@ -180,7 +180,7 @@ {% if booking.isPaid() %} {{ _T("Paid", "events") }} {% else %} - {{ _T("Not paid", "events") }}" + {{ _T("Not paid", "events") }} {% endif %} diff --git a/templates/default/event.html.twig b/templates/default/event.html.twig index ddf87448..367660ef 100644 --- a/templates/default/event.html.twig +++ b/templates/default/event.html.twig @@ -108,56 +108,70 @@ {{ _T("Activities", "events") }}
-
-

{% set availables = event.availableActivities() %} {% set activities = event.getActivities() %} - {% if availables|length or activities|length %} {% if availables|length %} - - +

+ {% include "components/forms/select.html.twig" with { + id: 'attach_activity', + value: '', + values: attach_values, + label: _T("Add selected activity to event", "events"), + component_class: 'twelve wide field' + } %} +
+ +
+
{% endif %} {% if activities|length %} - - - {% endif %} -

- {% if activities|length %} +
+ {% include "components/forms/select.html.twig" with { + id: 'detach_activity', + value: '', + values: detach_values, + label: _T("Remove selected activity from event", "events"), + component_class: 'twelve wide field' + } %} +
+ +
+
+ + {% set status_values = { + (constant('GaletteEvents\\Activity::YES')): _T("Yes"), + (constant('GaletteEvents\\Activity::NO')): _T("No"), + (constant('GaletteEvents\\Activity::REQUIRED')): _T("Required", "events") + } %} {% for item in activities %} - {% set activity = item.activity %} -

- - - -

+ + {% include "components/forms/select.html.twig" with { + id: 'activities_status_' ~ item.activity.getId(), + name: 'activities_status[]', + value: item.status, + values: status_values, + label: item.activity.getName() + } %} {% endfor %} {% endif %} {% else %} -

{{ _T("No activity available in the database.", "events") }}

+

{{ _T("No activity available in the database.", "events") }}

{% endif %} -
diff --git a/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php b/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php index 9c29b86d..a4754298 100644 --- a/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php +++ b/tests/GaletteEvents/Controllers/Crud/tests/units/EventsController.php @@ -468,6 +468,22 @@ public function testScriptFile(): void $this->assertStringNotContainsString('alert(', $body); $this->assertStringContainsString('aria-controls="attach_activity"', $body); + //linked activities status are labelled + $event = $this->insertEvent('Linked'); + $dinner = $this->insertActivity('Supper'); + $this->linkActivity($event, $dinner, \GaletteEvents\Activity::REQUIRED); + $body = (string)$this->app->handle($this->createRequest('events_event_edit', ['id' => (string)$event]))->getBody(); + $this->assertMatchesRegularExpression('#\s*Supper\s*#', $body); + $this->assertMatchesRegularExpression( + '#assertMatchesRegularExpression( + '#assertStringNotContainsString('{$activity', $body); + $body = (string)$this->app->handle($this->createRequest('dashboard'))->getBody(); $this->assertStringNotContainsString('events.js', $body); } From 6b1cca3ae85130067bfbf125f23e1e35d651d12b Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sun, 27 Sep 2026 14:13:46 +0200 Subject: [PATCH 4/8] Accessibility: hide decorative icons, label row checkboxes and paid filter, readable calendar, no invalid autocomplete --- .../Controllers/Crud/ActivitiesController.php | 1 - .../Controllers/Crud/BookingsController.php | 2 -- .../Controllers/Crud/EventsController.php | 1 - templates/default/activities.html.twig | 2 +- templates/default/activity.html.twig | 4 ++-- templates/default/booking.html.twig | 8 ++++---- templates/default/bookings.html.twig | 11 ++++++----- templates/default/event.html.twig | 8 ++++---- templates/default/events.html.twig | 2 +- webroot/galette_events.css | 13 ++++--------- 10 files changed, 22 insertions(+), 30 deletions(-) diff --git a/lib/GaletteEvents/Controllers/Crud/ActivitiesController.php b/lib/GaletteEvents/Controllers/Crud/ActivitiesController.php index 465a605e..f56a0a7f 100644 --- a/lib/GaletteEvents/Controllers/Crud/ActivitiesController.php +++ b/lib/GaletteEvents/Controllers/Crud/ActivitiesController.php @@ -150,7 +150,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri $response, $this->getTemplate('activity'), [ - 'autocomplete' => true, 'page_title' => $title, 'activity' => $activity, // pseudo random int diff --git a/lib/GaletteEvents/Controllers/Crud/BookingsController.php b/lib/GaletteEvents/Controllers/Crud/BookingsController.php index ae78f9bb..a7f382cb 100644 --- a/lib/GaletteEvents/Controllers/Crud/BookingsController.php +++ b/lib/GaletteEvents/Controllers/Crud/BookingsController.php @@ -388,7 +388,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri 'filters' => $m->getFilters(), 'count' => $m->getCount() ]; - $route_params['autocomplete'] = true; //check if current attached member is part of the list if ( @@ -412,7 +411,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri array_merge( $route_params, [ - 'autocomplete' => true, 'page_title' => $title, 'booking' => $booking, 'events' => $events->getList(true), diff --git a/lib/GaletteEvents/Controllers/Crud/EventsController.php b/lib/GaletteEvents/Controllers/Crud/EventsController.php index cbba10e1..884d355f 100644 --- a/lib/GaletteEvents/Controllers/Crud/EventsController.php +++ b/lib/GaletteEvents/Controllers/Crud/EventsController.php @@ -223,7 +223,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri $response, $this->getTemplate('event'), [ - 'autocomplete' => true, 'page_title' => $title, 'event' => $event, 'require_calendar' => true, diff --git a/templates/default/activities.html.twig b/templates/default/activities.html.twig index b8723c48..54d276cc 100644 --- a/templates/default/activities.html.twig +++ b/templates/default/activities.html.twig @@ -73,7 +73,7 @@ {{ activity.getCreationDate()|date(_T("Y-m-d")) }} {{ activity.countEvents() }} - +