Merge branch 'master' into dev

This commit is contained in:
naomi 2022-05-09 17:26:11 +01:00
commit 08ad04310b
14 changed files with 550 additions and 228 deletions

View File

@ -4,13 +4,19 @@ status: true
dependencies:
config:
- opencase_entities.oc_activity_type.phone_call
module:
- hide_revision_field
id: oc_activity.phone_call.default
targetEntityType: oc_activity
bundle: phone_call
mode: default
content:
description:
type: string_textarea
weight: 2
region: content
settings:
rows: 5
placeholder: ''
third_party_settings: { }
name:
type: string_textfield
weight: 0
@ -19,18 +25,6 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 2
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
time_taken:
type: number
weight: 1
@ -41,7 +35,8 @@ content:
hidden:
activity_date_time: true
client: true
description: true
oc_provider: true
oc_target: true
revision_log: true
status: true
user_id: true

View File

@ -17,6 +17,14 @@ content:
settings:
placeholder: ''
third_party_settings: { }
description:
type: string_textarea
weight: 2
region: content
settings:
rows: 5
placeholder: ''
third_party_settings: { }
oc_fee_category:
type: options_select
weight: 0

View File

@ -19,6 +19,13 @@ content:
third_party_settings: { }
weight: 0
region: content
description:
type: basic_string
label: above
settings: { }
third_party_settings: { }
weight: 3
region: content
name:
type: string
label: hidden
@ -43,8 +50,11 @@ content:
label: above
settings: { }
third_party_settings: { }
weight: 3
weight: 4
region: content
hidden:
activity_date_time: true
oc_provider: true
oc_target: true
search_api_excerpt: true
status: true

View File

@ -15,7 +15,6 @@ dependencies:
- opencase_entities.oc_activity_type.trainer_debrief
module:
- image
- user
id: oc_activity.trainer_debrief.default
targetEntityType: oc_activity
bundle: trainer_debrief
@ -26,21 +25,21 @@ content:
label: above
settings: { }
third_party_settings: { }
weight: 9
weight: 10
region: content
field_issues_and_difficulties:
type: basic_string
label: above
settings: { }
third_party_settings: { }
weight: 4
weight: 5
region: content
field_issues_with_group_dynamics:
type: basic_string
label: above
settings: { }
third_party_settings: { }
weight: 5
weight: 6
region: content
field_number_of_participants:
type: number_integer
@ -49,7 +48,7 @@ content:
thousand_separator: ''
prefix_suffix: true
third_party_settings: { }
weight: 1
weight: 2
region: content
field_photo:
type: image
@ -58,35 +57,35 @@ content:
image_link: ''
image_style: ''
third_party_settings: { }
weight: 8
weight: 9
region: content
field_what_came_up_for_the_group:
type: basic_string
label: above
settings: { }
third_party_settings: { }
weight: 3
weight: 4
region: content
field_what_could_be_improved_for:
type: basic_string
label: above
settings: { }
third_party_settings: { }
weight: 7
weight: 8
region: content
field_what_did_facilitators_do_w:
type: basic_string
label: above
settings: { }
third_party_settings: { }
weight: 2
weight: 3
region: content
field_what_real_scenarios_or_inc:
type: basic_string
label: above
settings: { }
third_party_settings: { }
weight: 6
weight: 7
region: content
name:
type: string
@ -96,16 +95,20 @@ content:
third_party_settings: { }
weight: 0
region: content
user_id:
type: author
oc_provider:
type: entity_reference_label
label: above
settings: { }
settings:
link: true
third_party_settings: { }
weight: 10
weight: 1
region: content
hidden:
activity_date_time: true
client: true
oc_provider: true
description: true
oc_target: true
search_api_excerpt: true
status: true
time_taken: true
user_id: true

View File

