removed dependency no longer required

that had been superseded by the dynamic permissions

README.md

@@ -1,17 +1,36 @@
 # OpenCase
-A simple, case-management-focused CRM for small altruistic organisations.
-
-## Current Status
-**13 May 2018** A demo site, with basic functionality is available at demo.opencase.org.uk. If you are interested, raise an issue and I will get the login to you somehow. 
+A simple case-management system for small altruistic organisations.
 
 ## The Plan
 OpenCase will be available as:
 * A Drupal module, on drupal.org 
-* A Drupal install profile / distribution
 * A hosted service
 
+### Features
+#### Existing
+* Completely configurable person types, case types and activity types
+* Search
+* Basic Reporting 
+* Basic user roles (caseworker, volunteer co-ordinator, site admin etc) with access control
+
+#### Coming soon
+* Better reporting (currently only reports on defaults fields and not user-added ones)
+* Allocation of tasks, overview of tasks and their stage of completion
+* Appointments and notifications
+
+## Current Status
+**11 Nov 2018** 
+### User Base
+OpenCase is being used by a couple of organisations, early adopters on the hosted platform.
+### Availability as Free Software
+If you want to install OpenCase for yourself, please get in touch via Issues. It is changing rapidly and the install process is currently undocumented but I am more than happy to guide you through.
+### Try it out
+A demo site, with basic functionality is available at demo.opencase.org.uk. If you are interested, raise an issue and I will get the login to you somehow. 
+
 ## Find out more
 * More details, including user stories for future development, can be found in the [OpenCase Gitbook](https://hoegrammer.gitbooks.io/zen-crm/content/)
 * Raise an issue to contact the developer. 
 
 
+
+

config/install/block.block.actortypehelp.yml

@@ -0,0 +1,25 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase
+    - system
+  theme:
+    - bartik
+id: actortypehelp
+theme: bartik
+region: content
+weight: -11
+provider: null
+plugin: actor_type_help
+settings:
+  id: actor_type_help
+  label: 'Actor Type Help'
+  provider: opencase
+  label_display: '0'
+visibility:
+  request_path:
+    id: request_path
+    pages: '/admin/opencase/oc_actor_type/*/edit/fields'
+    negate: false
+    context_mapping: {  }

config/install/block.block.opencase.yml

@@ -2,22 +2,68 @@ langcode: en
 status: true
 dependencies:
   config:
-    - system.menu.opencase-admin
+    - system.menu.opencase
   module:
-    - system
+    - superfish
   theme:
     - bartik
 id: opencase
 theme: bartik
-region: sidebar_first
-weight: -8
+region: primary_menu
+weight: 0
 provider: null
-plugin: 'system_menu_block:opencase-admin'
+plugin: 'superfish:opencase'
 settings:
-  id: 'system_menu_block:opencase-admin'
-  label: 'OpenCase Admin'
-  provider: system
-  label_display: visible
-  level: 1
-  depth: 0
+  id: 'superfish:opencase'
+  label: OpenCase
+  provider: superfish
+  label_display: '0'
+  level: '1'
+  depth: '0'
+  menu_type: horizontal
+  style: none
+  arrow: 0
+  shadow: 1
+  speed: fast
+  delay: '800'
+  slide: vertical
+  supposition: 1
+  hoverintent: 1
+  touch: '1'
+  touchbh: '1'
+  touchbp: '768'
+  touchua: '0'
+  touchual: ''
+  touchuam: '0'
+  small: '2'
+  smallbp: '768'
+  smallua: '0'
+  smallual: ''
+  smalluam: '0'
+  smallact: '1'
+  smallset: ''
+  smallasa: 0
+  smallcmc: 0
+  smallecm: ''
+  smallchc: 0
+  smallech: ''
+  smallicm: ''
+  smallich: ''
+  smallamt: ''
+  smallabt: '1'
+  supersubs: 1
+  minwidth: '12'
+  maxwidth: '27'
+  multicolumn: 0
+  multicolumn_depth: '1'
+  multicolumn_levels: '1'
+  pathlevels: '1'
+  expanded: 0
+  clone_parent: 0
+  hide_linkdescription: 0
+  add_linkdescription: 0
+  link_depth_class: 1
+  custom_list_class: ''
+  custom_item_class: ''
+  custom_link_class: ''
 visibility: {  }

config/install/block.block.opencasecontextualmenu.yml

@@ -15,5 +15,5 @@ settings:
   id: opencase_contextual_menu
   label: 'OpenCase Contextual Menu'
   provider: opencase
-  label_display: visible
+  label_display: '0'
 visibility: {  }

config/install/block.block.opencaseglobal.yml

@@ -1,31 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.openc
-  module:
-    - system
-    - user
-  theme:
-    - bartik
-id: opencaseglobal
-theme: bartik
-region: sidebar_first
-weight: -7
-provider: null
-plugin: 'system_menu_block:openc'
-settings:
-  id: 'system_menu_block:openc'
-  label: 'OpenCase Global'
-  provider: system
-  label_display: '0'
-  level: 1
-  depth: 0
-visibility:
-  user_role:
-    id: user_role
-    roles:
-      authenticated: authenticated
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'

config/install/system.menu.openc.yml

@@ -1,7 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: openc
-label: 'OpenCase Global'
-description: ''
-locked: false

config/install/system.menu.opencase-admin.yml

@@ -1,7 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: opencase-admin
-label: 'OpenCase Admin'
-description: 'Administer OpenCase '
-locked: false

config/install/system.menu.opencase.yml

@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+id: opencase
+label: OpenCase
+description: 'Main navigation menu for OpenCase'
+locked: false

config/install/views.view.activities.yml

@@ -27,7 +27,7 @@ display:
           role:
             authenticated: authenticated
       cache:
-        type: tag
+        type: none
         options: {  }
       query:
         type: views_query
@@ -50,7 +50,7 @@ display:
       pager:
         type: mini
         options:
-          items_per_page: 10
+          items_per_page: 50
           offset: 0
           id: 0
           total_pages: null
@@ -389,7 +389,18 @@ display:
       title: 'Activity List'
       header: {  }
       footer: {  }
-      empty: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'This case has no activities yet. To add one, use the links in the sidebar to the right.'
+          plugin_id: text_custom
       relationships: {  }
       arguments:
         oc_case:

config/install/views.view.cases.yml

@@ -27,7 +27,7 @@ display:
           role:
             authenticated: authenticated
       cache:
-        type: tag
+        type: none
         options: {  }
       query:
         type: views_query
@@ -48,10 +48,23 @@ display:
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
-        type: some
+        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'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
       style:
         type: table
       row:
@@ -434,7 +447,7 @@ display:
           empty_zero: false
           hide_alter_empty: false
           plugin_id: custom
-      filters: {  }
+      filters: null
       sorts:
         created:
           id: created
@@ -447,14 +460,38 @@ display:
           exposed: false
           expose:
             label: ''
-          granularity: hour
+          granularity: day
           entity_type: oc_case
           entity_field: created
           plugin_id: date
-      title: 'Case List'
-      header: {  }
+      title: ''
+      header:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content:
+            value: '<p>To <strong>add a new case</strong>, first search for the person you want to add it to. If the person is not on the system yet, you can add them using the "People" menu.</p>'
+            format: basic_html
+          plugin_id: text
       footer: {  }
-      empty: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: "<p>Either there are no cases involving this person, or you do not have access to them.</p>\n"
+          plugin_id: text_custom
       relationships: {  }
       arguments:
         actors_involved_target_id:
@@ -495,12 +532,14 @@ display:
           entity_field: actors_involved
           plugin_id: numeric
       display_extenders: {  }
+      use_ajax: true
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
+        - url.query_args
         - user.roles
       tags: {  }
   page_1:
@@ -511,11 +550,60 @@ display:
     display_options:
       display_extenders: {  }
       path: opencase/oc_actor/%actor_id/case_list
+      defaults:
+        filters: false
+        filter_groups: false
+      filters: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
+        - url.query_args
+        - user.roles
+      tags: {  }
+  page_2:
+    display_plugin: page
+    id: page_2
+    display_title: 'All Cases'
+    position: 2
+    display_options:
+      display_extenders: {  }
+      display_description: ''
+      arguments: {  }
+      defaults:
+        arguments: false
+        filters: false
+        filter_groups: false
+        empty: false
+      path: opencase/all-cases
+      filters: null
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: "<h1>No cases found</h1>\n<p>You do not have access to any existing cases.</p>\n<p>To <b>add a new case</b>, first search for the person you want to add a case to. If they are not on the system yet you can add them using the <b>Add actors</b> menu in the left sidebar.</p>\n"
+          plugin_id: text_custom
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
         - user.roles
       tags: {  }

css/opencase.css

@@ -1,3 +1,6 @@
+body {
+  font-size: 100% !important;
+}
 
 /* Free the people from the tyranny of the useless search button */
 #edit-submit-actor-search{
@@ -13,3 +16,28 @@
 .js-form-item.form-item.js-form-type-checkbox.form-type-checkbox.js-form-item-new-revision.form-item-new-revision {
   display: none;
 }
+
+/* Style the search box in header bar. */
+#block-exposedformactor-searchpage-1 {
+  top: -20px;
+}
+
+#block-exposedformactor-searchpage-1 #edit-actions {
+  padding-top: 0;
+}
+
+#block-exposedformactor-searchpage-1 .form-text {
+  width: 200px;
+}
+
+/* Make drop-down nav menu opaque */
+.block-superfish .menu ul {
+  background: white;
+  color: darkgray;
+}
+.block-superfish .menu ul li {
+  border-bottom: 1px dotted darkgray;
+}
+.block-superfish .menu ul li a:hover {
+  color: black;
+}

modules/opencase_default_reporting/config/install/block.block.facet_asylum_status.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.asylum_status
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_asylum_status
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:asylum_status'
+settings:
+  id: 'facet_block:asylum_status'
+  label: 'Asylum Status'
+  provider: facets
+  label_display: visible
+  block_id: facet_asylum_status
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/clients'
+    negate: false
+    context_mapping: {  }

modules/opencase_default_reporting/config/install/block.block.facet_created.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.created
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_created
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:created'
+settings:
+  id: 'facet_block:created'
+  label: 'Created Date'
+  provider: facets
+  label_display: visible
+  block_id: facet_created
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/clients'
+    negate: false
+    context_mapping: {  }

