Merge pull request #523 from City-of-Helsinki/UHF-9453

UHF-9453: Remove Espoo and Vantaa schools from comprehensive school search fallback
City-of-Helsinki · Dec 14, 2023 · cf02e52 · cf02e52
2 parents bdeaf53 + cff3f0c
commit cf02e52
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/conf/cmi/views.view.comprehensive_school_search.yml b/conf/cmi/views.view.comprehensive_school_search.yml
@@ -262,6 +262,47 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
+        address__locality:
+          id: address__locality
+          table: tpr_unit_field_data
+          field: address__locality
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: tpr_unit
+          entity_field: address
+          plugin_id: string
+          operator: contains
+          value: Helsinki
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
       style:
         type: default
       row:

diff --git a/public/themes/custom/hdbt_subtheme/templates/module/helfi_tpr/tpr-unit.html.twig b/public/themes/custom/hdbt_subtheme/templates/module/helfi_tpr/tpr-unit.html.twig
@@ -29,13 +29,16 @@
     {% set view_mode_class = 'card--vocational-school-teaser' %}
     {% set unit_url_external = false %}
   {% else %}
-    {% set view_mode_class = 'card--comprehensive-school-teaser' %}
+    {% set view_mode_class = [
+      'card--comprehensive-school-teaser',
+      not content_entity_published ? 'card--unpublished',
+    ] %}
     {% set unit_url_external = false %}
   {% endif %}
 
   {% if view_mode == 'comprehensive_school_card' %}
     {% embed '@hdbt/component/card.twig' with {
-      card_modifier_class: view_mode_class,
+      card_modifier_class: view_mode_class|join(' '),
       card_image: card_image,
       card_title: card_title,
       card_url: unit_url,