@ -0,0 +1,45 @@
uuid: efaca5b6-aed7-4957-a728-fb0eea27d8ef
langcode: en
status: true
dependencies:
config:
- field.field.oc_case_fee.project_fee.feeds_item
- opencase_cases.oc_case_fee_type.project_fee
id: oc_case_fee.project_fee.default
targetEntityType: oc_case_fee
bundle: project_fee
mode: default
content:
amount:
type: number_decimal
label: above
settings:
thousand_separator: ''
decimal_separator: .
scale: 2
prefix_suffix: true
third_party_settings: { }
weight: 1
region: content
description:
type: basic_string
label: above
settings: { }
third_party_settings: { }
weight: 2
region: content
oc_fee_category:
type: entity_reference_label
label: above
settings:
link: true
third_party_settings: { }
weight: 0
region: content
hidden:
feeds_item: true
name: true
oc_case: true
search_api_excerpt: true
status: true
user_id: true

View File

@ -24,19 +24,19 @@ field_type_config:
field_type_condition:
'entity_bundle:oc_case':
id: 'entity_bundle:oc_case'
bundles:
project: project
negate: false
context_mapping:
oc_case: entity_extra_field.target_entity
negate: false
bundles:
project: project
route:
id: route
routes: ''
negate: false
routes: ''
request_path:
id: request_path
pages: ''
negate: false
pages: ''
current_theme:
id: current_theme
theme: ''

View File

@ -22,19 +22,19 @@ field_type_config:
field_type_condition:
'entity_bundle:oc_case':
id: 'entity_bundle:oc_case'
bundles:
project: project
negate: false
context_mapping:
oc_case: entity_extra_field.target_entity
negate: false
bundles:
project: project
route:
id: route
routes: ''
negate: false
routes: ''
request_path:
id: request_path
pages: ''
negate: false
pages: ''
current_theme:
id: current_theme
theme: ''

View File

@ -1,20 +1,21 @@
uuid: 724b0e99-12c3-4028-a805-df614711c22f
uuid: 4cf9ed31-fa62-41b4-a7a3-2750e7769e00
langcode: en
status: true
dependencies:
config:
- field.storage.oc_case.field_date_of_training
- field.storage.oc_case.field_number_of_participants
- field.storage.oc_case.field_project
- field.storage.oc_case.field_training_status
- field.storage.oc_case.field_training_type
- opencase_cases.oc_case_type.training
- system.menu.opencase
- user.role.authenticated
module:
- datetime
- opencase_cases
- opencase_entities
- options
- paragraphs
- user
id: oc_case.project.trainings
label: Trainings
@ -31,23 +32,23 @@ field_type_config:
field_type_condition:
'entity_bundle:oc_case':
id: 'entity_bundle:oc_case'
bundles:
project: project
negate: false
context_mapping:
oc_case: entity_extra_field.target_entity
negate: false
bundles:
project: project
route:
id: route
routes: ''
negate: false
routes: ''
request_path:
id: request_path
negate: false
pages: ''
current_theme:
id: current_theme
theme: ''
negate: 0
request_path:
id: request_path
pages: ''
negate: false
field_conditions_all_pass: false
display:
type: view

View File

@ -1,21 +1,22 @@
uuid: 8a57272e-e5d7-45cf-94f2-9bdb9c734cb9
uuid: 57f257e9-5e60-4342-87b0-2bcfbc50b560
langcode: en
status: true
dependencies:
config:
- field.storage.oc_case.field_date_of_training
- field.storage.oc_case.field_trainer
- field.storage.paragraph.field_trainer
- field.storage.oc_case.field_project
- field.storage.oc_case.field_training_status
- field.storage.oc_case.field_training_type
- opencase_cases.oc_case_type.training
- system.menu.opencase
- user.role.authenticated
module:
- datetime
- entity_reference_revisions
- opencase_cases
- opencase_entities
- options
- paragraphs
- user
_core:
default_config_hash: Of0WcqhFUX1HB3oQfisZ29RgEzlpmN7kiIRRYU2nzMo
id: oc_organisation.client.trainings
label: Trainings
display_label: true
@ -29,6 +30,12 @@ field_type_config:
display: block_2
arguments: ''
field_type_condition:
'entity_bundle:oc_organisation':
id: 'entity_bundle:oc_organisation'
negate: false
context_mapping:
oc_organisation: entity_extra_field.target_entity
bundles: { }
route:
id: route
negate: false