modules/opencase_default_reporting/config/install/block.block.facet_disability.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.disability
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_disability
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:disability'
+settings:
+  id: 'facet_block:disability'
+  label: 'Disability'
+  provider: facets
+  label_display: visible
+  block_id: facet_disability
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/clients'
+    negate: false
+    context_mapping: {  }

modules/opencase_default_reporting/config/install/block.block.facet_gender_identified_with.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.gender_identified_with
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_gender_identified_with
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:gender_identified_with'
+settings:
+  id: 'facet_block:gender_identified_with'
+  label: 'Gender Identity'
+  provider: facets
+  label_display: visible
+  block_id: facet_gender_identified_with
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/clients'
+    negate: false
+    context_mapping: {  }

modules/opencase_default_reporting/config/install/block.block.facet_languages.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.languages
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_languages
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:languages'
+settings:
+  id: 'facet_block:languages'
+  label: 'Languages'
+  provider: facets
+  label_display: visible
+  block_id: facet_languages
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/clients'
+    negate: false
+    context_mapping: {  }

modules/opencase_default_reporting/config/install/block.block.nationalities.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.nationalities
+  module:
+    - facets
+    - system
+  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:
+  request_path:
+    id: request_path
+    pages: /opencase/reporting/clients
+    negate: false
+    context_mapping: {  }

modules/opencase_default_reporting/config/install/block.block.osiclevel.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.osic_level
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: osiclevel
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:osic_level'
+settings:
+  id: 'facet_block:osic_level'
+  label: 'OSIC level'
+  provider: facets
+  label_display: visible
+  block_id: osiclevel
+visibility:
+  request_path:
+    id: request_path
+    pages: /opencase/reporting/volunteers
+    negate: false
+    context_mapping: {  }

modules/opencase_default_reporting/config/install/facets.facet.asylum_status.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: asylum_status
+name: 'Asylum status'
+url_alias: asylum_status
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_asylum_status
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.asylum_status_export.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: asylum_status_export
+name: 'Asylum status'
+url_alias: asylum_status
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_asylum_status
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.created.yml

@@ -0,0 +1,67 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: created
+name: Created
+url_alias: created
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: created
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+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: -8
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: -9
+    settings:
+      sort: DESC
+  date_item:
+    processor_id: date_item
+    weights:
+      build: 35
+    settings:
+      date_display: actual_date
+      granularity: 5
+      date_format: ''
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: -10
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.created_export.yml

@@ -0,0 +1,67 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+  module:
+    - views_data_export
+id: created_export
+name: 'Created - Export'
+url_alias: created
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: created
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+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
+  date_item:
+    processor_id: date_item
+    weights:
+      build: 35
+    settings:
+      date_display: actual_date
+      granularity: 5
+      date_format: ''
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false
+

modules/opencase_default_reporting/config/install/facets.facet.disability.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: disability
+name: 'Disability'
+url_alias: disability
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_disability
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.disability_export.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: disability_export
+name: 'Disability'
+url_alias: disability
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_disability
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.gender_identified_with.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: gender_identified_with
+name: 'Gender Identity'
+url_alias: gender_identified_with
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_gender_identified_with
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.gender_identified_with_export.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: gender_identified_with_export
+name: 'Gender Identity'
+url_alias: gender_identified_with
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_gender_identified_with
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.languages.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: languages
+name: 'Languages'
+url_alias: languages
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_languages_spoken
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.languages_export.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: languages_export
+name: 'Languages'
+url_alias: languages
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_languages_spoken
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.nationalities.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: nationalities
+name: Nationalities
+url_alias: nationalities
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_nationalities
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.nationalities_export.yml

@@ -0,0 +1,58 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+  module:
+    - views_data_export
+id: nationalities_export
+name: Nationalities-export
+url_alias: nationalities_export
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_nationalities
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: links
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+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:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.osic_level.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_volunteers
+    - views.view.reporting_volunteers
+  module:
+    - search_api
+id: osic_level
+name: 'OSIC level'
+url_alias: osic_level
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_osic_level
+facet_source_id: 'search_api:views_page__reporting_volunteers__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.osic_level_export.yml

@@ -0,0 +1,58 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_volunteers
+  module:
+    - views_data_export
+id: osic_level_export
+name: 'OSIC level Export'
+url_alias: osic_level
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_osic_level
+facet_source_id: 'search_api:views_data_export__reporting_volunteers__data_export_1'
+widget:
+  type: links
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+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:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/search_api.index.opencase_reporting_cases.yml

@@ -0,0 +1,57 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - search_api
+  config:
+    - field.storage.oc_case.field_outcome
+    - search_api.server.opencase_reporting_server
+id: opencase_reporting_cases
+name: 'OpenCase Reporting: Cases'
+description: ''
+read_only: false
+field_settings:
+  actors_involved:
+    label: 'Involved Parties'
+    datasource_id: 'entity:oc_case'
+    property_path: actors_involved
+    type: integer
+    dependencies:
+      module:
+        - opencase_entities
+  created:
+    label: Created
+    datasource_id: 'entity:oc_case'
+    property_path: created
+    type: date
+    dependencies:
+      module:
+        - opencase_entities
+  field_outcome:
+    label: Outcome
+    datasource_id: 'entity:oc_case'
+    property_path: field_outcome
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_case.field_outcome
+datasource_settings:
+  'entity:oc_case':
+    bundles:
+      default: true
+      selected: {  }
+    languages:
+      default: true
+      selected: {  }
+processor_settings:
+  add_url: {  }
+  aggregated_field: {  }
+  rendered_item: {  }
+tracker_settings:
+  default:
+    indexing_order: fifo
+options:
+  index_directly: true
+  cron_limit: 50
+server: opencase_reporting_server

modules/opencase_default_reporting/config/install/search_api.index.opencase_reporting_clients.yml

@@ -0,0 +1,110 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_asylum_status
+    - 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_nationalities
+    - search_api.server.opencase_reporting_server
+  module:
+    - opencase_entities
+    - search_api
+id: opencase_reporting_clients
+name: 'OpenCase Reporting: Clients'
+description: ''
+read_only: false
+field_settings:
+  created:
+    label: Created
+    datasource_id: 'entity:oc_actor'
+    property_path: created
+    type: date
+    dependencies:
+      module:
+        - opencase_entities
+  field_asylum_status:
+    label: 'Asylum status'
+    datasource_id: 'entity:oc_actor'
+    property_path: field_asylum_status
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_asylum_status
+  field_disability:
+    label: Disability
+    datasource_id: 'entity:oc_actor'
+    property_path: field_disability
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_disability
+  field_gender_identified_with:
+    label: 'Gender identified with'
+    datasource_id: 'entity:oc_actor'
+    property_path: field_gender_identified_with
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_gender_identified_with
+  field_languages_spoken:
+    label: 'Languages spoken'
+    datasource_id: 'entity:oc_actor'
+    property_path: field_languages_spoken
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_languages_spoken
+  field_nationalities:
+    label: Nationality
+    datasource_id: 'entity:oc_actor'
+    property_path: field_nationalities
+    type: string
+    dependencies:
+      config:
+        - 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:
+      default: false
+      selected:
+        - client
+    languages:
+      default: true
+      selected: {  }
+processor_settings:
+  add_url: {  }
+  aggregated_field: {  }
+  rendered_item: {  }
+tracker_settings:
+  default:
+    indexing_order: fifo
+options:
+  index_directly: true
+  cron_limit: 50
+server: opencase_reporting_server

modules/opencase_default_reporting/config/install/search_api.index.opencase_reporting_volunteers.yml

@@ -0,0 +1,59 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_languages_spoken
+    - field.storage.oc_actor.field_osic_level
+    - search_api.server.opencase_reporting_server
+  module:
+    - opencase_entities
+    - search_api
+id: opencase_reporting_volunteers
+name: 'OpenCase Reporting: Volunteers'
+description: ''
+read_only: false
+field_settings:
+  field_languages_spoken:
+    label: 'Languages spoken'
+    datasource_id: 'entity:oc_actor'
+    property_path: field_languages_spoken
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_languages_spoken
+  field_osic_level:
+    label: 'OSIC level'
+    datasource_id: 'entity:oc_actor'
+    property_path: field_osic_level
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_osic_level
+  name:
+    label: Name
+    datasource_id: 'entity:oc_actor'
+    property_path: name
+    type: string
+    dependencies:
+      module:
+        - opencase_entities
+datasource_settings:
+  'entity:oc_actor':
+    bundles:
+      default: false
+      selected:
+        - volunteer
+    languages:
+      default: true
+      selected: {  }
+processor_settings:
+  add_url: {  }
+  aggregated_field: {  }
+  rendered_item: {  }
+tracker_settings:
+  default:
+    indexing_order: fifo
+options:
+  index_directly: true
+  cron_limit: 50
+server: opencase_reporting_server

modules/opencase_default_reporting/config/install/views.view.reporting_clients.yml

