Merge pull request #537 from itk-dev/hotfix/5209-public-meeting-summary-cleanup

5209: Cleaned up public meeting summary view

Author: rimi-itk

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)

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;
     }

web/modules/custom/hoeringsportal_public_meeting/templates/hoeringsportal-public-meeting-summary.html.twig

@@ -101,5 +101,7 @@
   {% endif %}
 {% endif %}
 
-<h3 class="mt-3">{{ 'This event has multiple dates'|t }}</h3>
-<a href="#pretix_signup_list" class="btn btn-sm bg-primary text-white rounded py-1 px-3 mb-3">{{ 'View the list'|t }}</a>
+{% if public_meeting_helper.hasPretixSignUp(node) and public_meeting_helper.getPretixDates(node)|length > 1 %}
+  <h3 class="mt-3">{{ 'This event has multiple dates'|t }}</h3>
+  <a href="#pretix_signup_list" class="btn btn-sm bg-primary text-white rounded py-1 px-3 mb-3">{{ 'View the list'|t }}</a>
+{% endif %}

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 %}
-  <div class="pretix-alert meeting-has-been-cancelled my-3">{{ 'Meeting has been cancelled'|t }}</div>
-{% elseif meeting_has_been_held %}
-  <div class="pretix-alert meeting-has-been-held my-3">{{ 'Meeting has already been held'|t }}</div>
-{% else %}
-  {% if registration_deadline_passed %}
-    {# @TODO: Design: styling of "alert" #}
-    <div class="pretix-alert pretix-alert-registration-deadline-passed my-3">{{ 'Registration deadline passed'|t }}</div>
+{% 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 %}
+    <div class="pretix-alert meeting-has-been-cancelled my-3">{{ 'Meeting has been cancelled'|t }}</div>
+  {% elseif meeting_has_been_held %}
+    <div class="pretix-alert meeting-has-been-held my-3">{{ 'Meeting has already been held'|t }}</div>
   {% else %}
-    <a id="sign-up-shortcut" class="btn btn-primary btn-sm my-3" style="display: none">{{ 'Sign up for public meeting'|t }}</a>
+    {% if registration_deadline_passed %}
+      <div class="pretix-alert pretix-alert-registration-deadline-passed my-3">{{ 'Registration deadline passed'|t }}</div>
+    {% else %}
+      <a id="sign-up-shortcut" class="btn btn-primary btn-sm my-3" style="display: none">{{ 'Sign up for public meeting'|t }}</a>
+    {% endif %}
   {% endif %}
 {% endif %}