View File

@ -259,7 +259,7 @@ display:
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: true
trim: false
preserve_tags: ''
html: false
element_type: ''

View File

@ -228,6 +228,44 @@ display:
expose:
operator_limit_selection: false
operator_list: { }
field_active_value:
id: field_active_value
table: oc_actor__field_active
field: field_active_value
relationship: none
group_type: group
admin_label: ''
plugin_id: boolean
operator: '='
value: '1'
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
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: table
options:
@ -270,7 +308,18 @@ display:
replica: false
query_tags: { }
relationships: { }
header: { }
header:
area_text_custom:
id: area_text_custom
table: views
field: area_text_custom
relationship: none
group_type: group
admin_label: ''
plugin_id: text_custom
empty: false
content: '<a href=''/opencase/inactive-trainers''>This display does not include inactive trainers. Click here to see them</a>'
tokenize: false
footer: { }
display_extenders: { }
cache_metadata:
@ -287,6 +336,20 @@ display:
display_plugin: page
position: 1
display_options:
defaults:
header: false
header:
area_text_custom:
id: area_text_custom
table: views
field: area_text_custom
relationship: none
group_type: group
admin_label: ''
plugin_id: text_custom
empty: false
content: '<a href=''/opencase/inactive-trainers''>This display does not include inactive trainers. Click here to see them</a>'
tokenize: false
display_extenders: { }
path: opencase/all-trainers
menu:
@ -306,3 +369,93 @@ display:
- url.query_args
- user.roles
tags: { }
page_2:
id: page_2
display_title: Inactive
display_plugin: page
position: 2
display_options:
title: 'Inactive trainers'
filters:
type:
id: type
table: oc_actor_field_data
field: type
entity_type: oc_actor
entity_field: type
plugin_id: bundle
value:
trainer: trainer
expose:
operator_limit_selection: false
operator_list: { }
field_active_value:
id: field_active_value
table: oc_actor__field_active
field: field_active_value
relationship: none
group_type: group
admin_label: ''
plugin_id: boolean
operator: '='
value: '0'
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
is_grouped: false
group_info:
label: ''
description: ''
identifier: ''
optional: true
widget: select
multiple: false
remember: false
default_group: All
default_group_multiple: { }
group_items: { }
filter_groups:
operator: AND
groups:
1: AND
defaults:
title: false
filters: false
filter_groups: false
header: false
display_description: ''
header:
area_text_custom:
id: area_text_custom
table: views
field: area_text_custom
relationship: none
group_type: group
admin_label: ''
plugin_id: text_custom
empty: false
content: '<a href=''/opencase/all-trainers''>Back to active trainer list</a>'
tokenize: false
display_extenders: { }
path: opencase/inactive-trainers
cache_metadata:
max-age: -1
contexts:
- 'languages:language_content'
- 'languages:language_interface'
- url.query_args
- user.roles
tags: { }

View File

@ -170,7 +170,7 @@ display:
entity_type: oc_activity
entity_field: oc_provider
plugin_id: field
label: Trainer
label: 'Submitted by'
exclude: false
alter:
alter_text: false
@ -225,6 +225,59 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
view_oc_activity:
id: view_oc_activity
table: oc_activity
field: view_oc_activity
relationship: none
group_type: group
admin_label: ''
entity_type: oc_activity
plugin_id: entity_link
label: ''
exclude: false
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 0
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: false
preserve_tags: ''
html: false
element_type: ''
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
text: view
output_url_as_text: false
absolute: false
pager:
type: mini
options:

View File