@@ -0,0 +1,683 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_asylum_status
+    - 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_nationalities
+    - search_api.index.opencase_reporting_clients
+  module:
+    - csv_serialization
+    - options
+    - rest
+    - search_api
+    - serialization
+    - user
+    - views_data_export
+id: reporting_clients
+label: 'Reporting: Clients'
+module: views
+description: ''
+tag: ''
+base_table: search_api_index_opencase_reporting_clients
+base_field: search_api_id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'use opencase'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          bypass_access: false
+          skip_access: false
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          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'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      style:
+        type: table
+      row:
+        type: fields
+      fields:
+        name:
+          id: name
+          table: search_api_datasource_opencase_reporting_clients_entity_oc_actor
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 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: 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
+          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
+        field_asylum_status:
+          id: field_asylum_status
+          table: search_api_index_opencase_reporting_clients
+          field: field_asylum_status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Asylum status'
+          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: list_default
+          settings: {  }
+          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: null
+          entity_field: null
+          plugin_id: search_api_field
+        field_disability:
+          id: field_disability
+          table: search_api_index_opencase_reporting_clients
+          field: field_disability
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Disability
+          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
+          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: ', '
+          plugin_id: search_api_field
+        field_gender_identified_with:
+          id: field_gender_identified_with
+          table: search_api_index_opencase_reporting_clients
+          field: field_gender_identified_with
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Gender ID'
+          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: list_default
+          settings: {  }
+          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: ', '
+          plugin_id: search_api_field
+        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: Nationality
+          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: list_default
+          settings: {  }
+          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
+        field_languages_spoken:
+          id: field_languages_spoken
+          table: search_api_index_opencase_reporting_clients
+          field: field_languages_spoken
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Languages
+          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: list_default
+          settings: {  }
+          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: ', '
+          plugin_id: search_api_field
+        post_code:
+          id: post_code
+          table: search_api_datasource_opencase_reporting_clients_entity_oc_actor
+          field: post_code
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Post Code'
+          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
+          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
+      filters: {  }
+      sorts: {  }
+      title: 'Client Report'
+      header:
+        entity_block_content:
+          id: entity_block_content
+          table: views
+          field: entity_block_content
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: true
+          target: 944ff38d-5931-4439-91d5-f53b5ad7aac7
+          view_mode: default
+          bypass_access: false
+          plugin_id: entity
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+      use_ajax: true
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_asylum_status'
+        - '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_nationalities'
+  data_export_1:
+    display_plugin: data_export
+    id: data_export_1
+    display_title: 'Data export'
+    position: 2
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/clients
+      filename: '[view:title].csv'
+      cache:
+        type: none
+      defaults:
+        cache: false
+      displays:
+        page_1: page_1
+        default: '0'
+      style:
+        type: data_export
+        options:
+          formats:
+            csv: csv
+          csv_settings:
+            delimiter: ','
+            enclosure: '"'
+            escape_char: \
+            strip_tags: true
+            trim: true
+            encoding: utf8
+          xls_settings:
+            xls_format: Excel2007
+            metadata:
+              creator: ''
+              last_modified_by: ''
+              title: ''
+              description: ''
+              subject: ''
+              keywords: ''
+              category: ''
+              manager: ''
+              company: ''
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - request_format
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_asylum_status'
+        - '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_nationalities'
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/clients
+      cache:
+        type: none
+      defaults:
+        cache: false
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_asylum_status'
+        - '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_nationalities'

modules/opencase_default_reporting/config/install/views.view.reporting_volunteers.yml

@@ -0,0 +1,395 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_languages_spoken
+    - field.storage.oc_actor.field_osic_level
+    - search_api.index.opencase_reporting_volunteers
+  module:
+    - csv_serialization
+    - options
+    - rest
+    - search_api
+    - serialization
+    - user
+    - views_data_export
+id: reporting_volunteers
+label: 'Reporting: Volunteers'
+module: views
+description: ''
+tag: ''
+base_table: search_api_index_opencase_reporting_volunteers
+base_field: search_api_id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'use opencase'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          bypass_access: false
+          skip_access: false
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 50
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            field_languages_spoken: field_languages_spoken
+          info:
+            field_languages_spoken:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: '-1'
+          empty_table: false
+      row:
+        type: fields
+      fields:
+        name:
+          id: name
+          table: search_api_index_opencase_reporting_volunteers
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 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: 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
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          plugin_id: search_api_field
+        field_languages_spoken_1:
+          id: field_languages_spoken_1
+          table: search_api_index_opencase_reporting_volunteers
+          field: field_languages_spoken
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Languages spoken'
+          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: list_default
+          settings: {  }
+          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: ', '
+          plugin_id: search_api_field
+        field_osic_level:
+          id: field_osic_level
+          table: search_api_index_opencase_reporting_volunteers
+          field: field_osic_level
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'OSIC level'
+          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: list_default
+          settings: {  }
+          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: ', '
+          plugin_id: search_api_field
+      filters: {  }
+      sorts: {  }
+      title: 'Volunteer Report'
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_languages_spoken'
+        - 'config:field.storage.oc_actor.field_osic_level'
+  data_export_1:
+    display_plugin: data_export
+    id: data_export_1
+    display_title: 'Data export'
+    position: 2
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/volunteers
+      filename: '[view:title].csv'
+      cache:
+        type: none
+      defaults:
+        cache: false
+      displays:
+        page_1: page_1
+        default: '0'
+      style:
+        type: data_export
+        options:
+          formats:
+            csv: csv
+          csv_settings:
+            delimiter: ','
+            enclosure: '"'
+            escape_char: \
+            strip_tags: true
+            trim: true
+            encoding: utf8
+          xls_settings:
+            xls_format: Excel2007
+            metadata:
+              creator: ''
+              last_modified_by: ''
+              title: ''
+              description: ''
+              subject: ''
+              keywords: ''
+              category: ''
+              manager: ''
+              company: ''
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - request_format
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_languages_spoken'
+        - 'config:field.storage.oc_actor.field_osic_level'
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/volunteers
+      cache:
+        type: none
+      defaults:
+        cache: false
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_languages_spoken'
+        - 'config:field.storage.oc_actor.field_osic_level'

modules/opencase_default_reporting/opencase_default_reporting.info.yml

@@ -0,0 +1,8 @@
+name: 'Opencase example reporting'
+type: module
+description: 'Reporting on the types of people, cases etc that the Opencase Defaults module provides'
+core: 8.x
+package: 'OpenCase'
+dependencies:
+  - opencase_defaults
+  - opencase_reporting

modules/opencase_default_reporting/opencase_default_reporting.module

@@ -0,0 +1,34 @@
+<?php
+
+function opencase_default_reporting_uninstall() {
+  $configs = [
+    'search_api.index.opencase_reporting_cases',
+    'search_api.index.opencase_reporting_clients',
+    'search_api.index.opencase_reporting_volunteers',
+    'block.block.facet_asylum_status',
+    'block.block.facet_created',
+    'block.block.facet_disability',
+    'block.block.facet_gender_identified_with',
+    'block.block.facet_languages',
+    'block.block.nationalities',
+    'views.view.reporting_clients',
+    'views.view.reporting_volunteers',
+    'facets.facet.asylum_status_export',
+    'facets.facet.disability',
+    'facets.facet.nationalities_export',
+    'facets.facet.asylum_status',
+    'facets.facet.gender_identified_with_export',
+    'facets.facet.nationalities',
+    'facets.facet.created_export',
+    'facets.facet.gender_identified_with',
+    'facets.facet.osic_level_export',
+    'facets.facet.created',
+    'facets.facet.languages_export',
+    'facets.facet.osic_level',
+    'facets.facet.disability_export',
+    'facets.facet.languages',
+  ];
+  foreach($configs as $config) {
+    Drupal::configFactory()->getEditable($config)->delete();
+  }
+}

modules/opencase_defaults/config/optional/block.block.opencaseaddactors.yml

@@ -1,31 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.opencase-add-actors
-  module:
-    - system
-    - user
-  theme:
-    - bartik
-id: opencaseaddactors
-theme: bartik
-region: sidebar_first
-weight: -8
-provider: null
-plugin: 'system_menu_block:opencase-add-actors'
-settings:
-  id: 'system_menu_block:opencase-add-actors'
-  label: 'Add Records'
-  provider: system
-  label_display: visible
-  level: 1
-  depth: 0
-visibility:
-  user_role:
-    id: user_role
-    roles:
-      authenticated: authenticated
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'

modules/opencase_defaults/config/optional/contact.form.contact_opencase.yml

@@ -0,0 +1,11 @@
+langcode: en
+status: true
+dependencies: {  }
+id: contact_opencase
+label: 'Contact the OpenCase Developers'
+recipients:
+  - naomi@aktivix.org
+reply: ''
+weight: 0
+message: 'Thank you for your message. The OpenCase team will get back to you ASAP.'
+redirect: ''

modules/opencase_defaults/config/optional/contact.settings.yml

@@ -0,0 +1,5 @@
+default_form: contact_opencase
+flood:
+  limit: 5
+  interval: 3600
+user_default_enabled: false

modules/opencase_defaults/config/optional/core.base_field_override.oc_case.volunteer_engagement.actors_involved.yml

@@ -3,7 +3,6 @@ status: true
 dependencies:
   config:
     - opencase_entities.oc_actor_type.client
-    - opencase_entities.oc_actor_type.volunteer
     - opencase_entities.oc_case_type.volunteer_engagement
 id: oc_case.volunteer_engagement.actors_involved
 field_name: actors_involved
@@ -18,7 +17,6 @@ default_value_callback: 'Drupal\opencase_entities\Entity\OCCase::defaultVal'
 settings:
   handler_settings:
     target_bundles:
-      client: client
       volunteer: volunteer
   handler: default
 field_type: entity_reference

modules/opencase_defaults/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml

@@ -15,7 +15,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_funds_for:
     weight: 27

modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml

@@ -13,8 +13,9 @@ dependencies:
     - 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
+    - field.field.oc_actor.client.field_sex
     - opencase_entities.oc_actor_type.client
   module:
     - datetime
@@ -25,12 +26,10 @@ bundle: client
 mode: default
 content:
   field_asylum_status:
-    weight: 35
-    settings:
-      size: 60
-      placeholder: ''
+    weight: 4
+    settings: {  }
     third_party_settings: {  }
-    type: string_textfield
+    type: options_select
     region: content
   field_client_field_1:
     weight: 26
@@ -41,20 +40,20 @@ content:
     type: string_textfield
     region: content
   field_confidentiality_form:
-    weight: 39
+    weight: 13
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
     type: file_generic
     region: content
   field_date_of_birth:
-    weight: 27
+    weight: 0
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_dependants:
-    weight: 36
+    weight: 10
     settings:
       size: 60
       placeholder: ''
@@ -62,7 +61,7 @@ content:
     type: string_textfield
     region: content
   field_disability:
-    weight: 31
+    weight: 8
     settings:
       size: 60
       placeholder: ''
@@ -70,7 +69,7 @@ content:
     type: string_textfield
     region: content
   field_ethnic_o:
-    weight: 33
+    weight: 5
     settings:
       size: 60
       placeholder: ''
@@ -78,52 +77,54 @@ content:
     type: string_textfield
     region: content
   field_gender_identified_with:
-    weight: 30
+    weight: 1
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_how_heard:
-    weight: 37
+    weight: 11
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_income:
-    weight: 34
+    weight: 9
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_languages_spoken:
-    weight: 32
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-  field_marital_:
-    weight: 29
+    weight: 7
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
-  field_nationality:
-    weight: 28
+  field_marital_:
+    weight: 3
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
+  field_nationalities:
+    type: options_select
+    weight: 6
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_referred_by:
+    weight: 12
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
     type: string_textfield
     region: content
