Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UHF-9150: Import more TPR ontologywords and display those on comprehensive school TPR unit page #479

Merged
merged 22 commits into from
Nov 16, 2023
Merged

UHF-9150: Import more TPR ontologywords and display those on comprehensive school TPR unit page #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
59aa26f
UHF-9150: add ontologyword details reference field to tpr unit.
Jussiles Oct 30, 2023
dc4df61
UHF-9150: add new ontologyword ids to import.
Jussiles Oct 30, 2023
828b6a7
UHF-9150: add new field formatter to tpr units ontologyword details f…
Jussiles Nov 3, 2023
a30157e
UHF-9150: add theme for tpr untis ontologyword details field.
Jussiles Nov 3, 2023
e573fa5
UHF-9150: add UnitOntologyWordDetailsSubscriber for tpr unit.
Jussiles Nov 3, 2023
2fd7b3f
UHF-9150: add new field configs.
Jussiles Nov 3, 2023
2e49e2a
UHF-9150: add field formatter to tpr units ontologyword deta
Jussiles Nov 3, 2023
1a7a0b5
UHF-9150: Add translation files.
Jussiles Nov 8, 2023
5df9714
UHF-9150: finetune using custom field formatter.
Jussiles Nov 8, 2023
d0bc438
UHF-9150: add entity configs.
Jussiles Nov 8, 2023
9c7bad2
UHF-9150: add styles and update translations.
Jussiles Nov 8, 2023
5d3c608
UHF-9150: PR fixes.
Jussiles Nov 9, 2023
8ba2589
UHF-9150: Simplify schoolyear check as TPR fixed data on their end.
Jussiles Nov 9, 2023
0a60d3d
UHF-9150: move helfi_school_addons code under helfi_kasko_content mod…
Jussiles Nov 9, 2023
df3b2c3
UHF-9150: fix phpcs.
Jussiles Nov 9, 2023
b987709
UHF-9150: fix update hook 9003
Jussiles Nov 9, 2023
4cc6433
UHF-9150: add conf line back.
Jussiles Nov 16, 2023
58992ed
UHF-9150: add css var.
Jussiles Nov 16, 2023
1aede80
UHF-9150: try to fix sonar cloud duplicate code warning.
Jussiles Nov 16, 2023
db3483e
UHF-9150: fix snake_cases.
Jussiles Nov 16, 2023
d6f4b2c
UHF-9150: fix comments var names.
Jussiles Nov 16, 2023
2f8aec7
UHF-9150: Merge dev into UHF-9150-import-more-ontology-words. Fix con…
Jussiles Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dependencies:
- field.field.tpr_unit.tpr_unit.field_hs_front_page
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_ontologyword_details
- field.field.tpr_unit.tpr_unit.field_study_field
- field.field.tpr_unit.tpr_unit.field_unit_type
module:
Expand Down Expand Up @@ -163,6 +164,16 @@ content:
sidebar: false
use_details: true
third_party_settings: { }
field_ontologyword_details:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
field_unit_type:
type: entity_reference_autocomplete
weight: 30
Expand Down
22 changes: 4 additions & 18 deletions .../core.entity_view_display.tpr_ontology_word_details.tpr_ontology_word_details.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ mode: default
content:
detail_items:
type: tpr_ontology_word_detail_item
label: inline
label: hidden
settings: { }
third_party_settings: { }
weight: 3
weight: 1
region: content
name:
type: string
Expand All @@ -24,30 +24,16 @@ content:
third_party_settings: { }
weight: 0
region: content
ontologyword_id:
type: string
label: above
settings:
link_to_entity: false
third_party_settings: { }
weight: 2
region: content
school_details:
type: tpr_school_details
label: above
settings: { }
third_party_settings: { }
weight: 3
region: content
unit_id:
type: string
label: above
settings:
link_to_entity: false
third_party_settings: { }
weight: 1
region: content
hidden:
langcode: true
name_override: true
ontologyword_id: true
search_api_excerpt: true
unit_id: true
3 changes: 3 additions & 0 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.comprehensive_school_card.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ dependencies:
- core.entity_view_mode.tpr_unit.comprehensive_school_card
- field.field.tpr_unit.tpr_unit.field_categories
- field.field.tpr_unit.tpr_unit.field_content
- field.field.tpr_unit.tpr_unit.field_districts
- field.field.tpr_unit.tpr_unit.field_hs_front_page
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_ontologyword_details
- field.field.tpr_unit.tpr_unit.field_study_field
- field.field.tpr_unit.tpr_unit.field_unit_type
- responsive_image.styles.image__3_2
Expand Down Expand Up @@ -97,6 +99,7 @@ hidden:
field_hs_front_page: true
field_lower_content: true
field_metatags: true
field_ontologyword_details: true
field_study_field: true
field_unit_type: true
hide_description: true
Expand Down
9 changes: 9 additions & 0 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ dependencies:
- field.field.tpr_unit.tpr_unit.field_hs_front_page
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_ontologyword_details
- field.field.tpr_unit.tpr_unit.field_study_field
- field.field.tpr_unit.tpr_unit.field_unit_type
- responsive_image.styles.image__3_2
module:
- address
- entity_reference_revisions
- helfi_address_search
- helfi_kasko_content
- helfi_tpr
- imagecache_external
- link
Expand Down Expand Up @@ -133,6 +135,13 @@ content:
third_party_settings: { }
weight: 17
region: content
field_ontologyword_details:
type: tpr_ontologyword_details_formatter
label: hidden
settings: { }
third_party_settings: { }
weight: 28
region: content
highlights:
type: tpr_connection
label: hidden
Expand Down
3 changes: 3 additions & 0 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.high_school_card.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ dependencies:
- core.entity_view_mode.tpr_unit.high_school_card
- field.field.tpr_unit.tpr_unit.field_categories
- field.field.tpr_unit.tpr_unit.field_content
- field.field.tpr_unit.tpr_unit.field_districts
- field.field.tpr_unit.tpr_unit.field_hs_front_page
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_ontologyword_details
- field.field.tpr_unit.tpr_unit.field_study_field
- field.field.tpr_unit.tpr_unit.field_unit_type
- responsive_image.styles.image__3_2
Expand Down Expand Up @@ -217,6 +219,7 @@ hidden:
created: true
field_categories: true
field_districts: true
field_ontologyword_details: true
field_study_field: true
field_unit_type: true
hide_description: true
Expand Down
2 changes: 2 additions & 0 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies:
- field.field.tpr_unit.tpr_unit.field_hs_front_page
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_ontologyword_details
- field.field.tpr_unit.tpr_unit.field_study_field
- field.field.tpr_unit.tpr_unit.field_unit_type
module:
Expand Down Expand Up @@ -63,6 +64,7 @@ hidden:
field_hs_front_page: true
field_lower_content: true
field_metatags: true
field_ontologyword_details: true
field_study_field: true
field_unit_type: true
hide_description: true
Expand Down
2 changes: 2 additions & 0 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies:
- field.field.tpr_unit.tpr_unit.field_hs_front_page
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_ontologyword_details
- field.field.tpr_unit.tpr_unit.field_study_field
- field.field.tpr_unit.tpr_unit.field_unit_type
- responsive_image.styles.image__3_2
Expand Down Expand Up @@ -83,6 +84,7 @@ hidden:
field_hs_front_page: true
field_lower_content: true
field_metatags: true
field_ontologyword_details: true
field_study_field: true
field_unit_type: true
hide_description: true
Expand Down
2 changes: 2 additions & 0 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies:
- field.field.tpr_unit.tpr_unit.field_hs_front_page
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_ontologyword_details
- field.field.tpr_unit.tpr_unit.field_study_field
- field.field.tpr_unit.tpr_unit.field_unit_type
- responsive_image.styles.image__3_2
Expand Down Expand Up @@ -84,6 +85,7 @@ hidden:
field_hs_front_page: true
field_lower_content: true
field_metatags: true
field_ontologyword_details: true
field_study_field: true
field_unit_type: true
hide_description: true
Expand Down
3 changes: 3 additions & 0 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.vocational_school_card.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ dependencies:
- core.entity_view_mode.tpr_unit.vocational_school_card
- field.field.tpr_unit.tpr_unit.field_categories
- field.field.tpr_unit.tpr_unit.field_content
- field.field.tpr_unit.tpr_unit.field_districts
- field.field.tpr_unit.tpr_unit.field_hs_front_page
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_ontologyword_details
- field.field.tpr_unit.tpr_unit.field_study_field
- field.field.tpr_unit.tpr_unit.field_unit_type
- responsive_image.styles.image__3_2
Expand Down Expand Up @@ -212,6 +214,7 @@ hidden:
field_categories: true
field_districts: true
field_hs_front_page: true
field_ontologyword_details: true
field_study_field: true
field_unit_type: true
hide_description: true
Expand Down
2 changes: 2 additions & 0 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies:
- field.field.tpr_unit.tpr_unit.field_hs_front_page
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_ontologyword_details
- field.field.tpr_unit.tpr_unit.field_study_field
- field.field.tpr_unit.tpr_unit.field_unit_type
- responsive_image.styles.image__3_2
Expand Down Expand Up @@ -99,6 +100,7 @@ hidden:
field_hs_front_page: true
field_lower_content: true
field_metatags: true
field_ontologyword_details: true
field_study_field: true
field_unit_type: true
hide_description: true
Expand Down
1 change: 0 additions & 1 deletion conf/cmi/core.extension.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ module:
helfi_platform_config_base: 0
helfi_proxy: 0
helfi_react_search: 0
helfi_school_addons: 0
helfi_toc: 0
helfi_tpr: 0
helfi_tpr_config: 0
Expand Down
27 changes: 27 additions & 0 deletions conf/cmi/field.field.tpr_unit.tpr_unit.field_ontologyword_details.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
uuid: bc61eadf-6aa1-4a88-9675-ae4063ed527b
langcode: en
status: true
dependencies:
config:
- field.storage.tpr_unit.field_ontologyword_details
module:
- helfi_tpr
id: tpr_unit.tpr_unit.field_ontologyword_details
field_name: field_ontologyword_details
entity_type: tpr_unit
bundle: tpr_unit
label: 'Ontologyword details'
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
handler: 'default:tpr_ontology_word_details'
handler_settings:
target_bundles: null
sort:
field: _none
direction: ASC
auto_create: false
field_type: entity_reference
19 changes: 19 additions & 0 deletions conf/cmi/field.storage.tpr_unit.field_ontologyword_details.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
uuid: 9b23d149-a34b-4310-a4cc-1a35688a867a
langcode: en
status: true
dependencies:
module:
- helfi_tpr
id: tpr_unit.field_ontologyword_details
field_name: field_ontologyword_details
entity_type: tpr_unit
type: entity_reference
settings:
target_type: tpr_ontology_word_details
module: core
locked: false
cardinality: -1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
73 changes: 67 additions & 6 deletions conf/cmi/helfi_tpr.limit_ontology_words.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,77 @@
ids:
- 1
- 2
- 3
- 15
- 16
- 17
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 25
- 26
- 27
- 28
- 29
- 30
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 38
- 86
- 101
- 102
- 103
- 104
- 105
- 106
- 107
- 108
- 109
- 110
- 111
- 112
- 113
- 114
- 115
- 116
- 117
- 118
- 119
- 120
- 121
- 122
- 123
- 157
- 200
- 288
- 293
- 294
- 295
- 297
- 472
- 489
- 493
- 590
- 650
- 816
- 831
- 872
- 873
- 892
- 86
- 200
- 288
- 294
- 489
- 831
- 904
- 905
- 906
- 907
- 908
- 909
- 910
- 911
2 changes: 1 addition & 1 deletion conf/cmi/user.role.admin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
- group
- group_content_menu
- helfi_api_base
- helfi_school_addons
- helfi_kasko_content
- helfi_tpr
- locale
- media
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/user.role.editor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies:
- filter
- group
- helfi_api_base
- helfi_school_addons
- helfi_kasko_content
- helfi_tpr
- locale
- media
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/views.view.high_school_search.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
config:
- core.entity_view_mode.tpr_unit.high_school_card
module:
- helfi_school_addons
- helfi_kasko_content
- helfi_tpr
- user
_core:
Expand Down
Loading