Skip to content

Commit 7b1692d

Browse files
martinydemartinyde
authored
Merge pull request #588 from itk-dev/feature/add-age-and-area-to-dialogue
Feature/add age and area to dialogue
2 parents ed01a96 + 866c0f2 commit 7b1692d

18 files changed

Lines changed: 755 additions & 7 deletions

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
88

9+
* [PR-588](https://github.com/itk-dev/deltag.aarhus.dk/pull/588)
10+
Added area and age span selection to dialogue proposal form
911
* [PR-591](https://github.com/itk-dev/deltag.aarhus.dk/pull/591)
1012
* Cleaned up local OIDC setup
1113
* Added test server OIDC setup

‎config/sync/core.entity_form_display.node.dialogue_proposal.default.yml‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ langcode: da
33
status: true
44
dependencies:
55
config:
6+
- field.field.node.dialogue_proposal.field_age_span
7+
- field.field.node.dialogue_proposal.field_area
68
- field.field.node.dialogue_proposal.field_comments
79
- field.field.node.dialogue_proposal.field_dialogue
810
- field.field.node.dialogue_proposal.field_dialogue_proposal_category
@@ -21,9 +23,21 @@ targetEntityType: node
2123
bundle: dialogue_proposal
2224
mode: default
2325
content:
26+
field_age_span:
27+
type: options_select
28+
weight: 2
29+
region: content
30+
settings: { }
31+
third_party_settings: { }
32+
field_area:
33+
type: options_buttons
34+
weight: 1
35+
region: content
36+
settings: { }
37+
third_party_settings: { }
2438
field_dialogue:
2539
type: entity_reference_autocomplete
26-
weight: 5
40+
weight: 7
2741
region: content
2842
settings:
2943
match_operator: CONTAINS
@@ -33,29 +47,29 @@ content:
3347
third_party_settings: { }
3448
field_dialogue_proposal_category:
3549
type: options_buttons
36-
weight: 2
50+
weight: 4
3751
region: content
3852
settings: { }
3953
third_party_settings: { }
4054
field_dialogue_proposal_descr:
4155
type: string_textarea
42-
weight: 1
56+
weight: 3
4357
region: content
4458
settings:
4559
rows: 5
4660
placeholder: ''
4761
third_party_settings: { }
4862
field_image_upload:
4963
type: image_image
50-
weight: 3
64+
weight: 5
5165
region: content
5266
settings:
5367
progress_indicator: throbber
5468
preview_image_style: thumbnail
5569
third_party_settings: { }
5670
field_location:
5771
type: hoeringsportal_data_map_default
58-
weight: 4
72+
weight: 6
5973
region: content
6074
settings:
6175
available_types:
@@ -65,15 +79,15 @@ content:
6579
third_party_settings: { }
6680
field_owner_email:
6781
type: email_default
68-
weight: 27
82+
weight: 9
6983
region: content
7084
settings:
7185
placeholder: ''
7286
size: 60
7387
third_party_settings: { }
7488
field_owner_name:
7589
type: string_textfield
76-
weight: 26
90+
weight: 8
7791
region: content
7892
settings:
7993
size: 60

‎config/sync/core.entity_view_display.node.dialogue_proposal.default.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ status: true
44
dependencies:
55
config:
66
- core.entity_view_display.comment.early_inclusion_comment.default
7+
- field.field.node.dialogue_proposal.field_age_span
8+
- field.field.node.dialogue_proposal.field_area
79
- field.field.node.dialogue_proposal.field_comments
810
- field.field.node.dialogue_proposal.field_dialogue
911
- field.field.node.dialogue_proposal.field_dialogue_proposal_category
@@ -98,6 +100,8 @@ content:
98100
weight: 0
99101
region: content
100102
hidden:
103+
field_age_span: true
104+
field_area: true
101105
langcode: true
102106
links: true
103107
published_at: true

‎config/sync/core.entity_view_display.node.dialogue_proposal.full.yml‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
uuid: 8cb0d170-373f-4ab3-a948-f91b0884de2d
2+
langcode: da
3+
status: true
4+
dependencies:
5+
config:
6+
- core.entity_view_display.comment.early_inclusion_comment.default
7+
- core.entity_view_mode.node.full
8+
- field.field.node.dialogue_proposal.field_age_span
9+
- field.field.node.dialogue_proposal.field_area
10+
- field.field.node.dialogue_proposal.field_comments
11+
- field.field.node.dialogue_proposal.field_dialogue
12+
- field.field.node.dialogue_proposal.field_dialogue_proposal_category
13+
- field.field.node.dialogue_proposal.field_dialogue_proposal_descr
14+
- field.field.node.dialogue_proposal.field_image_upload
15+
- field.field.node.dialogue_proposal.field_location
16+
- field.field.node.dialogue_proposal.field_owner_email
17+
- field.field.node.dialogue_proposal.field_owner_name
18+
- node.type.dialogue_proposal
19+
module:
20+
- comment
21+
- hoeringsportal_data
22+
- svg_image
23+
- taxonomy
24+
- user
25+
id: node.dialogue_proposal.full
26+
targetEntityType: node
27+
bundle: dialogue_proposal
28+
mode: full
29+
content:
30+
field_area:
31+
type: entity_reference_rss_category
32+
label: hidden
33+
settings: { }
34+
third_party_settings: { }
35+
weight: 11
36+
region: content
37+
field_comments:
38+
type: comment_default
39+
label: hidden
40+
settings:
41+
view_mode: default
42+
pager_id: 0
43+
third_party_settings: { }
44+
weight: 4
45+
region: content
46+
field_dialogue:
47+
type: entity_reference_label
48+
label: hidden
49+
settings:
50+
link: true
51+
third_party_settings: { }
52+
weight: 5
53+
region: content
54+
field_dialogue_proposal_category:
55+
type: entity_reference_label
56+
label: hidden
57+
settings:
58+
link: false
59+
third_party_settings: { }
60+
weight: 7
61+
region: content
62+
field_dialogue_proposal_descr:
63+
type: basic_string
64+
label: hidden
65+
settings: { }
66+
third_party_settings: { }
67+
weight: 2
68+
region: content
69+
field_image_upload:
70+
type: image
71+
label: hidden
72+
settings:
73+
image_link: ''
74+
image_style: ''
75+
image_loading:
76+
attribute: lazy
77+
svg_attributes:
78+
width: null
79+
height: null
80+
svg_render_as_image: true
81+
third_party_settings: { }
82+
weight: 6
83+
region: content
84+
field_location:
85+
type: hoeringsportal_data_map_default
86+
label: hidden
87+
settings: { }
88+
third_party_settings: { }
89+
weight: 9
90+
region: content
91+
field_owner_email:
92+
type: basic_string
93+
label: hidden
94+
settings: { }
95+
third_party_settings: { }
96+
weight: 8
97+
region: content
98+
field_owner_name:
99+
type: string
100+
label: hidden
101+
settings:
102+
link_to_entity: false
103+
third_party_settings: { }
104+
weight: 10
105+
region: content
106+
flag_support_proposal:
107+
settings: { }
108+
third_party_settings: { }
109+
weight: 0
110+
region: content
111+
links:
112+
settings: { }
113+
third_party_settings: { }
114+
weight: 3
115+
region: content
116+
sharing_buttons:
117+
settings: { }
118+
third_party_settings: { }
119+
weight: 1
120+
region: content
121+
hidden:
122+
field_age_span: true
123+
langcode: true
124+
published_at: true
125+
search_api_excerpt: true

‎config/sync/core.entity_view_display.node.dialogue_proposal.hearing_ticket_add.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
uuid: 63797078-17e8-4921-8ea2-8c150b9f4bc4
2+
langcode: da
3+
status: true
4+
dependencies:
5+
config:
6+
- core.entity_view_mode.node.hearing_ticket_add
7+
- field.field.node.dialogue_proposal.field_age_span
8+
- field.field.node.dialogue_proposal.field_area
9+
- field.field.node.dialogue_proposal.field_comments
10+
- field.field.node.dialogue_proposal.field_dialogue
11+
- field.field.node.dialogue_proposal.field_dialogue_proposal_category
12+
- field.field.node.dialogue_proposal.field_dialogue_proposal_descr
13+
- field.field.node.dialogue_proposal.field_image_upload
14+
- field.field.node.dialogue_proposal.field_location
15+
- field.field.node.dialogue_proposal.field_owner_email
16+
- field.field.node.dialogue_proposal.field_owner_name
17+
- node.type.dialogue_proposal
18+
module:
19+
- user
20+
id: node.dialogue_proposal.hearing_ticket_add
21+
targetEntityType: node
22+
bundle: dialogue_proposal
23+
mode: hearing_ticket_add
24+
content:
25+
field_area:
26+
type: entity_reference_label
27+
label: above
28+
settings:
29+
link: false
30+
third_party_settings: { }
31+
weight: 9
32+
region: right
33+
flag_support_proposal:
34+
settings: { }
35+
third_party_settings: { }
36+
weight: 10
37+
region: content
38+
links:
39+
settings: { }
40+
third_party_settings: { }
41+
weight: 100
42+
region: content
43+
sharing_buttons:
44+
settings: { }
45+
third_party_settings: { }
46+
weight: 100
47+
region: content
48+
hidden:
49+
field_age_span: true
50+
field_comments: true
51+
field_dialogue: true
52+
field_dialogue_proposal_category: true
53+
field_dialogue_proposal_descr: true
54+
field_image_upload: true
55+
field_location: true
56+
field_owner_email: true
57+
field_owner_name: true
58+
langcode: true
59+
published_at: true
60+
search_api_excerpt: true

‎config/sync/core.entity_view_display.node.dialogue_proposal.hearing_ticket_view.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
uuid: f78d29b9-35e0-46af-9f51-e6a589e57a1b
2+
langcode: da
3+
status: true
4+
dependencies:
5+
config:
6+
- core.entity_view_mode.node.hearing_ticket_view
7+
- field.field.node.dialogue_proposal.field_age_span
8+
- field.field.node.dialogue_proposal.field_area
9+
- field.field.node.dialogue_proposal.field_comments
10+
- field.field.node.dialogue_proposal.field_dialogue
11+
- field.field.node.dialogue_proposal.field_dialogue_proposal_category
12+
- field.field.node.dialogue_proposal.field_dialogue_proposal_descr
13+
- field.field.node.dialogue_proposal.field_image_upload
14+
- field.field.node.dialogue_proposal.field_location
15+
- field.field.node.dialogue_proposal.field_owner_email
16+
- field.field.node.dialogue_proposal.field_owner_name
17+
- node.type.dialogue_proposal
18+
module:
19+
- user
20+
id: node.dialogue_proposal.hearing_ticket_view
21+
targetEntityType: node
22+
bundle: dialogue_proposal
23+
mode: hearing_ticket_view
24+
content:
25+
field_area:
26+
type: entity_reference_label
27+
label: above
28+
settings:
29+
link: false
30+
third_party_settings: { }
31+
weight: 10
32+
region: right
33+
flag_support_proposal:
34+
settings: { }
35+
third_party_settings: { }
36+
weight: 10
37+
region: content
38+
links:
39+
settings: { }
40+
third_party_settings: { }
41+
weight: 100
42+
region: content
43+
sharing_buttons:
44+
settings: { }
45+
third_party_settings: { }
46+
weight: 100
47+
region: content
48+
hidden:
49+
field_age_span: true
50+
field_comments: true
51+
field_dialogue: true
52+
field_dialogue_proposal_category: true
53+
field_dialogue_proposal_descr: true
54+
field_image_upload: true
55+
field_location: true
56+
field_owner_email: true
57+
field_owner_name: true
58+
langcode: true
59+
published_at: true
60+
search_api_excerpt: true

‎config/sync/core.entity_view_display.node.dialogue_proposal.list_display.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ status: true
44
dependencies:
55
config:
66
- core.entity_view_mode.node.list_display
7+
- field.field.node.dialogue_proposal.field_age_span
8+
- field.field.node.dialogue_proposal.field_area
79
- field.field.node.dialogue_proposal.field_comments
810
- field.field.node.dialogue_proposal.field_dialogue
911
- field.field.node.dialogue_proposal.field_dialogue_proposal_category
@@ -41,6 +43,8 @@ content:
4143
weight: 0
4244
region: content
4345
hidden:
46+
field_age_span: true
47+
field_area: true
4448
field_comments: true
4549
field_dialogue: true
4650
field_image_upload: true

0 commit comments

Comments
 (0)