-  field_referred_by:
-    weight: 38
-    settings:
-      size: 60
-      placeholder: ''
+  field_sex:
+    weight: 2
+    settings: {  }
     third_party_settings: {  }
-    type: string_textfield
+    type: options_select
     region: content
   name:
     type: string_textfield
@@ -133,30 +134,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  phone:
-    type: string_textfield
-    weight: 2
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  phone2:
-    type: string_textfield
-    weight: 3
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  postal_address:
-    type: string_textarea
-    weight: 5
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
   user_id:
     type: entity_reference_autocomplete
     weight: 5

modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml

@@ -3,7 +3,9 @@ status: true
 dependencies:
   config:
     - field.field.oc_actor.volunteer.field_languages_spoken
-    - field.field.oc_actor.volunteer.field_nationality
+    - field.field.oc_actor.volunteer.field_nationalities
+    - field.field.oc_actor.volunteer.field_osic_level
+    - field.field.oc_actor.volunteer.field_skills
     - opencase_entities.oc_actor_type.volunteer
 id: oc_actor.volunteer.default
 targetEntityType: oc_actor
@@ -11,68 +13,31 @@ bundle: volunteer
 mode: default
 content:
   field_languages_spoken:
-    weight: 28
+    weight: 1
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
+  field_nationalities:
+    weight: 0
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
     type: string_textfield
     region: content
-  field_nationality:
-    weight: 27
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-  field_sdfdsfds:
-    weight: 26
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-    type: text_textarea
-    region: content
-  name:
-    type: string_textfield
-    weight: -4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  phone:
-    type: string_textfield
+  field_osic_level:
     weight: 2
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
+    settings: {  }
     third_party_settings: {  }
-  phone2:
-    type: string_textfield
+    type: options_select
+    region: content
+  field_skills:
+    type: string_textarea
     weight: 3
     region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  postal_address:
-    type: string_textarea
-    weight: 5
-    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-  user_id:
-    type: entity_reference_autocomplete
-    weight: 5
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    region: content
-    third_party_settings: {  }
 hidden: {  }

modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.accommodation.default.yml

@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 26

modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml

@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 30

modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.employability.default.yml

@@ -33,7 +33,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_gave_list_of_agencies:
     weight: 27

modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.health.default.yml

@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 30

modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.immigration.default.yml

@@ -33,7 +33,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_level:
     weight: 26

modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml

@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 30

modules/opencase_defaults/config/optional/core.entity_view_display.oc_actor.client.default.yml

@@ -13,7 +13,7 @@ dependencies:
     - 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:
@@ -27,12 +27,11 @@ bundle: client
 mode: default
 content:
   field_asylum_status:
-    weight: 15
+    weight: 6
     label: above
-    settings:
-      link_to_entity: false
+    settings: {  }
     third_party_settings: {  }
-    type: string
+    type: list_default
     region: content
   field_client_field_1:
     weight: 1
@@ -43,7 +42,7 @@ content:
     type: string
     region: content
   field_confidentiality_form:
-    weight: 19
+    weight: 15
     label: above
     settings:
       use_description_as_link_text: true
@@ -51,60 +50,15 @@ content:
     type: file_default
     region: content
   field_date_of_birth:
-    weight: 7
+    weight: 3
     label: above
     settings:
-      format_type: medium
       timezone_override: ''
+      format_type: short
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_dependants:
-    weight: 16
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    type: string
-    region: content
-  field_disability:
-    weight: 11
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    type: string
-    region: content
-  field_ethnic_o:
-    weight: 13
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    type: string
-    region: content
-  field_gender_identified_with:
-    weight: 10
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_how_heard:
-    weight: 17
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_income:
-    weight: 14
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_languages_spoken:
     weight: 12
     label: above
     settings:
@@ -112,14 +66,58 @@ content:
     third_party_settings: {  }
     type: string
     region: content
-  field_marital_:
+  field_disability:
+    weight: 10
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    type: string
+    region: content
+  field_ethnic_o:
+    weight: 7
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    type: string
+    region: content
+  field_gender_identified_with:
+    weight: 4
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_how_heard:
+    weight: 13
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_income:
+    weight: 11
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_languages_spoken:
     weight: 9
     label: above
     settings: {  }
     third_party_settings: {  }
     type: list_default
     region: content
-  field_nationality:
+  field_marital_:
+    weight: 5
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_nationalities:
     weight: 8
     label: above
     settings:
@@ -128,7 +126,7 @@ content:
     type: string
     region: content
   field_referred_by:
-    weight: 18
+    weight: 14
     label: above
     settings:
       link_to_entity: false
@@ -143,27 +141,4 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-  phone:
-    label: above
-    type: string
-    weight: 2
-    region: content
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-  phone2:
-    label: above
-    type: string
-    weight: 3
-    region: content
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-  postal_address:
-    label: above
-    type: basic_string
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
 hidden: {  }

modules/opencase_defaults/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml

@@ -3,9 +3,12 @@ status: true
 dependencies:
   config:
     - field.field.oc_actor.volunteer.field_languages_spoken
-    - field.field.oc_actor.volunteer.field_nationality
+    - field.field.oc_actor.volunteer.field_nationalities
+    - field.field.oc_actor.volunteer.field_osic_level
+    - field.field.oc_actor.volunteer.field_skills
     - opencase_entities.oc_actor_type.volunteer
   module:
+    - options
     - user
 id: oc_actor.volunteer.default
 targetEntityType: oc_actor
@@ -13,20 +16,26 @@ bundle: volunteer
 mode: default
 content:
   field_languages_spoken:
-    weight: 8
+    weight: 4
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_nationalities:
+    weight: 3
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
     type: string
     region: content
-  field_nationality:
-    weight: 7
+  field_osic_level:
+    weight: 5
     label: above
-    settings:
-      link_to_entity: false
+    settings: {  }
     third_party_settings: {  }
-    type: string
+    type: list_default
     region: content
   field_sdfdsfds:
     weight: 1
@@ -35,6 +44,13 @@ content:
     third_party_settings: {  }
     type: text_default
     region: content
+  field_skills:
+    type: basic_string
+    weight: 6
+    region: content
+    label: above
+    settings: {  }
+    third_party_settings: {  }
   name:
     label: above
     type: string
@@ -46,7 +62,7 @@ content:
   phone:
     label: above
     type: string
-    weight: 2
+    weight: 0
     region: content
     settings:
       link_to_entity: false
@@ -54,7 +70,7 @@ content:
   phone2:
     label: above
     type: string
-    weight: 3
+    weight: 1
     region: content
     settings:
       link_to_entity: false
@@ -62,7 +78,7 @@ content:
   postal_address:
     label: above
     type: basic_string
-    weight: 5
+    weight: 2
     region: content
     settings: {  }
     third_party_settings: {  }

modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_asylum_status.yml

@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.storage.oc_actor.field_asylum_status
     - opencase_entities.oc_actor_type.client
+  module:
+    - options
 id: oc_actor.client.field_asylum_status
 field_name: field_asylum_status
 entity_type: oc_actor
@@ -15,4 +17,4 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings: {  }
-field_type: string
+field_type: list_string

modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_languages_spoken.yml

@@ -4,15 +4,17 @@ dependencies:
   config:
     - field.storage.oc_actor.field_languages_spoken
     - opencase_entities.oc_actor_type.client
+  module:
+    - options
 id: oc_actor.client.field_languages_spoken
 field_name: field_languages_spoken
 entity_type: oc_actor
 bundle: client
 label: 'Languages spoken'
-description: ''
+description: 'Hold down <b>Ctrl</b> (or the Mac equivalent) while clicking, and you can select more than one.'
 required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
 settings: {  }
-field_type: string
+field_type: list_string

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 <b>Ctrl</b> (or the Mac equivalent) while clicking.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string

modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_sex.yml

@@ -2,17 +2,19 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.oc_actor.field_nationality
+    - field.storage.oc_actor.field_sex
     - opencase_entities.oc_actor_type.client
-id: oc_actor.client.field_nationality
-field_name: field_nationality
+  module:
+    - options
+id: oc_actor.client.field_sex
+field_name: field_sex
 entity_type: oc_actor
 bundle: client
-label: Nationality
+label: Sex
 description: ''
 required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
 settings: {  }
-field_type: string
+field_type: list_string

modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_languages_spoken.yml

@@ -4,15 +4,17 @@ dependencies:
   config:
     - field.storage.oc_actor.field_languages_spoken
     - opencase_entities.oc_actor_type.volunteer
+  module:
+    - options
 id: oc_actor.volunteer.field_languages_spoken
 field_name: field_languages_spoken
 entity_type: oc_actor
 bundle: volunteer
 label: 'Languages spoken'
-description: ''
+description: 'Hold down <b>Ctrl</b> (or the Mac equivalent) while clicking, and you can select more than one.'
 required: false
 translatable: true
 default_value: {  }
 default_value_callback: ''
 settings: {  }
-field_type: string
+field_type: list_string

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 <b>Ctrl</b> (or the Mac equivalent) while clicking.'
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string

modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_osic_level.yml

@@ -0,0 +1,20 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_osic_level
+    - opencase_entities.oc_actor_type.volunteer
+  module:
+    - options
+id: oc_actor.volunteer.field_osic_level
+field_name: field_osic_level
+entity_type: oc_actor
+bundle: volunteer
+label: 'OSIC level'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string

modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_skills.yml

@@ -2,17 +2,17 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.oc_actor.field_nationality
+    - field.storage.oc_actor.field_skills
     - opencase_entities.oc_actor_type.volunteer
-id: oc_actor.volunteer.field_nationality
-field_name: field_nationality
+id: oc_actor.volunteer.field_skills
+field_name: field_skills
 entity_type: oc_actor
 bundle: volunteer
-label: Nationality
+label: Skills
 description: ''
 required: false
-translatable: true
+translatable: false
 default_value: {  }
 default_value_callback: ''
 settings: {  }
-field_type: string
+field_type: string_long

modules/opencase_defaults/config/optional/field.storage.oc_activity.field_amount.yml

@@ -6,7 +6,7 @@ dependencies:
 id: oc_activity.field_amount
 field_name: field_amount
 entity_type: oc_activity
