UHF-9132: Merge branch 'main' of https://github.com/City-of-Helsinki/…

…drupal-hdbt into UHF-9132

hdbt.libraries.yml

@@ -44,7 +44,7 @@ hdbt-icons:
       dist/css/hdbt-icons.css: {}
 
 embedded-content-cookie-compliance:
-  version: 1.x
+  version: 1.0
   js:
     dist/js/embedded-content-cookie-compliance.min.js: {}
   dependencies:
@@ -141,18 +141,22 @@ nav-global:
     - hdbt/nav-toggle
 
 event-list:
-  version: 1.x
+  version: 1.0
   js:
-    dist/js/linkedevents.min.js: {}
+    dist/js/linkedevents.min.js: {
+      preprocess: false
+    }
   dependencies:
     - core/drupalSettings
     - core/jquery
     - core/drupal
 
 school-search:
-  version: 1.x
+  version: 1.0
   js:
-    dist/js/school-search.min.js: {}
+    dist/js/school-search.min.js: {
+      preprocess: false
+    }
   dependencies:
     - core/drupalSettings
     - core/drupal
@@ -169,25 +173,31 @@ hyphenopoly:
     }
 
 job-search:
-  version: 1.x
+  version: 1.0
   js:
-    dist/js/job-search.min.js: {}
+    dist/js/job-search.min.js: {
+      preprocess: false
+    }
   dependencies:
     - core/drupalSettings
     - core/drupal
 
 district-and-project-search:
-  version: 1.x
+  version: 1.0
   js:
-    dist/js/district-and-project-search.min.js: {}
+    dist/js/district-and-project-search.min.js: {
+      preprocess: false
+    }
   dependencies:
     - core/drupalSettings
     - core/drupal
 
 news-archive:
-  version: 1.x
+  version: 1.0
   js:
-    dist/js/news-archive.min.js: {}
+    dist/js/news-archive.min.js: {
+      preprocess: false
+    }
   dependencies:
     - core/drupalSettings
     - core/drupal

hdbt.theme

@@ -1333,6 +1333,17 @@ function hdbt_preprocess_tpr_unit(&$variables): void {
       'unit_picture_caption'
     );
   }
+
+  // Check if the unit is a daycare unit.
+  $variables['is_daycare_unit'] = FALSE;
+  if ($entity->hasField('field_unit_type')) {
+    $types = $entity->get('field_unit_type')->referencedEntities();
+    foreach ($types as $type) {
+      if ($type->id() == 1) {
+        $variables['is_daycare_unit'] = TRUE;
+      }
+    }
+  }
 }
 
 /**

src/js/embedded-content-cookie-compliance.js

@@ -7,11 +7,17 @@
 // eslint-disable-next-line func-names
 (function ($, Drupal, drupalSettings) {
   function loadEmbeddedContent() {
-    if (typeof Drupal.eu_cookie_compliance === 'undefined') {
+    if (
+      typeof Drupal.eu_cookie_compliance === 'undefined' ||
+      !drupalSettings.embedded_media_attributes
+    ) {
       return;
     }
 
-    if (Drupal.eu_cookie_compliance.hasAgreed('preference') && Drupal.eu_cookie_compliance.hasAgreed('statistics')) {
+    if (
+      Drupal.eu_cookie_compliance.hasAgreed('preference') &&
+      Drupal.eu_cookie_compliance.hasAgreed('statistics')
+    ) {
       // eslint-disable-next-line no-restricted-syntax
       for (const [id, attributes] of Object.entries(drupalSettings.embedded_media_attributes)) {
         const iframeElement = document.createElement('iframe');
@@ -59,7 +65,7 @@
           skipLinkAfter.text = Drupal.t('Continue above the journey planner', {}, { context: 'Skip link after the journey planner for the journey planner paragraph' });
           skipLinkBefore.text = Drupal.t('Continue below the journey planner', {}, { context: 'Skip link before the journey planner for the journey planner paragraph' });
           $(`.embedded-content-cookie-compliance.media-${id}`)
-            .replaceWith(skipLinkBefore, containerElement, skipLinkAfter);   
+            .replaceWith(skipLinkBefore, containerElement, skipLinkAfter);
         }
       }
 

src/scss/06_components/pages/_cookie-compliance.scss

@@ -10,6 +10,9 @@
 }
 
 .cookie-compliance-block {
+  @include components-container-max-width;
+  @include component-side-padding;
+
   .cookie-selection-instruction {
     @include font('body');
     border-bottom: 1px solid $color-black-20;

templates/layout/region--tools.html.twig

@@ -12,7 +12,7 @@
  * @see template_preprocess_region()
  */
 #}
