diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a0c45020..ad1b1d40c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [4.11.0] - 2025-07-01 +* [PR-533](https://github.com/itk-dev/deltag.aarhus.dk/pull/533) + Show deadline date on hearing teaser instead of startdate - Closes issues #532 * [PR-531](https://github.com/itk-dev/deltag.aarhus.dk/pull/531) Added custom toolbar visibility logic (replacing [Toolbar Visibility](https://www.drupal.org/project/toolbar_visibility)) diff --git a/web/modules/custom/hoeringsportal_data/src/Helper/HearingHelper.php b/web/modules/custom/hoeringsportal_data/src/Helper/HearingHelper.php index 1a5fa12f6..19575d4ce 100644 --- a/web/modules/custom/hoeringsportal_data/src/Helper/HearingHelper.php +++ b/web/modules/custom/hoeringsportal_data/src/Helper/HearingHelper.php @@ -183,4 +183,15 @@ public function getStartDate(NodeInterface $node): ?int { return $node->field_start_date->date->getTimestamp(); } + /** + * Get deadline date. + */ + public function getDeadlineDate(NodeInterface $node): ?int { + if (!$this->isHearing($node)) { + return NULL; + } + + return $node->field_reply_deadline->date->getTimestamp(); + } + } diff --git a/web/themes/custom/hoeringsportal/templates/content/node--hearing--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--hearing--teaser.html.twig index 519c6a805..a2b4bfeda 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--hearing--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--hearing--teaser.html.twig @@ -8,16 +8,26 @@ {# Set how many replies there is to this hearing #} {% set repliesCount = hearing_helper.getNumberOfReplies(node) %} -{# Set date for next meeting #} +{# Set startdate for hearing #} {% set startdate = hearing_helper.getStartDate(node) %} +{# Set deadlinedate for hearing #} +{% set deadlinedate = hearing_helper.getDeadlineDate(node) %} + +{# Set is deadlinepassed #} +{% set deadlinepassed = hearing_helper.isDeadlinePassed(node) %} + {# Show a date splash on the card #} {% block card_date %} {# If we have a date then show a date splash on the card #} - {% if (startdate) %} + {% if (content_state in ['upcoming', 'active']) %} {# Show the date #} -
{{ item.value }}
-{{ 'Hearing has ended'|t }}
- + {% if (content_state in ['upcoming', 'active', 'finished']) %} + {% for item in items %} +{{ item.value }}
+{{ 'Hearing has been canceled'|t }}