-type: number_decimal
+type: decimal
 settings:
   precision: 10
   scale: 2

modules/opencase_defaults/config/optional/field.storage.oc_actor.field_asylum_status.yml

@@ -3,15 +3,21 @@ status: true
 dependencies:
   module:
     - opencase_entities
+    - options
 id: oc_actor.field_asylum_status
 field_name: field_asylum_status
 entity_type: oc_actor
-type: string
+type: list_string
 settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
+  allowed_values:
+    -
+      value: Refused
+      label: Refused
+    -
+      value: 'Leave to remain'
+      label: 'Leave to remain'
+  allowed_values_function: ''
+module: options
 locked: false
 cardinality: 1
 translatable: true

modules/opencase_defaults/config/optional/field.storage.oc_actor.field_languages_spoken.yml

@@ -3,15 +3,30 @@ status: true
 dependencies:
   module:
     - opencase_entities
+    - options
 id: oc_actor.field_languages_spoken
 field_name: field_languages_spoken
 entity_type: oc_actor
-type: string
+type: list_string
 settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
+  allowed_values:
+    -
+      value: English
+      label: English
+    -
+      value: French
+      label: French
+    -
+      value: Arabic
+      label: Arabic
+    -
+      value: Kurdish
+      label: Kurdish
+    -
+      value: Farsi
+      label: Farsi
+  allowed_values_function: ''
+module: options
 locked: false
 cardinality: -1
 translatable: true

modules/opencase_defaults/config/optional/field.storage.oc_actor.field_nationalities.yml

@@ -0,0 +1,611 @@
+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: Afghan
+      label: Afghan
+    -
+      value: Albanian
+      label: Albanian
+    -
+      value: Algerian
+      label: Algerian
+    -
+      value: American
+      label: American
+    -
+      value: Andorran
+      label: Andorran
+    -
+      value: Angolan
+      label: Angolan
+    -
+      value: Antiguans
+      label: Antiguans
+    -
+      value: Argentinean
+      label: Argentinean
+    -
+      value: Armenian
+      label: Armenian
+    -
+      value: Australian
+      label: Australian
+    -
+      value: Austrian
+      label: Austrian
+    -
+      value: Azerbaijani
+      label: Azerbaijani
+    -
+      value: Bahamian
+      label: Bahamian
+    -
+      value: Bahraini
+      label: Bahraini
+    -
+      value: Bangladeshi
+      label: Bangladeshi
+    -
+      value: Barbadian
+      label: Barbadian
+    -
+      value: Barbudans
+      label: Barbudans
+    -
+      value: Batswana
+      label: Batswana
+    -
+      value: Belarusian
+      label: Belarusian
+    -
+      value: Belgian
+      label: Belgian
+    -
+      value: Belizean
+      label: Belizean
+    -
+      value: Beninese
+      label: Beninese
+    -
+      value: Bhutanese
+      label: Bhutanese
+    -
+      value: Bolivian
+      label: Bolivian
+    -
+      value: Bosnian
+      label: Bosnian
+    -
+      value: Brazilian
+      label: Brazilian
+    -
+      value: British
+      label: British
+    -
+      value: Bruneian
+      label: Bruneian
+    -
+      value: Bulgarian
+      label: Bulgarian
+    -
+      value: Burkinabe
+      label: Burkinabe
+    -
+      value: Burmese
+      label: Burmese
+    -
+      value: Burundian
+      label: Burundian
+    -
+      value: Cambodian
+      label: Cambodian
+    -
+      value: Cameroonian
+      label: Cameroonian
+    -
+      value: Canadian
+      label: Canadian
+    -
+      value: 'Cape Verdean'
+      label: 'Cape Verdean'
+    -
+      value: 'Central African'
+      label: 'Central African'
+    -
+      value: Chadian
+      label: Chadian
+    -
+      value: Chilean
+      label: Chilean
+    -
+      value: Chinese
+      label: Chinese
+    -
+      value: Colombian
+      label: Colombian
+    -
+      value: Comoran
+      label: Comoran
+    -
+      value: Congolese
+      label: Congolese
+    -
+      value: 'Costa Rican'
+      label: 'Costa Rican'
+    -
+      value: Croatian
+      label: Croatian
+    -
+      value: Cuban
+      label: Cuban
+    -
+      value: Cypriot
+      label: Cypriot
+    -
+      value: Czech
+      label: Czech
+    -
+      value: Danish
+      label: Danish
+    -
+      value: Djibouti
+      label: Djibouti
+    -
+      value: Dominican
+      label: Dominican
+    -
+      value: Dutch
+      label: Dutch
+    -
+      value: Dutchman
+      label: Dutchman
+    -
+      value: Dutchwoman
+      label: Dutchwoman
+    -
+      value: 'East Timorese'
+      label: 'East Timorese'
+    -
+      value: Ecuadorean
+      label: Ecuadorean
+    -
+      value: Egyptian
+      label: Egyptian
+    -
+      value: Emirian
+      label: Emirian
+    -
+      value: 'Equatorial Guinean'
+      label: 'Equatorial Guinean'
+    -
+      value: Eritrean
+      label: Eritrean
+    -
+      value: Estonian
+      label: Estonian
+    -
+      value: Ethiopian
+      label: Ethiopian
+    -
+      value: Fijian
+      label: Fijian
+    -
+      value: Filipino
+      label: Filipino
+    -
+      value: Finnish
+      label: Finnish
+    -
+      value: French
+      label: French
+    -
+      value: Gabonese
+      label: Gabonese
+    -
+      value: Gambian
+      label: Gambian
+    -
+      value: Georgian
+      label: Georgian
+    -
+      value: German
+      label: German
+    -
+      value: Ghanaian
+      label: Ghanaian
+    -
+      value: Greek
+      label: Greek
+    -
+      value: Grenadian
+      label: Grenadian
+    -
+      value: Guatemalan
+      label: Guatemalan
+    -
+      value: Guinea-Bissauan
+      label: Guinea-Bissauan
+    -
+      value: Guinean
+      label: Guinean
+    -
+      value: Guyanese
+      label: Guyanese
+    -
+      value: Haitian
+      label: Haitian
+    -
+      value: Herzegovinian
+      label: Herzegovinian
+    -
+      value: Honduran
+      label: Honduran
+    -
+      value: Hungarian
+      label: Hungarian
+    -
+      value: I-Kiribati
+      label: I-Kiribati
+    -
+      value: Icelander
+      label: Icelander
+    -
+      value: Indian
+      label: Indian
+    -
+      value: Indonesian
+      label: Indonesian
+    -
+      value: Iranian
+      label: Iranian
+    -
+      value: Iraqi
+      label: Iraqi
+    -
+      value: Irish
+      label: Irish
+    -
+      value: Israeli
+      label: Israeli
+    -
+      value: Italian
+      label: Italian
+    -
+      value: Ivorian
+      label: Ivorian
+    -
+      value: Jamaican
+      label: Jamaican
+    -
+      value: Japanese
+      label: Japanese
+    -
+      value: Jordanian
+      label: Jordanian
+    -
+      value: Kazakhstani
+      label: Kazakhstani
+    -
+      value: Kenyan
+      label: Kenyan
+    -
+      value: 'Kittian and Nevisian'
+      label: 'Kittian and Nevisian'
+    -
+      value: Kuwaiti
+      label: Kuwaiti
+    -
+      value: Kyrgyz
+      label: Kyrgyz
+    -
+      value: Laotian
+      label: Laotian
+    -
+      value: Latvian
+      label: Latvian
+    -
+      value: Lebanese
+      label: Lebanese
+    -
+      value: Liberian
+      label: Liberian
+    -
+      value: Libyan
+      label: Libyan
+    -
+      value: Liechtensteiner
+      label: Liechtensteiner
+    -
+      value: Lithuanian
+      label: Lithuanian
+    -
+      value: Luxembourger
+      label: Luxembourger
+    -
+      value: Macedonian
+      label: Macedonian
+    -
+      value: Malagasy
+      label: Malagasy
+    -
+      value: Malawian
+      label: Malawian
+    -
+      value: Malaysian
+      label: Malaysian
+    -
+      value: Maldivan
+      label: Maldivan
+    -
+      value: Malian
+      label: Malian
+    -
+      value: Maltese
+      label: Maltese
+    -
+      value: Marshallese
+      label: Marshallese
+    -
+      value: Mauritanian
+      label: Mauritanian
+    -
+      value: Mauritian
+      label: Mauritian
+    -
+      value: Mexican
+      label: Mexican
+    -
+      value: Micronesian
+      label: Micronesian
+    -
+      value: Moldovan
+      label: Moldovan
+    -
+      value: Monacan
+      label: Monacan
+    -
+      value: Mongolian
+      label: Mongolian
+    -
+      value: Moroccan
+      label: Moroccan
+    -
+      value: Mosotho
+      label: Mosotho
+    -
+      value: Motswana
+      label: Motswana
+    -
+      value: Mozambican
+      label: Mozambican
+    -
+      value: Namibian
+      label: Namibian
+    -
+      value: Nauruan
+      label: Nauruan
+    -
+      value: Nepalese
+      label: Nepalese
+    -
+      value: Netherlander
+      label: Netherlander
+    -
+      value: 'New Zealander'
+      label: 'New Zealander'
+    -
+      value: Ni-Vanuatu
+      label: Ni-Vanuatu
+    -
+      value: Nicaraguan
+      label: Nicaraguan
+    -
+      value: Nigerian
+      label: Nigerian
+    -
+      value: Nigerien
+      label: Nigerien
+    -
+      value: 'North Korean'
+      label: 'North Korean'
+    -
+      value: 'Northern Irish'
+      label: 'Northern Irish'
+    -
+      value: Norwegian
+      label: Norwegian
+    -
+      value: Omani
+      label: Omani
+    -
+      value: Pakistani
+      label: Pakistani
+    -
+      value: Palauan
+      label: Palauan
+    -
+      value: Panamanian
+      label: Panamanian
+    -
+      value: 'Papua New Guinean'
+      label: 'Papua New Guinean'
+    -
+      value: Paraguayan
+      label: Paraguayan
+    -
+      value: Peruvian
+      label: Peruvian
+    -
+      value: Polish
+      label: Polish
+    -
+      value: Portuguese
+      label: Portuguese
+    -
+      value: Qatari
+      label: Qatari
+    -
+      value: Romanian
+      label: Romanian
+    -
+      value: Russian
+      label: Russian
+    -
+      value: Rwandan
+      label: Rwandan
+    -
+      value: 'Saint Lucian'
+      label: 'Saint Lucian'
+    -
+      value: Salvadoran
+      label: Salvadoran
+    -
+      value: Samoan
+      label: Samoan
+    -
+      value: 'San Marinese'
+      label: 'San Marinese'
+    -
+      value: 'Sao Tomean'
+      label: 'Sao Tomean'
+    -
+      value: Saudi
+      label: Saudi
+    -
+      value: Scottish
+      label: Scottish
+    -
+      value: Senegalese
+      label: Senegalese
+    -
+      value: Serbian
+      label: Serbian
+    -
+      value: Seychellois
+      label: Seychellois
+    -
+      value: 'Sierra Leonean'
+      label: 'Sierra Leonean'
+    -
+      value: Singaporean
+      label: Singaporean
+    -
+      value: Slovakian
+      label: Slovakian
+    -
+      value: Slovenian
+      label: Slovenian
+    -
+      value: 'Solomon Islander'
+      label: 'Solomon Islander'
+    -
+      value: Somali
+      label: Somali
+    -
+      value: 'South African'
+      label: 'South African'
+    -
+      value: 'South Korean'
+      label: 'South Korean'
+    -
+      value: Spanish
+      label: Spanish
+    -
+      value: 'Sri Lankan'
+      label: 'Sri Lankan'
+    -
+      value: Sudanese
+      label: Sudanese
+    -
+      value: Surinamer
+      label: Surinamer
+    -
+      value: Swazi
+      label: Swazi
+    -
+      value: Swedish
+      label: Swedish
+    -
+      value: Swiss
+      label: Swiss
+    -
+      value: Syrian
+      label: Syrian
+    -
+      value: Taiwanese
+      label: Taiwanese
+    -
+      value: Tajik
+      label: Tajik
+    -
+      value: Tanzanian
+      label: Tanzanian
+    -
+      value: Thai
+      label: Thai
+    -
+      value: Togolese
+      label: Togolese
+    -
+      value: Tongan
+      label: Tongan
+    -
+      value: 'Trinidadian or Tobagonian'
+      label: 'Trinidadian or Tobagonian'
+    -
+      value: Tunisian
+      label: Tunisian
+    -
+      value: Turkish
+      label: Turkish
+    -
+      value: Tuvaluan
+      label: Tuvaluan
+    -
+      value: Ugandan
+      label: Ugandan
+    -
+      value: Ukrainian
+      label: Ukrainian
+    -
+      value: Uruguayan
+      label: Uruguayan
+    -
+      value: Uzbekistani
+      label: Uzbekistani
+    -
+      value: Venezuelan
+      label: Venezuelan
+    -
+      value: Vietnamese
+      label: Vietnamese
+    -
+      value: Welsh
+      label: Welsh
+    -
+      value: Yemenite
+      label: Yemenite
+    -
+      value: Zambian
+      label: Zambian
+    -
+      value: Zimbabwean
+      label: Zimbabwean
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