-{% if content %}
+{% if content|render %}
   <div{{ attributes.addClass('tools__container') }}>
     {{ content }}
   </div>

templates/module/helfi_tpr/tpr-unit.html.twig

@@ -9,6 +9,7 @@
 {% set has_prices = content.price_info|render ? true : false %}
 {% set has_contacts = content.contacts|render ? true : false %}
 {% set has_ontologyword_details = content.field_ontologyword_details|render ? true : false %}
+{% set has_subgroup = content.subgroup|render ? true : false %}
 {% set has_other_info = content.highlights|render or content.topical|render or content.other_info|render or content.links|render ?: false %}
 
 {% set supports_swedish %}
@@ -86,7 +87,7 @@
 
       {{ content.field_content }}
 
-      {% if has_prices or has_contacts or has_other_info %}
+      {% if has_prices or has_contacts or has_other_info or has_subgroup or has_ontologyword_details %}
         {% embed "@hdbt/misc/component.twig" with
           {
             component_classes: [
@@ -134,6 +135,23 @@
               } %}
             {% endif %}
 
+            {% if is_daycare_unit and has_subgroup %}
+              {% set subgroup_accordion_content %}
+
+                {% embed "@hdbt/misc/component.twig" with { component_classes: [ 'component--paragraph-text' ] } %}
+                  {% block component_content %}
+                    {{ content.subgroup }}
+                  {% endblock component_content %}
+                {% endembed %}
+
+              {% endset %}
+              {% include '@hdbt/component/accordion.twig' ignore missing with {
+                heading_level: 'h2',
+                heading: 'Contact details of daycare centre groups'|t({}, {'context': 'TPR Unit tpr data accordion heading'}) ,
+                content: subgroup_accordion_content,
+              } %}
+            {% endif %}
+
             {% if has_ontologyword_details %}
               {% set ontologyword_details_accordion_content %}
 
@@ -142,15 +160,13 @@
                     {{ content.field_ontologyword_details }}
                   {% endblock component_content %}
                 {% endembed %}
-
               {% endset %}
 
               {% include '@hdbt/component/accordion.twig' ignore missing with {
                 heading_level: 'h2',
                 heading: 'Language program and weighted curriculum education'|t({}, {'context': 'TPR Ontologyword details schools'}),
                 content: ontologyword_details_accordion_content,
               } %}
-
             {% endif %}
 
             {% if has_other_info %}

translations/fi.po

@@ -834,3 +834,7 @@ msgstr "Tyhjennä valinnat"
 msgctxt "Job search no results message"
 msgid "Jobs meeting search criteria was not found. Try different search criteria."
 msgstr "Hakuehtoja vastaavia työpaikkoja ei löytynyt. Kokeile muita hakuehtoja."
+
+msgctxt "TPR Unit tpr data accordion heading"
+msgid "Contact details of daycare centre groups"
+msgstr "Päiväkotiryhmien yhteystiedot"

translations/sv.po

@@ -827,3 +827,7 @@ msgstr "Töm urvalet"
 msgctxt "Job search no results message"
 msgid "Jobs meeting search criteria was not found. Try different search criteria."
 msgstr "Lediga jobb som uppfyller kriterierna finns inte. Prova andra kriterierna för sök."
+
+msgctxt "TPR Unit tpr data accordion heading"
+msgid "Contact details of daycare centre groups"
+msgstr "Barngruppernas kontaktuppgifter"