diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c4b777c0..f9aac331d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +* [PR-537](https://github.com/itk-dev/deltag.aarhus.dk/pull/537) + 5209: Cleaned up public meeting summary view + ## [4.11.0] - 2025-07-01 * [PR-533](https://github.com/itk-dev/deltag.aarhus.dk/pull/533) diff --git a/web/modules/custom/hoeringsportal_public_meeting/src/Helper/PublicMeetingHelper.php b/web/modules/custom/hoeringsportal_public_meeting/src/Helper/PublicMeetingHelper.php index c65c73b80..a2a579a7e 100644 --- a/web/modules/custom/hoeringsportal_public_meeting/src/Helper/PublicMeetingHelper.php +++ b/web/modules/custom/hoeringsportal_public_meeting/src/Helper/PublicMeetingHelper.php @@ -381,7 +381,7 @@ public function hasDateEndingBetween(NodeInterface $node, ?\DateTimeInterface $f * @return \Drupal\itk_pretix\Plugin\Field\FieldType\PretixDate[]|iterable|null * The pretix dates if any. */ - private function getPretixDates(NodeInterface $node): ?iterable { + public function getPretixDates(NodeInterface $node): ?iterable { if (!$this->isPublicMeeting($node) || !$this->hasPretixSignUp($node)) { return NULL; } diff --git a/web/modules/custom/hoeringsportal_public_meeting/templates/hoeringsportal-public-meeting-summary.html.twig b/web/modules/custom/hoeringsportal_public_meeting/templates/hoeringsportal-public-meeting-summary.html.twig index d0c42725d..edcb67544 100644 --- a/web/modules/custom/hoeringsportal_public_meeting/templates/hoeringsportal-public-meeting-summary.html.twig +++ b/web/modules/custom/hoeringsportal_public_meeting/templates/hoeringsportal-public-meeting-summary.html.twig @@ -101,5 +101,7 @@ {% endif %} {% endif %} -

{{ 'This event has multiple dates'|t }}

-{{ 'View the list'|t }} +{% if public_meeting_helper.hasPretixSignUp(node) and public_meeting_helper.getPretixDates(node)|length > 1 %} +

{{ 'This event has multiple dates'|t }}

+ {{ 'View the list'|t }} +{% endif %} diff --git a/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-public-meeting-summary.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-public-meeting-summary.html.twig index 7317510e6..206d9e121 100755 --- a/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-public-meeting-summary.html.twig +++ b/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-public-meeting-summary.html.twig @@ -36,11 +36,6 @@ * @see template_preprocess_field() */ #} -{% set node = element['#object'] %} -{% set meeting_cancelled = public_meeting_helper.isCancelled(node) %} -{% set meeting_has_been_held = public_meeting_helper.hasBeenHeld(node) %} -{% set registration_deadline_passed = public_meeting_helper.isDeadlinePassed(node) %} - {% if label_hidden %} {% if multiple %} {% for item in items %} @@ -68,15 +63,22 @@ {% endif %} {% endif %} -{% if meeting_cancelled %} -
{{ 'Meeting has been cancelled'|t }}
-{% elseif meeting_has_been_held %} -
{{ 'Meeting has already been held'|t }}
-{% else %} - {% if registration_deadline_passed %} - {# @TODO: Design: styling of "alert" #} -
{{ 'Registration deadline passed'|t }}
+{% set node = element['#object'] %} +{# pretix info is rendered in hoeringsportal-public-meeting-summary.html.twig #} +{% if not public_meeting_helper.hasPretixSignUp(node) %} + {% set meeting_cancelled = public_meeting_helper.isCancelled(node) %} + {% set meeting_has_been_held = public_meeting_helper.hasBeenHeld(node) %} + {% set registration_deadline_passed = public_meeting_helper.isDeadlinePassed(node) %} + + {% if meeting_cancelled %} +
{{ 'Meeting has been cancelled'|t }}
+ {% elseif meeting_has_been_held %} +
{{ 'Meeting has already been held'|t }}
{% else %} - + {% if registration_deadline_passed %} +
{{ 'Registration deadline passed'|t }}
+ {% else %} + + {% endif %} {% endif %} {% endif %}