modules/opencase_defaults/config/optional/field.storage.oc_actor.field_osic_level.yml

@@ -0,0 +1,32 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_osic_level
+field_name: field_osic_level
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: 'Under supervision'
+      label: 'Under supervision'
+    -
+      value: 'Level 1'
+      label: 'Level 1'
+    -
+      value: 'Level 2'
+      label: 'Level 2'
+    -
+      value: 'Level 3'
+      label: 'Level 3'
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

modules/opencase_defaults/config/optional/field.storage.oc_actor.field_sex.yml

@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_sex
+field_name: field_sex
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: Male
+      label: Male
+    -
+      value: Female
+      label: Female
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

modules/opencase_defaults/config/optional/field.storage.oc_actor.field_skills.yml

@@ -3,13 +3,11 @@ status: true
 dependencies:
   module:
     - opencase_entities
-id: oc_actor.field_nationality
-field_name: field_nationality
+id: oc_actor.field_skills
+field_name: field_skills
 entity_type: oc_actor
-type: string
+type: string_long
 settings:
-  max_length: 255
-  is_ascii: false
   case_sensitive: false
 module: core
 locked: false

modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_or_equivalent_cost.yml

@@ -6,7 +6,7 @@ dependencies:
 id: oc_case.field_fee_or_equivalent_cost
 field_name: field_fee_or_equivalent_cost
 entity_type: oc_case
-type: number_decimal
+type: decimal
 settings:
   precision: 10
   scale: 2

modules/opencase_defaults/config/optional/opencase_entities.oc_activity_type.supervision.yml

@@ -0,0 +1,5 @@
+langcode: en
+status: true
+dependencies: {  }
+id: supervision
+label: Supervision

modules/opencase_defaults/config/optional/opencase_entities.oc_case_type.volunteer_engagement.yml

@@ -10,6 +10,7 @@ allowedActivityTypes:
   interview: interview
   lete: lete
   research: research
+  supervision: supervision
   telephone_call: telephone_call
   volunteer_training_session: volunteer_training_session
   destitution_funds_provided: 0

modules/opencase_defaults/config/optional/system.menu.opencase-add-actors.yml

@@ -1,7 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: opencase-add-actors
-label: 'OpenCase Add Actors'
-description: ''
-locked: false

modules/opencase_defaults/config/optional/user.role.caseworker.yml

@@ -12,5 +12,9 @@ permissions:
   - 'delete activity entities'
   - 'delete case entities'
   - 'delete client entities'
+  - 'edit activity entities'
+  - 'edit case entities'
   - 'edit client entities'
+  - 'use opencase'
+  - 'view own cases'
   - 'view published client entities'

modules/opencase_defaults/config/optional/user.role.opencase_admin.yml

@@ -6,16 +6,30 @@ label: 'CRM Admin'
 weight: 7
 is_admin: null
 permissions:
+  - 'add activity entities'
+  - 'add case entities'
   - 'add client entities'
   - 'add volunteer entities'
+  - 'administer oc_activity display'
   - 'administer oc_activity fields'
+  - 'administer oc_activity form display'
+  - 'administer oc_actor display'
   - 'administer oc_actor fields'
+  - 'administer oc_actor form display'
   - 'administer oc_case fields'
+  - 'administer oc_case form display'
   - 'administer opencase entity bundles'
   - 'administer users'
   - 'delete activity entities'
   - 'delete case entities'
   - 'delete client entities'
   - 'delete volunteer entities'
+  - 'edit activity entities'
+  - 'edit case entities'
   - 'edit client entities'
   - 'edit volunteer entities'
+  - 'use opencase'
+  - 'view published activity entities'
+  - 'view published case entities'
+  - 'view published client entities'
+  - 'view published volunteer entities'

modules/opencase_defaults/config/optional/user.role.overseer.yml

@@ -14,7 +14,11 @@ permissions:
   - 'delete case entities'
   - 'delete client entities'
   - 'delete volunteer entities'
+  - 'edit activity entities'
+  - 'edit case entities'
   - 'edit client entities'
   - 'edit volunteer entities'
+  - 'use opencase'
+  - 'view published case entities'
   - 'view published client entities'
   - 'view published volunteer entities'

modules/opencase_defaults/config/optional/user.role.volunteer_co_ord.yml

@@ -7,9 +7,13 @@ weight: 6
 is_admin: null
 permissions:
   - 'add activity entities'
+  - 'add case entities'
   - 'add volunteer entities'
   - 'delete activity entities'
   - 'delete case entities'
   - 'delete volunteer entities'
+  - 'edit activity entities'
+  - 'edit case entities'
   - 'edit volunteer entities'
+  - 'use opencase'
   - 'view published volunteer entities'

modules/opencase_defaults/opencase_defaults.info.yml

@@ -1,5 +1,10 @@
 name: 'Opencase Example Configuration'
 type: module
-description: 'Actor types, case types, activity types and user roles suited to an asylum advice group'
+description: 'Person types, case types, activity types and user roles suited to an asylum advice group'
 core: 8.x
 package: 'OpenCase'
+dependencies:
+  - contact
+  - field
+  - opencase_entities
+  - options

modules/opencase_defaults/opencase_defaults.links.menu.yml

@@ -1,12 +1,12 @@
-opencase.add_volunteer:
-  title: 'Add a new volunteer'
-  description: 'Create a new volunteer record'
-  menu_name: opencase-add-actors
-  url: internal:/opencase/oc_actor/add/volunteer
+opencase_defaults.report_on_clients:
+  title: 'Clients'
+  description: 'Report on clients'
+  parent: opencase_reporting.reporting_menu
+  url: internal:/opencase/reporting/clients
   weight: 0
-opencase.add_client:
-  title: 'Add a new client'
-  description: 'Create a new client record'
-  menu_name: opencase-add-actors
-  url: internal:/opencase/oc_actor/add/client
+opencase_defaults.report_on_volunteers:
+  title: 'Volunteers'
+  description: 'Report on volunteers'
+  parent: opencase_reporting.reporting_menu
+  url: internal:/opencase/reporting/volunteers
   weight: 1

modules/opencase_defaults/opencase_defaults.module

