diff --git a/modules/opencase_defaults/config/optional/block.block.facet_nationality.yml b/modules/opencase_defaults/config/optional/block.block.facet_nationality.yml
deleted file mode 100644
index 4bd9635..0000000
--- a/modules/opencase_defaults/config/optional/block.block.facet_nationality.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - facets.facet.nationality
- module:
- - facets
- - system
- theme:
- - bartik
-id: facet_nationality
-theme: bartik
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'facet_block:nationality'
-settings:
- id: 'facet_block:nationality'
- label: 'Nationality'
- provider: facets
- label_display: visible
- block_id: facet_nationality
-visibility:
- request_path:
- id: request_path
- pages: '/opencase/reporting/clients'
- negate: false
- context_mapping: { }
diff --git a/modules/opencase_defaults/config/optional/block.block.nationalities.yml b/modules/opencase_defaults/config/optional/block.block.nationalities.yml
new file mode 100644
index 0000000..01c22f4
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/block.block.nationalities.yml
@@ -0,0 +1,22 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - facets.facet.nationalities
+ module:
+ - facets
+ theme:
+ - bartik
+id: nationalities
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:nationalities'
+settings:
+ id: 'facet_block:nationalities'
+ label: Nationalities
+ provider: facets
+ label_display: visible
+ block_id: nationalities
+visibility: { }
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
index f9e4586..692e102 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
@@ -9,11 +9,12 @@ dependencies:
- field.field.oc_actor.client.field_disability
- field.field.oc_actor.client.field_ethnic_o
- field.field.oc_actor.client.field_gender_identified_with
+ - field.field.oc_actor.client.field_general_noes
- field.field.oc_actor.client.field_how_heard
- field.field.oc_actor.client.field_income
- field.field.oc_actor.client.field_languages_spoken
- field.field.oc_actor.client.field_marital_
- - field.field.oc_actor.client.field_nationality
+ - field.field.oc_actor.client.field_nationalities
- field.field.oc_actor.client.field_referred_by
- opencase_entities.oc_actor_type.client
module:
@@ -81,6 +82,14 @@ content:
third_party_settings: { }
type: options_select
region: content
+ field_general_noes:
+ weight: 27
+ settings:
+ rows: 5
+ placeholder: ''
+ third_party_settings: { }
+ type: string_textarea
+ region: content
field_how_heard:
weight: 13
settings: { }
@@ -105,13 +114,11 @@ content:
third_party_settings: { }
type: options_select
region: content
- field_nationality:
+ field_nationalities:
weight: 8
- settings:
- size: 60
- placeholder: ''
+ settings: { }
third_party_settings: { }
- type: string_textfield
+ type: options_select
region: content
field_referred_by:
weight: 14
diff --git a/modules/opencase_defaults/config/optional/facets.facet.nationality.yml b/modules/opencase_defaults/config/optional/facets.facet.nationalities.yml
similarity index 89%
rename from modules/opencase_defaults/config/optional/facets.facet.nationality.yml
rename to modules/opencase_defaults/config/optional/facets.facet.nationalities.yml
index 2b0a82a..61c9787 100644
--- a/modules/opencase_defaults/config/optional/facets.facet.nationality.yml
+++ b/modules/opencase_defaults/config/optional/facets.facet.nationalities.yml
@@ -6,13 +6,13 @@ dependencies:
- views.view.reporting_clients
module:
- search_api
-id: nationality
-name: 'Nationality'
-url_alias: nationality
+id: nationalities
+name: Nationalities
+url_alias: nationalities
weight: 0
-min_count: 1
+min_count: 0
show_only_one_result: false
-field_identifier: field_nationality
+field_identifier: field_nationalities
facet_source_id: 'search_api:views_page__reporting_clients__page_1'
widget:
type: checkbox
diff --git a/modules/opencase_defaults/config/optional/facets.facet.nationality_export.yml b/modules/opencase_defaults/config/optional/facets.facet.nationalities_export.yml
similarity index 69%
rename from modules/opencase_defaults/config/optional/facets.facet.nationality_export.yml
rename to modules/opencase_defaults/config/optional/facets.facet.nationalities_export.yml
index 1573399..d9620bb 100644
--- a/modules/opencase_defaults/config/optional/facets.facet.nationality_export.yml
+++ b/modules/opencase_defaults/config/optional/facets.facet.nationalities_export.yml
@@ -3,19 +3,18 @@ status: true
dependencies:
config:
- search_api.index.opencase_reporting_clients
- - views.view.reporting_clients
module:
- - search_api
-id: nationality_export
-name: 'Nationality'
-url_alias: nationality
+ - views_data_export
+id: nationalities_export
+name: Nationalities-export
+url_alias: nationalities_export
weight: 0
min_count: 1
show_only_one_result: false
-field_identifier: field_nationality
+field_identifier: field_nationalities
facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
widget:
- type: checkbox
+ type: links
config:
show_numbers: false
soft_limit: 0
@@ -30,6 +29,18 @@ hard_limit: 0
exclude: false
only_visible_when_facet_source_is_visible: true
processor_configs:
+ active_widget_order:
+ processor_id: active_widget_order
+ weights:
+ sort: 20
+ settings:
+ sort: DESC
+ count_widget_order:
+ processor_id: count_widget_order
+ weights:
+ sort: 30
+ settings:
+ sort: DESC
display_value_widget_order:
processor_id: display_value_widget_order
weights:
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_nationalities.yml b/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_nationalities.yml
new file mode 100644
index 0000000..cd8083e
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_nationalities.yml
@@ -0,0 +1,20 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.oc_actor.field_nationalities
+ - opencase_entities.oc_actor_type.client
+ module:
+ - options
+id: oc_actor.client.field_nationalities
+field_name: field_nationalities
+entity_type: oc_actor
+bundle: client
+label: Nationality
+description: 'To select multiple nationalities, hold down Ctrl (or the Mac equivalent) while clicking.'
+required: false
+translatable: false
+default_value: { }
+default_value_callback: ''
+settings: { }
+field_type: list_string
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_nationality.yml b/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_nationality.yml
deleted file mode 100644
index 4256311..0000000
--- a/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_nationality.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - field.storage.oc_actor.field_nationality
- - opencase_entities.oc_actor_type.client
-id: oc_actor.client.field_nationality
-field_name: field_nationality
-entity_type: oc_actor
-bundle: client
-label: Nationality
-description: ''
-required: false
-translatable: false
-default_value: { }
-default_value_callback: ''
-settings: { }
-field_type: string
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_nationalities.yml b/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_nationalities.yml
new file mode 100644
index 0000000..730c804
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_nationalities.yml
@@ -0,0 +1,20 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.oc_actor.field_nationalities
+ - opencase_entities.oc_actor_type.volunteer
+ module:
+ - options
+id: oc_actor.volunteer.field_nationalities
+field_name: field_nationalities
+entity_type: oc_actor
+bundle: volunteer
+label: Nationality
+description: 'To select multiple nationalities, hold down Ctrl (or the Mac equivalent) while clicking.'
+required: false
+translatable: true
+default_value: { }
+default_value_callback: ''
+settings: { }
+field_type: list_string
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_nationality.yml b/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_nationality.yml
deleted file mode 100644
index 2ba73a5..0000000
--- a/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_nationality.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - field.storage.oc_actor.field_nationality
- - opencase_entities.oc_actor_type.volunteer
-id: oc_actor.volunteer.field_nationality
-field_name: field_nationality
-entity_type: oc_actor
-bundle: volunteer
-label: Nationality
-description: ''
-required: false
-translatable: true
-default_value: { }
-default_value_callback: ''
-settings: { }
-field_type: string
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_nationalities.yml b/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_nationalities.yml
new file mode 100644
index 0000000..bcda5c0
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_nationalities.yml
@@ -0,0 +1,29 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - opencase_entities
+ - options
+id: oc_actor.field_nationalities
+field_name: field_nationalities
+entity_type: oc_actor
+type: list_string
+settings:
+ allowed_values:
+ -
+ value: British
+ label: British
+ -
+ value: Stateless
+ label: Stateless
+ -
+ value: 'More need adding!'
+ label: 'More need adding!'
+ allowed_values_function: ''
+module: options
+locked: false
+cardinality: -1
+translatable: true
+indexes: { }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_nationality.yml b/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_nationality.yml
deleted file mode 100644
index fe2a774..0000000
--- a/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_nationality.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
- module:
- - opencase_entities
-id: oc_actor.field_nationality
-field_name: field_nationality
-entity_type: oc_actor
-type: string
-settings:
- max_length: 255
- is_ascii: false
- case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: { }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/modules/opencase_defaults/config/optional/search_api.index.opencase_reporting_clients.yml b/modules/opencase_defaults/config/optional/search_api.index.opencase_reporting_clients.yml
index 3670d35..7cbd68d 100644
--- a/modules/opencase_defaults/config/optional/search_api.index.opencase_reporting_clients.yml
+++ b/modules/opencase_defaults/config/optional/search_api.index.opencase_reporting_clients.yml
@@ -6,7 +6,7 @@ dependencies:
- field.storage.oc_actor.field_disability
- field.storage.oc_actor.field_gender_identified_with
- field.storage.oc_actor.field_languages_spoken
- - field.storage.oc_actor.field_nationality
+ - field.storage.oc_actor.field_nationalities
- search_api.server.opencase_reporting_server
module:
- opencase_entities
@@ -56,14 +56,38 @@ field_settings:
dependencies:
config:
- field.storage.oc_actor.field_languages_spoken
- field_nationality:
+ field_nationalities:
label: Nationality
datasource_id: 'entity:oc_actor'
- property_path: field_nationality
+ property_path: field_nationalities
type: string
dependencies:
config:
- - field.storage.oc_actor.field_nationality
+ - field.storage.oc_actor.field_nationalities
+ first_name:
+ label: 'First Name'
+ datasource_id: 'entity:oc_actor'
+ property_path: first_name
+ type: string
+ dependencies:
+ module:
+ - opencase_entities
+ last_name:
+ label: 'Last Name'
+ datasource_id: 'entity:oc_actor'
+ property_path: last_name
+ type: string
+ dependencies:
+ module:
+ - opencase_entities
+ post_code:
+ label: 'Post Code'
+ datasource_id: 'entity:oc_actor'
+ property_path: post_code
+ type: string
+ dependencies:
+ module:
+ - opencase_entities
datasource_settings:
'entity:oc_actor':
bundles:
diff --git a/modules/opencase_defaults/config/optional/views.view.reporting_clients.yml b/modules/opencase_defaults/config/optional/views.view.reporting_clients.yml
index 9185834..3449308 100644
--- a/modules/opencase_defaults/config/optional/views.view.reporting_clients.yml
+++ b/modules/opencase_defaults/config/optional/views.view.reporting_clients.yml
@@ -6,10 +6,8 @@ dependencies:
- field.storage.oc_actor.field_disability
- field.storage.oc_actor.field_gender_identified_with
- field.storage.oc_actor.field_languages_spoken
- - field.storage.oc_actor.field_nationality
+ - field.storage.oc_actor.field_nationalities
- search_api.index.opencase_reporting_clients
- content:
- - 'block_content:basic:944ff38d-5931-4439-91d5-f53b5ad7aac7'
module:
- options
- rest
@@ -57,10 +55,13 @@ display:
pager:
type: mini
options:
- items_per_page: 10
+ items_per_page: 50
offset: 0
id: 0
total_pages: null
+ tags:
+ previous: ‹‹
+ next: ››
expose:
items_per_page: false
items_per_page_label: 'Items per page'
@@ -69,22 +70,19 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
- tags:
- previous: ‹‹
- next: ››
style:
type: table
row:
type: fields
fields:
- first_name:
- id: first_name
+ name:
+ id: name
table: search_api_datasource_opencase_reporting_clients_entity_oc_actor
- field: first_name
+ field: name
relationship: none
group_type: group
admin_label: ''
- label: 'First Name'
+ label: Name
exclude: false
alter:
alter_text: false
@@ -128,78 +126,7 @@ display:
click_sort_column: value
type: string
settings:
- link_to_entity: false
- 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
- field_rendering: true
- fallback_handler: search_api
- fallback_options:
- link_to_item: false
- use_highlighting: false
- multi_type: separator
- multi_separator: ', '
- entity_type: oc_actor
- plugin_id: search_api_field
- last_name:
- id: last_name
- table: search_api_datasource_opencase_reporting_clients_entity_oc_actor
- field: last_name
- relationship: none
- group_type: group
- admin_label: ''
- label: 'Last Name'
- 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: string
- settings:
- link_to_entity: false
+ link_to_entity: true
group_column: value
group_columns: { }
group_rows: true
@@ -429,14 +356,14 @@ display:
multi_type: separator
multi_separator: ', '
plugin_id: search_api_field
- field_languages_spoken:
- id: field_languages_spoken
- table: search_api_index_opencase_reporting_clients
- field: field_languages_spoken
+ field_nationalities:
+ id: field_nationalities
+ table: search_api_datasource_opencase_reporting_clients_entity_oc_actor
+ field: field_nationalities
relationship: none
group_type: group
admin_label: ''
- label: Languages
+ label: Nationality
exclude: false
alter:
alter_text: false
@@ -497,15 +424,16 @@ display:
use_highlighting: false
multi_type: separator
multi_separator: ', '
+ entity_type: oc_actor
plugin_id: search_api_field
- field_nationality:
- id: field_nationality
+ field_languages_spoken:
+ id: field_languages_spoken
table: search_api_index_opencase_reporting_clients
- field: field_nationality
+ field: field_languages_spoken
relationship: none
group_type: group
admin_label: ''
- label: Nationality
+ label: Languages
exclude: false
alter:
alter_text: false
@@ -547,9 +475,8 @@ display:
empty_zero: false
hide_alter_empty: true
click_sort_column: value
- type: string
- settings:
- link_to_entity: false
+ type: list_default
+ settings: { }
group_column: value
group_columns: { }
group_rows: true
@@ -674,7 +601,7 @@ display:
- 'config:field.storage.oc_actor.field_disability'
- 'config:field.storage.oc_actor.field_gender_identified_with'
- 'config:field.storage.oc_actor.field_languages_spoken'
- - 'config:field.storage.oc_actor.field_nationality'
+ - 'config:field.storage.oc_actor.field_nationalities'
data_export_1:
display_plugin: data_export
id: data_export_1
@@ -684,6 +611,10 @@ display:
display_extenders: { }
path: opencase/reporting/clients
filename: '[view:title].csv'
+ cache:
+ type: none
+ defaults:
+ cache: false
cache_metadata:
max-age: -1
contexts:
@@ -696,7 +627,7 @@ display:
- 'config:field.storage.oc_actor.field_disability'
- 'config:field.storage.oc_actor.field_gender_identified_with'
- 'config:field.storage.oc_actor.field_languages_spoken'
- - 'config:field.storage.oc_actor.field_nationality'
+ - 'config:field.storage.oc_actor.field_nationalities'
page_1:
display_plugin: page
id: page_1
@@ -721,4 +652,4 @@ display:
- 'config:field.storage.oc_actor.field_disability'
- 'config:field.storage.oc_actor.field_gender_identified_with'
- 'config:field.storage.oc_actor.field_languages_spoken'
- - 'config:field.storage.oc_actor.field_nationality'
+ - 'config:field.storage.oc_actor.field_nationalities'