@ -6,6 +6,7 @@ dependencies:
- opencase_entities.oc_activity_type.trainer_debrief
- user.role.authenticated
module:
- datetime
- opencase_cases
- opencase_entities
- user
@ -27,71 +28,6 @@ display:
display_options:
title: Debrief
fields:
oc_provider:
id: oc_provider
table: oc_activity_field_data
field: oc_provider
relationship: none
group_type: group
admin_label: ''
entity_type: oc_activity
entity_field: oc_provider
plugin_id: field
label: Trainer
exclude: false
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 0
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: false
preserve_tags: ''
html: false
element_type: ''
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: true
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: target_id
type: entity_reference_label
settings:
link: true
group_column: target_id
group_columns: { }
group_rows: true
delta_limit: 0
delta_offset: 0
delta_reversed: false
delta_first_last: false
multi_type: separator
separator: ', '
field_api_classes: false
status:
id: status
table: oc_activity_field_data
@ -159,17 +95,17 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
created:
id: created
activity_date_time:
id: activity_date_time
table: oc_activity_field_data
field: created
field: activity_date_time
relationship: none
group_type: group
admin_label: ''
entity_type: oc_activity
entity_field: created
entity_field: activity_date_time
plugin_id: field
label: Created
label: Date
exclude: false
alter:
alter_text: false
@ -211,11 +147,10 @@ display:
empty_zero: false
hide_alter_empty: true
click_sort_column: value
type: timestamp
type: datetime_default
settings:
date_format: short
custom_date_format: ''
timezone: ''
timezone_override: ''
format_type: medium
group_column: value
group_columns: { }
group_rows: true
@ -226,6 +161,71 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
oc_provider:
id: oc_provider
table: oc_activity_field_data
field: oc_provider
relationship: none
group_type: group
admin_label: ''
entity_type: oc_activity
entity_field: oc_provider
plugin_id: field
label: 'Submitted by'
exclude: false
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 0
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: false
preserve_tags: ''
html: false
element_type: ''
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: true
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: target_id
type: entity_reference_label
settings:
link: true
group_column: target_id
group_columns: { }
group_rows: true
delta_limit: 0
delta_offset: 0
delta_reversed: false
delta_first_last: false
multi_type: separator
separator: ', '
field_api_classes: false
view_oc_activity:
id: view_oc_activity
table: oc_activity

View File

