Merge pull request #539 from itk-dev/hotfix/5227-public-meeting-summary

5227: Public meeting summary

Author: rimi-itk

CHANGELOG.md

@@ -6,6 +6,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+* [PR-539](https://github.com/itk-dev/deltag.aarhus.dk/pull/539)
+  Fixed public meeting summary view
 * [PR-537](https://github.com/itk-dev/deltag.aarhus.dk/pull/537)
   5209: Cleaned up public meeting summary view
 * [PR-538](https://github.com/itk-dev/deltag.aarhus.dk/pull/538)

web/modules/custom/hoeringsportal_base_fixtures/src/Fixture/PublicMeetingFixture.php

@@ -55,7 +55,6 @@ public function load() {
       'field_contact' => 'Contact info',
       'field_content_state' => 'active',
       'field_email_address' => 'a@a.dk',
-      'field_first_meeting_time' => date('Y-m-d', 1283166912),
       'field_media_document' => [[$this->getReference('media_library:Fil:MTM')]],
       'field_media_image_single' => [
         ['target_id' => $this->getReference('media:Large1')->id()],
@@ -89,6 +88,14 @@ public function load() {
     $this->addReference('public_meeting:fixture-1', $node);
     $node->save();
 
+    // Create a copy in the future.
+    $node = $node->createDuplicate();
+    $node->setTitle('Future public meeting with manual signup');
+    $node->set('field_registration_deadline', (new \DateTimeImmutable('today + 12 hours + 4 years'))->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT));
+    $node->set('field_last_meeting_time', (new \DateTimeImmutable('today + 19 hours + 4 years'))->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT));
+    $node->set('field_last_meeting_time_end', (new \DateTimeImmutable('today + 21 hours + 4 years'))->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT));
+    $node->save();
+
     // A public meeting that has signup with Pretix.
     $node = $node->createDuplicate();
     $node->setTitle('Public meeting with pretix signup');

web/modules/custom/hoeringsportal_content_blocks/templates/hoeringsportal-meeting-warning.html.twig

@@ -11,10 +11,10 @@
   <div class="bg-danger p-3">
     <div class="container">
       {% if config.content_state is same as('finished') %}
-        <span class="text-light"><strong>{{ 'Note!'|t }}</strong>{{ 'This public meeting has been held.'|t }}</span>
+        <span class="text-light"><strong>{{ 'Note!'|t }}</strong> {{ 'This public meeting has been held.'|t }}</span>
       {% endif %}
       {% if config.content_state is same as('cancelled') %}
-        <span class="text-light"><strong>{{ 'Note!'|t }}</strong>{{ 'This public meeting has been cancelled.'|t }}</span>
+        <span class="text-light"><strong>{{ 'Note!'|t }}</strong> {{ 'This public meeting has been cancelled.'|t }}</span>
       {% endif %}
     </div>
   </div>

web/modules/custom/hoeringsportal_public_meeting/src/Helper/PublicMeetingHelper.php

@@ -344,6 +344,7 @@ public function getPublicMeetingContext(NodeInterface $node): ?array {
     $upcoming = array_values(array_filter($dates, static fn(PretixDate $date) => $date->get('time_from')->getValue() > $now));
 
     return array_filter([
+      'is_pretix' => $this->hasPretixSignUp($node),
       'previous' => $previous,
       'current' => $current,
       'next' => $next,

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

@@ -10,6 +10,8 @@
  */
 #}
 
+{% if public_meeting_context.is_pretix|default(false) %}
+
 {# Define `variables` to match the one used in field--field-pretix-dates.html.twig #}
 {# Use current date if set. Otherwise the first upcoming date. #}
 {% set variables = public_meeting_context.current|default(public_meeting_context.upcoming|first) %}
@@ -26,20 +28,6 @@
 {% set is_current = variables.uuid == public_meeting_context.current.uuid %}
 {% set is_next = variables.uuid == public_meeting_context.next.uuid %}
 {% set is_first_upcoming = variables.uuid == public_meeting_context.upcoming[0].uuid %}
-
-{# {{ dump({
-  meeting_cancelled,
-  meeting_has_been_held,
-  registration_deadline_passed,
-  sign_up_url,
-  availability,
-  is_previous,
-  is_current,
-  is_next,
-  is_first_upcoming,
-
-  variables,
-  }) }} #}
 {% endif %}
 
 {% if public_meeting_context.current %}
@@ -105,3 +93,21 @@
   <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 %}
+
+{% else %}
+
+{# Non-pretix meeting #}
+{% if node.field_last_meeting_time[0] is defined %}
+  <h5 class="mt-3">{{ 'Date'|t }}</h5>
+  {{ node.field_last_meeting_time[0].date|date('U')|format_date('hoeringsportal_date_long') }}
+
+  <h5 class="mt-3">{{ 'Time'|t }}</h5>
+  {{ node.field_last_meeting_time[0].date|date('U')|format_date('hoeringsportal_time') }}{% if node.field_last_meeting_time_end[0].date is defined %} - {{ node.field_last_meeting_time_end[0].date|date('U')|format_date('hoeringsportal_time') }}{% endif %}
+{% endif %}
+
+{% if signup_deadline.value|default(false) %}
+  <h5 class="mt-3">{{ 'Last signup date'|t }}</h5>
+  {{ signup_deadline.value|date('U')|format_date('hoeringsportal_date_long') }}
+{% endif %}
+
+{% endif %}