@@ -6,6 +6,8 @@
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\user\Entity\Role;
+use Drupal\user\RoleInterface;
 
 /**
  * Implements hook_help().
@@ -33,3 +35,4 @@ function opencase_defaults_theme() {
     ],
   ];
 }
+

modules/opencase_entities/config/install/field.field.user.user.field_linked_opencase_actor.yml

@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.user.field_linked_opencase_actor
+  module:
+    - user
+id: user.user.field_linked_opencase_actor
+field_name: field_linked_opencase_actor
+entity_type: user
+bundle: user
+label: 'Person in OpenCase'
+description: 'If this user is also a person in OpenCase (e.g. a staff member or a volunteer), start typing the name here to link them. This will ensure they have access to the right cases.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:oc_actor'
+  handler_settings:
+    target_bundles:
+    sort:
+      field: _none
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference

modules/opencase_entities/config/install/field.storage.user.field_linked_opencase_actor.yml

@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - user
+id: user.field_linked_opencase_actor
+field_name: field_linked_opencase_actor
+entity_type: user
+type: entity_reference
+settings:
+  target_type: oc_actor
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

modules/opencase_entities/opencase_entities.links.action.yml

@@ -1,11 +1,11 @@
 entity.oc_actor.add_form:
   route_name: entity.oc_actor.add_page
-  title: 'Add Actor'
+  title: 'Add Person'
   appears_on:
     - entity.oc_actor.collection
 entity.oc_actor_type.add_form:
   route_name: entity.oc_actor_type.add_form
-  title: 'Add Actor type'
+  title: 'Add Person type'
   appears_on:
     - entity.oc_actor_type.collection
 

modules/opencase_entities/opencase_entities.module

@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\opencase_entities\CaseInvolvement;
 
 /**
  * Implements hook_help().
@@ -111,3 +112,30 @@ function opencase_entities_theme_suggestions_oc_activity(array $variables) {
   $suggestions[] = 'oc_activity__' . $entity->id() . '__' . $sanitized_view_mode;
   return $suggestions;
 }
+
+function opencase_views_query_alter(Drupal\views\ViewExecutable $view, $query) {
+  if ($view->getBaseEntityType() && $view->getBaseEntityType()->id() == 'oc_case') {
+    $query->addTag('oc_case_access');
+  }
+  if ($view->getBaseEntityType() && $view->getBaseEntityType()->id() == 'oc_activity') {
+    $query->addTag('oc_activity_access');
+  }
+}
+
+function opencase_query_oc_case_access_alter($query) {
+  if (\Drupal::currentUser()->hasPermission('view published case entities')) {
+    return;
+  } 
+  $linked_actor_id = CaseInvolvement::getLinkedActorId(\Drupal::currentUser());
+  $query->addJoin('INNER', 'oc_case__actors_involved', 'access_filter', 'access_filter.entity_id = oc_case_field_data.id');
+  $query->condition('access_filter.actors_involved_target_id', $linked_actor_id);
+}
+
+function opencase_query_oc_activity_access_alter($query) {
+  if (\Drupal::currentUser()->hasPermission('view published case entities')) {
+    return;
+  } 
+  $linked_actor_id = CaseInvolvement::getLinkedActorId(\Drupal::currentUser());
+  $query->addJoin('INNER', 'oc_case__actors_involved', 'access_filter', 'access_filter.entity_id = oc_activity_field_data.oc_case');
+  $query->condition('access_filter.actors_involved_target_id', $linked_actor_id);
+}

modules/opencase_entities/opencase_entities.permissions.yml

@@ -1,3 +1,10 @@
+permission_callbacks:
+  - Drupal\opencase_entities\OpenCaseEntityPermissions::permissions
+
+view edit delete all actor entities:
+  title: 'View/Edit/Delete all types of people'
+  description: '';
+
 administer opencase entity bundles:
   title: 'Administer OpenCase Actor/Case/Activity Types'
   description: 'Create, configure and delete types of actor (such as "Client" or "Legal Advisor"), types of case (such as "Housing" or "Asylum") and types of activity (such as "Case Note" or "Interview")'
@@ -7,62 +14,6 @@ administer actor entities:
   description: 'Allow to access the administration form to configure Actor entities.'
   restrict access: true
 
-add client entities:
-  title: 'Create new Client entities'
-
-delete client entities:
-  title: 'Delete Client entities'
-
-edit client entities:
-  title: 'Edit Client entities'
-
-view published client entities:
-  title: 'View published Client entities'
-
-view unpublished client entities:
-  title: 'View unpublished Client entities'
-
-view all client revisions:
-  title: 'View all Client revisions'
-
-revert all client revisions:
-  title: 'Revert all Client revisions'
-  description: 'Role requires permission <em>view Client revisions</em> and <em>edit rights</em> for client entities in question or <em>administer client entities</em>.'
-
-delete all client revisions:
-  title: 'Delete all Client revisions'
-  description: 'Role requires permission to <em>view Client revisions</em> and <em>delete rights</em> for client entities in question or <em>administer client entities</em>.'
-
-view volunteer involvement in cases:
-  title: 'View names of Volunteers involved in Cases'
-  description: "When viewing a case record, they can see the names of the volunteers involved, but cannot click through to volunteer's details."
-
-add volunteer entities:
-  title: 'Create new Volunteer entities'
-
-delete volunteer entities:
-  title: 'Delete Volunteer entities'
-
-edit volunteer entities:
-  title: 'Edit Volunteer entities'
-
-view published volunteer entities:
-  title: 'View published Volunteer entities'
-
-view unpublished volunteer entities:
-  title: 'View unpublished Volunteer entities'
-
-view all volunteer revisions:
-  title: 'View all Volunteer revisions'
-
-revert all volunteer revisions:
-  title: 'Revert all Volunteer revisions'
-  description: 'Role requires permission <em>view Volunteer revisions</em> and <em>edit rights</em> for volunteer entities in question or <em>administer volunteer entities</em>.'
-
-delete all volunteer revisions:
-  title: 'Delete all Volunteer revisions'
-  description: 'Role requires permission to <em>view Volunteer revisions</em> and <em>delete rights</em> for volunteer entities in question or <em>administer volunteer entities</em>.'
-
 add case entities:
   title: 'Create new Case entities'
 
@@ -78,7 +29,8 @@ edit case entities:
   title: 'Edit Case entities'
 
 view published case entities:
-  title: 'View published Case entities'
+  title: 'View all cases'
+  description: 'All users can see cases which they are involved in. This grants permission to see all cases regardless of involvement.'
 
 view unpublished case entities:
   title: 'View unpublished Case entities'
@@ -107,9 +59,6 @@ delete activity entities:
 edit activity entities:
   title: 'Edit Activity entities'
 
-view published activity entities:
-  title: 'View published Activity entities'
-
 view unpublished activity entities:
   title: 'View unpublished Activity entities'
 

modules/opencase_entities/src/CaseInvolvement.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Drupal\opencase_entities;
+
+class CaseInvolvement {
+
+  public static function getLinkedActorId($account) {
+    return \Drupal\user\Entity\User::load($account->id())->get('field_linked_opencase_actor')->target_id;
+  }
+
+  public static function userIsInvolved($account, $case) {
+    $actorId = self::getLinkedActorId($account);        
+    $involvedIds = array_column($case->actors_involved->getValue(), 'target_id');
+    return in_array($actorId, $involvedIds);
+  }
+
+  public static function userIsInvolved_activity($account, $activity) {
+    $case_id = $activity->oc_case->target_id;
+    $case = \Drupal::entityTypeManager()->getStorage('oc_case')->load($case_id);
+    return self::userIsInvolved($account, $case);
+  }
+}

modules/opencase_entities/src/Entity/OCActor.php

@@ -17,8 +17,8 @@ use Drupal\user\UserInterface;
  *
  * @ContentEntityType(
  *   id = "oc_actor",
- *   label = @Translation("Actor"),
- *   bundle_label = @Translation("Actor type"),
+ *   label = @Translation("Person"),
+ *   bundle_label = @Translation("Person type"),
  *   handlers = {
  *     "storage" = "Drupal\opencase_entities\OCActorStorage",
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
@@ -235,7 +235,7 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', [
         'label' => 'inline',
         'type' => 'author',
-        'weight' => -4,
+        'weight' => -10,
       ]);
 
     $fields['first_name'] = BaseFieldDefinition::create('string')
@@ -250,11 +250,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', [
         'label' => 'above',
         'type' => 'string',
-        'weight' => -3,
+        'weight' => -9,
       ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
-        'weight' => -3,
+        'weight' => -9,
       ])
       ->setRequired(TRUE);
 
@@ -270,11 +270,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', [
         'label' => 'above',
         'type' => 'string',
-        'weight' => -2,
+        'weight' => -8,
       ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
-        'weight' => -2,
+        'weight' => -8,
       ])
       ->setRequired(FALSE);
 
@@ -290,14 +290,25 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', [
         'label' => 'above',
         'type' => 'string',
-        'weight' => -1,
+        'weight' => -7,
       ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
-        'weight' => -1,
+        'weight' => -7,
       ])
       ->setRequired(TRUE);
 
+    $fields['consent'] = BaseFieldDefinition::create('boolean')
+      ->setLabel(t('Consent to data storage'))
+      ->setDescription(t('Has this person explicitly consented to having their personal data stored on this system?'))
+      ->setRevisionable(TRUE)
+      ->setDefaultValue(FALSE)
+      ->setRequired(TRUE)
+      ->setDisplayOptions('form', array(
+        'type' => 'boolean_checkbox',
+        'weight' => -6,
+      ));
+
     // Contact details.
     // so it is not exposed to user configuration. 
     $fields['email'] = BaseFieldDefinition::create('string')
@@ -310,16 +321,14 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', array(
         'label' => 'above',
         'type' => 'string',
-        'weight' => 0,
+        'weight' => -5,
       ))
       ->setDisplayOptions('form', array(
         'type' => 'string_textfield',
-        'weight' => 0,
+        'weight' => -5,
       ));
     $fields['phone'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Main Phone Number'))
-      ->setDisplayConfigurable('view', TRUE)
-      ->setDisplayConfigurable('form', TRUE)
       ->setSettings(array(
         'default_value' => '',
         'max_length' => 20,
@@ -328,11 +337,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', array(
         'label' => 'above',
         'type' => 'string',
-        'weight' => 2,
+        'weight' => -4,
       ))
       ->setDisplayOptions('form', array(
         'type' => 'string_textfield',
-        'weight' => 2,
+        'weight' => -4,
       ));
     $fields['phone2'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Alternative Phone Number'))
@@ -341,22 +350,18 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
         'max_length' => 20,
         'text_processing' => 0,
       ))
-      ->setDisplayConfigurable('view', TRUE)
-      ->setDisplayConfigurable('form', TRUE)
       ->setDisplayOptions('view', array(
         'label' => 'above',
         'type' => 'string',
-        'weight' => 3,
+        'weight' => -3,
       ))
       ->setDisplayOptions('form', array(
         'type' => 'string_textfield',
-        'weight' => 3,
+        'weight' => -3,
       ));
     $fields['postal_address'] = BaseFieldDefinition::create('string_long')
       ->setLabel(t('Postal Address'))
       ->setDescription(t('Full address, apart from post code.'))
-      ->setDisplayConfigurable('view', TRUE)
-      ->setDisplayConfigurable('form', TRUE)
       ->setSettings(array(
         'default_value' => '',
         'max_length' => 255,
@@ -365,11 +370,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', array(
         'label' => 'above',
         'type' => 'basic_string',
-        'weight' => 5,
+        'weight' => -2,
       ))
       ->setDisplayOptions('form', array(
         'type' => 'string_textarea',
-        'weight' => 5,
+        'weight' => -2,
       ));
     $fields['post_code'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Post Code'))
@@ -381,11 +386,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', array(
         'label' => 'above',
         'type' => 'string',
-        'weight' => 6,
+        'weight' => -1,
       ))
       ->setDisplayOptions('form', array(
         'type' => 'string_textfield',
-        'weight' => 6,
+        'weight' => -1,
       ));
 
     $fields['created'] = BaseFieldDefinition::create('created')

modules/opencase_entities/src/Entity/OCActorType.php

@@ -9,7 +9,7 @@ use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
  *
  * @ConfigEntityType(
  *   id = "oc_actor_type",
- *   label = @Translation("Actor type"),
+ *   label = @Translation("Person type"),
  *   handlers = {
  *     "access" = "Drupal\opencase_entities\OCActorTypeAccessControlHandler",
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",

modules/opencase_entities/src/Entity/OCCase.php

@@ -76,10 +76,13 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
 
   /**
    * When creating a case, it sets the first involved party to the actor
-   * id from the URL.
+   * id from the URL, and the second to the author's linked actor 
+   * (if it exists and is different)
    */
   public static function defaultVal() {
-    return array(\Drupal::request()->query->get('actor_id'));
+    $author_linked_actor_id = \Drupal\user\Entity\User::load(\Drupal::currentUser()->id())->get('field_linked_opencase_actor')->target_id;
+    $currently_viewed_actor_id = \Drupal::request()->query->get('actor_id');
+    return array_unique([$currently_viewed_actor_id, $author_linked_actor_id]);
   }
 
   /**

modules/opencase_entities/src/Form/OCActorForm.php

@@ -55,13 +55,13 @@ class OCActorForm extends ContentEntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Actor.', [
+        drupal_set_message($this->t('Created %label.', [
           '%label' => $entity->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Actor.', [
+        drupal_set_message($this->t('Saved %label.', [
           '%label' => $entity->label(),
         ]));
     }

modules/opencase_entities/src/Form/OCActorTypeForm.php

@@ -22,7 +22,7 @@ class OCActorTypeForm extends EntityForm {
       '#title' => $this->t('Label'),
       '#maxlength' => 255,
       '#default_value' => $oc_actor_type->label(),
-      '#description' => $this->t("Label for the Actor type."),
+      '#description' => $this->t("Label for the Person type."),
       '#required' => TRUE,
     ];
 
@@ -49,13 +49,13 @@ class OCActorTypeForm extends EntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Actor type.', [
+        drupal_set_message($this->t('Created the %label Person type.', [
           '%label' => $oc_actor_type->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Actor type.', [
+        drupal_set_message($this->t('Saved the %label Person type.', [
           '%label' => $oc_actor_type->label(),
         ]));
     }

modules/opencase_entities/src/OCActivityAccessControlHandler.php

@@ -24,13 +24,28 @@ class OCActivityAccessControlHandler extends EntityAccessControlHandler {
         if (!$entity->isPublished()) {
           return AccessResult::allowedIfHasPermission($account, 'view unpublished activity entities');
         }
-        return AccessResult::allowedIfHasPermission($account, 'view published activity entities');
-
-      case 'update':
-        return AccessResult::allowedIfHasPermission($account, 'edit activity entities');
-
-      case 'delete':
-        return AccessResult::allowedIfHasPermission($account, 'delete activity entities');
+        return AccessResult::allowedIf(
+            $account->hasPermission('view published case entities')  // activity permissions are inherited from case
+            || CaseInvolvement::userIsInvolved_activity($account, $entity)
+        );
+      case 'update':  // allowed only if a) they can see the case the activity is on and b) they can edit activities
+        if (!$account->hasPermission('edit activity entities')) {
+            return AccessResult::forbidden();
+        } else {
+            return AccessResult::allowedIf(
+              $account->hasPermission('view published case entities') 
+              || CaseInvolvement::userIsInvolved_activity($account, $entity)
+            );
+        }
+      case 'delete':  // allowed only if a) they can see the case the activity is on and b) they can delete activities
+        if (!$account->hasPermission('delete activity entities')) {
+            return AccessResult::forbidden();
+        } else {
+            return AccessResult::allowedIf(
+              $account->hasPermission('view published case entities') 
+              || CaseInvolvement::userIsInvolved_activity($account, $entity)
+            );
+        }
     }
 
     // Unknown operation, no opinion.

modules/opencase_entities/src/OCActorAccessControlHandler.php

@@ -14,6 +14,9 @@ use Drupal\Core\Access\AccessResult;
  */
 class OCActorAccessControlHandler extends EntityAccessControlHandler {
 
+
+  protected $viewLabelOperation = TRUE;
+
   /**
    * {@inheritdoc}
    * Permissions are assigned by bundle.
@@ -22,21 +25,18 @@ class OCActorAccessControlHandler extends EntityAccessControlHandler {
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
     /** @var \Drupal\opencase_entities\Entity\OCActorInterface $entity */
     $bundle = $entity->bundle();
-    $route_name = \Drupal::routeMatch()->getRouteName();
-    $case_routes = ['entity.oc_case.canonical', 'entity.oc_case.edit_form', 'view.cases.page_1', 'entity.oc_case.add_form'];
-    $is_case_context = in_array($route_name, $case_routes);
-
     switch ($operation) {
+      case 'view label':
+        return AccessResult::allowed();    
+
       case 'view':
         if (!$entity->isPublished()) {
           return AccessResult::allowedIf(
             $account->hasPermission("view unpublished $bundle entities")
-            or ($is_case_context && $account->hasPermission("view unpublished $bundle entities"))
           );
         }
         return AccessResult::allowedIf(
           $account->hasPermission("view published $bundle entities")
-          or ($is_case_context && $account->hasPermission("view $bundle involvement in cases"))
         );
 
       case "update":

modules/opencase_entities/src/OCActorTypeListBuilder.php

@@ -14,7 +14,7 @@ class OCActorTypeListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header['label'] = $this->t('Actor type');
+    $header['label'] = $this->t('Person type');
     $header['id'] = $this->t('Machine name');
     return $header + parent::buildHeader();
   }

modules/opencase_entities/src/OCCaseAccessControlHandler.php

@@ -6,6 +6,7 @@ use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Access\AccessResult;
+use Drupal\opencase_entities\CaseInvolvement;
 
 /**
  * Access controller for the Case entity.
@@ -24,13 +25,20 @@ class OCCaseAccessControlHandler extends EntityAccessControlHandler {
         if (!$entity->isPublished()) {
           return AccessResult::allowedIfHasPermission($account, 'view unpublished case entities');
         }
-        return AccessResult::allowedIfHasPermission($account, 'view published case entities');
-
-      case 'update':
-        return AccessResult::allowedIfHasPermission($account, 'edit case entities');
-
-      case 'delete':
-        return AccessResult::allowedIfHasPermission($account, 'delete case entities');
+        return AccessResult::allowedIf(
+            $account->hasPermission('view published case entities')
+            || CaseInvolvement::userIsInvolved($account, $entity)
+        );
+      case 'update':   // you can edit the case only if a) you can see it and b) you have the permission to edit cases.
+        return AccessResult::allowedIf(
+            $account->hasPermission('edit case entities')
+            && ($account->hasPermission('view published case entities') || CaseInvolvement::userIsInvolved($account, $entity))
+        );
+      case 'delete':   // you can delete the case only if a) you can see it and b) you have the permission to delete cases.
+        return AccessResult::allowedIf(
+            $account->hasPermission('delete case entities')
+            && ($account->hasPermission('view published case entities') || CaseInvolvement::userIsInvolved($account, $entity))
+        );
     }
 
     // Unknown operation, no opinion.

modules/opencase_entities/src/OpenCaseEntityPermissions.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace Drupal\opencase_entities;
+
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class OpenCaseEntityPermissions implements ContainerInjectionInterface {
+
+  use StringTranslationTrait;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructor for MyModulePermissions.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   */
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static($container->get('entity_type.manager'));
+  }
+
+  /**
+   * Get permissions for MyModule.
+   *
+   * @return array
+   *   Permissions array.
+   */
+  public function permissions() {
+    $permissions = [];
+
+    foreach ($this->entityTypeManager->getStorage('oc_actor_type')->loadMultiple() as $id => $type) {
+      $permissions += [
+        "add $id entities" => [
+          'title' => $this->t('Create new %type entities', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "edit $id entities" => [
+          'title' => $this->t('Edit %type entities', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "delete $id entities" => [
+          'title' => $this->t('Delete %type entities', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "view published $id entities" => [
+          'title' => $this->t('View published %type entities', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "view all $id revisions" => [
+          'title' => $this->t('View %type revisions', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "revert all $id revisions" => [
+          'title' => $this->t('Revert %type revisions', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "delete all $id revisions" => [
+          'title' => $this->t('Delete %type revisions', array('%type' => $type->label())),
+        ]
+      ];
+
+    }
+    return $permissions;
+  }
+}

modules/opencase_reporting/config/install/block.block.facet_actortype.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.actor_type
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_actortype
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:actor_type'
+settings:
+  id: 'facet_block:actor_type'
+  label: 'Actor type'
+  provider: facets
+  label_display: visible
+  block_id: facet_actortype
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/actors'
+    negate: false
+    context_mapping: {  }

modules/opencase_reporting/config/install/block.block.facet_created.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.created
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_created
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:created'
+settings:
+  id: 'facet_block:created'
+  label: 'Created Date'
+  provider: facets
+  label_display: visible
+  block_id: facet_created
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/actors'
+    negate: false
+    context_mapping: {  }

modules/opencase_reporting/config/install/facets.facet.actor_type.yml

@@ -0,0 +1,59 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_actors
+    - views.view.reporting_actors
+  module:
+    - search_api
+id: actor_type
+name: 'Actor type'
+url_alias: actor_type
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: type
+facet_source_id: 'search_api:views_page__reporting_actors__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+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: -9
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: -8
+    settings:
+      sort: DESC
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: -10
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false