@ -4,6 +4,7 @@ status: true
dependencies:
config:
- field.storage.oc_case.field_date_of_training
- field.storage.oc_case.field_number_of_participants
- field.storage.oc_case.field_project
- field.storage.oc_case.field_training_status
- field.storage.oc_case.field_training_type
@ -15,7 +16,6 @@ dependencies:
- opencase_cases
- opencase_entities
- options
- paragraphs
- user
_core:
default_config_hash: WEXYdHXh9zqan0bEwCzQypvhQhKOI9vpV1OM5DO-Rlk
@ -482,6 +482,70 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
field_number_of_participants:
id: field_number_of_participants
table: oc_case__field_number_of_participants
field: field_number_of_participants
relationship: none
group_type: group
admin_label: ''
plugin_id: field
label: 'Number of participants'
exclude: false
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 0
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: false
preserve_tags: ''
html: false
element_type: ''
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: true
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: value
type: number_integer
settings:
thousand_separator: ''
prefix_suffix: true
group_column: value
group_columns: { }
group_rows: true
delta_limit: 0
delta_offset: 0
delta_reversed: false
delta_first_last: false
multi_type: separator
separator: ', '
field_api_classes: false
pager:
type: mini
options:
@ -626,23 +690,20 @@ display:
distinct: false
replica: false
query_tags: { }
relationships:
field_trainer:
id: field_trainer
table: oc_case__field_trainer
field: field_trainer
relationship: none
group_type: group
admin_label: 'field_trainer: Paragraph'
plugin_id: standard
required: false
relationships: { }
group_by: false
header:
area_text_custom:
id: area_text_custom
table: views
field: area_text_custom
relationship: none
group_type: group
admin_label: ''
plugin_id: text_custom
empty: true
content: ''
tokenize: false
footer:
area_text_custom:
id: area_text_custom
@ -665,6 +726,7 @@ display:
- user.roles
tags:
- 'config:field.storage.oc_case.field_date_of_training'
- 'config:field.storage.oc_case.field_number_of_participants'
- 'config:field.storage.oc_case.field_project'
- 'config:field.storage.oc_case.field_training_status'
- 'config:field.storage.oc_case.field_training_type'
@ -1123,6 +1185,70 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
field_number_of_participants:
id: field_number_of_participants
table: oc_case__field_number_of_participants
field: field_number_of_participants
relationship: none
group_type: group
admin_label: ''
plugin_id: field
label: 'Number of participants'
exclude: false
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 0
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: false
preserve_tags: ''
html: false
element_type: ''
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: true
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: value
type: number_integer
settings:
thousand_separator: ''
prefix_suffix: true
group_column: value
group_columns: { }
group_rows: true
delta_limit: 0
delta_offset: 0
delta_reversed: false
delta_first_last: false
multi_type: separator
separator: ', '
field_api_classes: false
pager:
type: none
options:
@ -1256,7 +1382,7 @@ display:
group_type: group
admin_label: ''
plugin_id: text_custom
empty: false
empty: true
content: '<h2>Without date</h2>'
tokenize: false
footer:
@ -1283,79 +1409,7 @@ display:
- user.roles
tags:
- 'config:field.storage.oc_case.field_date_of_training'
- 'config:field.storage.oc_case.field_project'
- 'config:field.storage.oc_case.field_training_status'
- 'config:field.storage.oc_case.field_training_type'
block_1:
id: block_1
display_title: 'By trainer'
display_plugin: block
position: 1
display_options:
sorts: { }
arguments:
field_trainer_target_id:
id: field_trainer_target_id
table: paragraph__field_trainer
field: field_trainer_target_id
relationship: field_trainer
group_type: group
admin_label: ''
plugin_id: numeric
default_action: default
exception:
value: all
title_enable: false
title: All
title_enable: false
title: ''
default_argument_type: raw
default_argument_options:
index: 2
use_alias: false
default_argument_skip_url: false
summary_options:
base_path: ''
count: true
override: false
items_per_page: 25
summary:
sort_order: asc
number_of_records: 0
format: default_summary
specify_validation: false
validate:
type: none
fail: 'not found'
validate_options: { }
break_phrase: false
not: false
filters: { }
filter_groups:
operator: AND
groups:
1: AND
defaults:
relationships: true
fields: true
sorts: false
arguments: false
filters: false
filter_groups: false
footer: false
display_description: ''
footer: { }
display_extenders: { }
cache_metadata:
max-age: -1
contexts:
- 'languages:language_content'
- 'languages:language_interface'
- url
- url.query_args
- user.roles
tags:
- 'config:field.storage.oc_case.field_date_of_training'
- 'config:field.storage.oc_case.field_number_of_participants'
- 'config:field.storage.oc_case.field_project'
- 'config:field.storage.oc_case.field_training_status'
- 'config:field.storage.oc_case.field_training_type'
@ -1921,15 +1975,6 @@ display:
arguments: false
footer: false
relationships:
field_trainer:
id: field_trainer
table: oc_case__field_trainer
field: field_trainer
relationship: none
group_type: group
admin_label: 'field_trainer: Paragraph'
plugin_id: standard
required: false
client:
id: client
table: oc_case_field_data
@ -1955,6 +2000,7 @@ display:
- user.roles
tags:
- 'config:field.storage.oc_case.field_date_of_training'
- 'config:field.storage.oc_case.field_number_of_participants'
- 'config:field.storage.oc_case.field_project'
- 'config:field.storage.oc_case.field_training_status'
- 'config:field.storage.oc_case.field_training_type'
@ -3134,6 +3180,7 @@ display:
- user.roles
tags:
- 'config:field.storage.oc_case.field_date_of_training'
- 'config:field.storage.oc_case.field_number_of_participants'
- 'config:field.storage.oc_case.field_project'
- 'config:field.storage.oc_case.field_training_status'
- 'config:field.storage.oc_case.field_training_type'