Improved new activity date & time field, also...

* Removed dependency of opencase_search on opencase so opencase_search doesn't get uninstalled when refreshing opencase for UI changes
* Changed no-results wording on case views (both displays: all cases & cases for a person)

config/install/views.view.activities.yml

@@ -4,6 +4,7 @@ dependencies:
   config:
     - user.role.authenticated
   module:
+    - datetime
     - opencase_entities
     - user
 id: activities
@@ -13,7 +14,6 @@ description: ''
 tag: ''
 base_table: oc_activity_field_data
 base_field: id
-core: 8.x
 display:
   default:
     display_plugin: default
@@ -50,7 +50,7 @@ display:
       pager:
         type: mini
         options:
-          items_per_page: 10
+          items_per_page: 50
           offset: 0
           id: 0
           total_pages: null
@@ -70,6 +70,72 @@ display:
       row:
         type: fields
       fields:
+        activity_date_time:
+          id: activity_date_time
+          table: oc_activity_field_data
+          field: activity_date_time
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Date and time'
+          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: datetime_custom
+          settings:
+            timezone_override: ''
+            date_format: 'd/m/Y - H:i'
+          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
+          entity_type: oc_activity
+          entity_field: activity_date_time
+          plugin_id: field
         name:
           id: name
           table: oc_activity_field_data
@@ -233,7 +299,7 @@ display:
             more_link_text: ''
             more_link_path: ''
             strip_tags: false
-            trim: true
+            trim: false
             preserve_tags: ''
             html: false
           element_type: ''
@@ -264,73 +330,6 @@ display:
           entity_type: oc_activity
           entity_field: description
           plugin_id: field
-        created:
-          id: created
-          table: oc_activity_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Created
-          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: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          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
-          entity_type: oc_activity
-          entity_field: created
-          plugin_id: field
         view_oc_activity:
           id: view_oc_activity
           table: oc_activity

config/install/views.view.cases.yml

@@ -50,7 +50,7 @@ display:
       pager:
         type: mini
         options:
-          items_per_page: 20
+          items_per_page: 50
           offset: 0
           id: 0
           total_pages: null
@@ -447,7 +447,7 @@ display:
           empty_zero: false
           hide_alter_empty: false
           plugin_id: custom
-      filters:
+      filters: null
       sorts:
         created:
           id: created
@@ -477,7 +477,7 @@ display:
           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"
+          content: "<p>Either there are no cases involving this person, or you do not have access to them.</p> <p>To create a case, use the sidebar menu to the right</p>"
           plugin_id: text_custom
       relationships: {  }
       arguments:
@@ -569,7 +569,7 @@ display:
         filter_groups: false
         empty: false
       path: opencase/all-cases
-      filters:
+      filters: null
       filter_groups:
         operator: AND
         groups:
@@ -584,14 +584,13 @@ display:
           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 People.</b> menu.</p>\n"
+          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 create a case for, using the search bar at the top right of the screen. If they are not on the system yet, add them using the <b>Add People</b> tab.</p>\n"
           plugin_id: text_custom
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
-        - url
         - url.query_args
         - user.roles
       tags: {  }

css/opencase.css

@@ -29,3 +29,20 @@ body {
 #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;
+}
+
+/* In views, display label at top of field. Ths is because full descriptions are displayed in the activity view so having the label in the middle means it disappears down the page. */
+td.views-field {
+    vertical-align: top;
+}

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

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

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

@@ -5,6 +5,7 @@ dependencies:
     - facets.facet.nationalities
   module:
     - facets
+    - system
   theme:
     - bartik
 id: nationalities
@@ -19,4 +20,9 @@ settings:
   provider: facets
   label_display: visible
   block_id: nationalities
-visibility: {  }
+visibility:
+  request_path:
+    id: request_path
+    pages: /opencase/reporting/clients
+    negate: false
+    context_mapping: {  }

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

@@ -23,6 +23,6 @@ settings:
 visibility:
   request_path:
     id: request_path
-    pages: '/opencase/reporting/*'
+    pages: /opencase/reporting/volunteers
     negate: false
     context_mapping: {  }

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

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

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

@@ -0,0 +1,62 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_cases
+    - views.view.reporting_cases
+  module:
+    - search_api
+id: involved_parties
+name: 'Involved Parties'
+url_alias: involved_parties
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: actors_involved
+facet_source_id: 'search_api:views_page__reporting_cases__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'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+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
+  exclude_specified_items:
+    processor_id: exclude_specified_items
+    weights:
+      build: 50
+    settings:
+      exclude: client
+      regex: true
+  translate_entity:
+    processor_id: translate_entity
+    weights:
+      build: 5
+    settings: {  }
+  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.involved_parties_export.yml

@@ -0,0 +1,55 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_cases
+    - views.view.reporting_cases
+  module:
+    - search_api
+id: involved_parties_export
+name: 'Involved Parties (Export)'
+url_alias: involved_parties
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: actors_involved
+facet_source_id: 'search_api:views_data_export__reporting_cases__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'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+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
+  translate_entity:
+    processor_id: translate_entity
+    weights:
+      build: 5
+    settings: {  }
+  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

@@ -3,19 +3,18 @@ status: true
 dependencies:
   config:
     - search_api.index.opencase_reporting_volunteers
-    - views.view.reporting_volunteers
   module:
-    - search_api
+    - views_data_export
 id: osic_level_export
-name: 'OSIC level (Export)'
+name: 'OSIC level Export'
 url_alias: osic_level
 weight: 0
-min_count: 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: checkbox
+  type: links
   config:
     show_numbers: false
     soft_limit: 0
@@ -30,6 +29,18 @@ hard_limit: 0
 exclude: false
 only_visible_when_facet_source_is_visible: true
 processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: 20
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: 30
+    settings:
+      sort: DESC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:

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

@@ -0,0 +1,52 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_cases
+    - views.view.reporting_cases
+  module:
+    - search_api
+id: outcome
+name: Outcome
+url_alias: outcome
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_outcome
+facet_source_id: 'search_api:views_page__reporting_cases__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'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+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: false
+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: text
+  text_format: plain_text
+  text: ''
+show_title: false

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

@@ -0,0 +1,52 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_cases
+    - views.view.reporting_cases
+  module:
+    - search_api
+id: outcome_export
+name: Outcome (Export)
+url_alias: outcome
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_outcome
+facet_source_id: 'search_api:views_data_export__reporting_cases__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'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+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: false
+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: text
+  text_format: plain_text
+  text: ''
+show_title: false

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

@@ -1,25 +1,26 @@
 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
-  config:
-    - field.storage.oc_actor.field_osic_level
-    - search_api.server.opencase_reporting_server
 id: opencase_reporting_volunteers
 name: 'OpenCase Reporting: Volunteers'
 description: ''
 read_only: false
 field_settings:
-  created:
+  field_languages_spoken:
-    label: Created
+    label: 'Languages spoken'
     datasource_id: 'entity:oc_actor'
-    property_path: created
+    property_path: field_languages_spoken
-    type: date
+    type: string
     dependencies:
-      module:
+      config:
-        - opencase_entities
+        - field.storage.oc_actor.field_languages_spoken
   field_osic_level:
     label: 'OSIC level'
     datasource_id: 'entity:oc_actor'
@@ -28,6 +29,14 @@ field_settings:
     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:

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

@@ -0,0 +1,482 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_outcome
+    - search_api.index.opencase_reporting_cases
+  module:
+    - csv_serialization
+    - options
+    - rest
+    - search_api
+    - serialization
+    - user
+    - views_data_export
+id: reporting_cases
+label: 'Reporting: Cases'
+module: views
+description: ''
+tag: ''
+base_table: search_api_index_opencase_reporting_cases
+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: none
+        options: {  }
+      query:
+        type: views_query
+        options:
+          bypass_access: false
+          skip_access: false
+          preserve_facet_query_args: 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: 20
+          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:
+            name: name
+            type: type
+            actors_involved: actors_involved
+            field_outcome: field_outcome
+          info:
+            name:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            actors_involved:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_outcome:
+              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_datasource_opencase_reporting_cases_entity_oc_case
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          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_case
+          plugin_id: search_api_field
+        type:
+          id: type
+          table: search_api_datasource_opencase_reporting_cases_entity_oc_case
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api_entity
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+            display_methods:
+              oc_case_type:
+                display_method: label
+          entity_type: oc_case
+          plugin_id: search_api_field
+        actors_involved:
+          table: search_api_index_opencase_reporting_cases
+          field: actors_involved
+          id: actors_involved
+          entity_type: null
+          entity_field: null
+          plugin_id: search_api_field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings: {  }
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api_entity
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+            display_methods: {  }
+        field_outcome:
+          id: field_outcome
+          table: search_api_index_opencase_reporting_cases
+          field: field_outcome
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          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: 'Reporting: Cases'
+      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_case.field_outcome'
+  data_export_1:
+    display_plugin: data_export
+    id: data_export_1
+    display_title: 'Data export'
+    position: 2
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/cases
+      filename: '[view:title].csv'
+      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_case.field_outcome'
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/cases
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_case.field_outcome'

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

@@ -9,6 +9,7 @@ dependencies:
     - field.storage.oc_actor.field_nationalities
     - search_api.index.opencase_reporting_clients
   module:
+    - csv_serialization
     - options
     - rest
     - search_api
@@ -588,7 +589,6 @@ display:
       relationships: {  }
       arguments: {  }
       display_extenders: {  }
-      use_ajax: true
     cache_metadata:
       max-age: -1
       contexts:
@@ -615,6 +615,33 @@ display:
         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:

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

@@ -53,7 +53,7 @@ display:
       pager:
         type: mini
         options:
-          items_per_page: 10
+          items_per_page: 50
           offset: 0
           id: 0
           total_pages: null
@@ -70,12 +70,33 @@ display:
             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_datasource_opencase_reporting_volunteers_entity_oc_actor
+          table: search_api_index_opencase_reporting_volunteers
           field: name
           relationship: none
           group_type: group
@@ -142,16 +163,15 @@ display:
             use_highlighting: false
             multi_type: separator
             multi_separator: ', '
-          entity_type: oc_actor
           plugin_id: search_api_field
-        created:
+        field_languages_spoken_1:
-          id: created
+          id: field_languages_spoken_1
-          table: search_api_datasource_opencase_reporting_volunteers_entity_oc_actor
+          table: search_api_index_opencase_reporting_volunteers
-          field: created
+          field: field_languages_spoken
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'Created Date'
+          label: 'Languages spoken'
           exclude: false
           alter:
             alter_text: false
@@ -184,7 +204,7 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: false
+          element_label_colon: true
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
@@ -193,11 +213,8 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: timestamp
+          type: list_default
-          settings:
+          settings: {  }
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -209,16 +226,12 @@ display:
           separator: ', '
           field_api_classes: false
           field_rendering: true
-          fallback_handler: search_api_date
+          fallback_handler: search_api
           fallback_options:
-            date_format: fallback
-            custom_date_format: ''
-            timezone: ''
             link_to_item: false
             use_highlighting: false
             multi_type: separator
             multi_separator: ', '
-          entity_type: oc_actor
           plugin_id: search_api_field
         field_osic_level:
           id: field_osic_level
@@ -227,7 +240,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'OSIC Level'
+          label: 'OSIC level'
           exclude: false
           alter:
             alter_text: false
@@ -288,102 +301,16 @@ display:
             use_highlighting: false
             multi_type: separator
             multi_separator: ', '
-          entity_type: null
-          entity_field: null
-          plugin_id: search_api_field
-        field_languages_spoken:
-          id: field_languages_spoken
-          table: search_api_datasource_opencase_reporting_volunteers_entity_oc_actor
-          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: ', '
-          entity_type: oc_actor
           plugin_id: search_api_field
       filters: {  }
       sorts: {  }
       title: 'Volunteer Report'
-      header:
+      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:
@@ -403,6 +330,13 @@ display:
       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:
@@ -445,6 +379,10 @@ display:
     display_options:
       display_extenders: {  }
       path: opencase/reporting/volunteers
+      cache:
+        type: none
+      defaults:
+        cache: false
     cache_metadata:
       max-age: -1
       contexts:

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,42 @@
+<?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',
+    'block.block.osiclevel',
+    'block.block.outcome',
+    'block.block.involvedparties',
+    'views.view.reporting_clients',
+    'views.view.reporting_volunteers',
+    'views.view.reporting_cases',
+    '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',
+    'facets.facet.outcome',
+    'facets.facet.outcome_export',
+    'facets.facet.involved_parties',
+    'facets.facet.involved_parties_export',
+  ];
+  foreach($configs as $config) {
+    Drupal::configFactory()->getEditable($config)->delete();
+  }
+}

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

@@ -9,13 +9,13 @@ dependencies:
     - field.field.oc_actor.client.field_disability
     - field.field.oc_actor.client.field_ethnic_o
     - field.field.oc_actor.client.field_gender_identified_with
-    - field.field.oc_actor.client.field_general_noes
     - field.field.oc_actor.client.field_how_heard
     - field.field.oc_actor.client.field_income
     - field.field.oc_actor.client.field_languages_spoken
     - field.field.oc_actor.client.field_marital_
     - field.field.oc_actor.client.field_nationalities
     - field.field.oc_actor.client.field_referred_by
+    - field.field.oc_actor.client.field_sex
     - opencase_entities.oc_actor_type.client
   module:
     - datetime
@@ -26,7 +26,7 @@ bundle: client
 mode: default
 content:
   field_asylum_status:
-    weight: 6
+    weight: 4
     settings: {  }
     third_party_settings: {  }
     type: options_select
@@ -40,27 +40,19 @@ content:
     type: string_textfield
     region: content
   field_confidentiality_form:
-    weight: 15
+    weight: 13
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
     type: file_generic
     region: content
   field_date_of_birth:
-    weight: 3
+    weight: 0
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_dependants:
-    weight: 12
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-  field_disability:
     weight: 10
     settings:
       size: 60
@@ -68,8 +60,16 @@ content:
     third_party_settings: {  }
     type: string_textfield
     region: content
+  field_disability:
+    weight: 8
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: string_textfield
+    region: content
   field_ethnic_o:
-    weight: 7
+    weight: 5
     settings:
       size: 60
       placeholder: ''
@@ -77,57 +77,55 @@ content:
     type: string_textfield
     region: content
   field_gender_identified_with:
-    weight: 4
+    weight: 1
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
-  field_general_noes:
-    weight: 27
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_how_heard:
-    weight: 13
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_income:
     weight: 11
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
-  field_languages_spoken:
+  field_income:
     weight: 9
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
+  field_languages_spoken:
+    weight: 7
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
   field_marital_:
-    weight: 5
+    weight: 3
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_nationalities:
-    weight: 8
+    type: options_select
+    weight: 6
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_select
-    region: content
   field_referred_by:
-    weight: 14
+    weight: 12
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
     type: string_textfield
     region: content
+  field_sex:
+    weight: 2
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
   name:
     type: string_textfield
     weight: -4
@@ -136,30 +134,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  phone:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  phone2:
-    type: string_textfield
-    weight: 1
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  postal_address:
-    type: string_textarea
-    weight: 2
-    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,7 @@ 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
@@ -18,7 +18,7 @@ content:
     third_party_settings: {  }
     type: options_select
     region: content
-  field_nationality:
+  field_nationalities:
     weight: 0
     settings:
       size: 60

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:
@@ -117,7 +117,7 @@ content:
     third_party_settings: {  }
     type: list_default
     region: content
-  field_nationality:
+  field_nationalities:
     weight: 8
     label: above
     settings:

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

@@ -3,7 +3,7 @@ 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
@@ -22,7 +22,7 @@ content:
     third_party_settings: {  }
     type: list_default
     region: content
-  field_nationality:
+  field_nationalities:
     weight: 3
     label: above
     settings:

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

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

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

@@ -10,15 +10,597 @@ 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: Stateless
+      value: Bruneian
-      label: Stateless
+      label: Bruneian
     -
-      value: 'More need adding!'
+      value: Bulgarian
-      label: 'More need adding!'
+      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

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/opencase_defaults.info.yml

@@ -7,5 +7,4 @@ dependencies:
   - contact
   - field
   - opencase_entities
-  - opencase_reporting
   - options

modules/opencase_defaults/opencase_defaults.links.menu.yml

@@ -1,12 +1,12 @@
 opencase_defaults.report_on_clients:
   title: 'Clients'
   description: 'Report on clients'
-  parent: opencase_defaults.reporting_menu
+  parent: opencase_reporting.reporting_menu
   url: internal:/opencase/reporting/clients
   weight: 0
 opencase_defaults.report_on_volunteers:
   title: 'Volunteers'
   description: 'Report on volunteers'
-  parent: opencase_defaults.reporting_menu
+  parent: opencase_reporting.reporting_menu
   url: internal:/opencase/reporting/volunteers
   weight: 1

modules/opencase_defaults/opencase_defaults.module

@@ -9,24 +9,6 @@ use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\user\Entity\Role;
 use Drupal\user\RoleInterface;
 
-/**
- * When a new actor type is created, this gives the CRM Admin and Overseer roles permission
- * to view, edit and delete them.
- */
-#function opencase_defaults_entity_insert(Drupal\Core\Entity\EntityInterface $entity) {
-#  if (get_class($entity) == 'Drupal\opencase_entities\Entity\OCActorType') {
-#    $type = $entity->id();
-#    $roles = Role::loadMultiple(['opencase_admin', 'overseer']);
-#    foreach ($roles as $role) {
-#      $role->grantPermission("view published $type entities");
-#      $role->grantPermission("edit $type entities");
-#      $role->grantPermission("delete $type entities");
-#      $role->grantPermission("add new $type entities");
-#    }
-#    \Drupal::logger('foo')->notice("<pre>".print_r(user_role_permissions(['overseer']), true) . "</pre>");
-#  }
-#}
-
 /**
  * Implements hook_help().
  */
@@ -53,3 +35,4 @@ function opencase_defaults_theme() {
     ],
   ];
 }
+

modules/opencase_entities/opencase_entities.install

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Add 'activity_date_time' field to 'oc_activity' entities.
+ */
+function opencase_entities_update_8003() {
+  $storage_definition =  \Drupal\Core\Field\BaseFieldDefinition::create('datetime')
+      ->setLabel(t('Date and time'))
+      ->setDescription(t('When the activity started.'))
+      ->setRevisionable(TRUE)
+      ->setDefaultValueCallback('Drupal\opencase_entities\Entity\OCActivity::currentDateTime')
+      ->setDisplayOptions('view', [
+        'type' => 'datetime_default',
+        'settings' => [
+          'format_type' => 'medium',
+        ],
+        'label' => 'above',
+        'weight' => -3,
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'datetime_default',
+        'weight' => -3,
+      ]);
+
+  \Drupal::entityDefinitionUpdateManager()
+    ->installFieldStorageDefinition('activity_date_time', 'oc_activity', 'oc_activity', $storage_definition);
+}
+

modules/opencase_entities/opencase_entities.permissions.yml

@@ -1,6 +1,9 @@
 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'
@@ -11,58 +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>.'
-#
-#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'
 

modules/opencase_entities/src/Entity/OCActivity.php

@@ -9,6 +9,8 @@ use Drupal\Core\Entity\RevisionableInterface;
 use Drupal\Core\Entity\EntityChangedTrait;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\user\UserInterface;
+use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
+use Drupal\Core\Datetime\DrupalDateTime;
 
 /**
  * Defines the Activity entity.
@@ -81,6 +83,12 @@ class OCActivity extends RevisionableContentEntityBase implements OCActivityInte
     return array(\Drupal::request()->query->get('case_id'));
   }
 
+  public static function currentDateTime() {
+    $current_time = DrupalDateTime::createFromTimestamp(time());
+    $formatted = $current_time->format(DateTimeItem::DATETIME_STORAGE_FORMAT);
+    \Drupal::logger("nr_debug")->notice($formatted);
+    return $formatted;
+  }
   /**
    * {@inheritdoc}
    */
@@ -210,6 +218,25 @@ class OCActivity extends RevisionableContentEntityBase implements OCActivityInte
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = parent::baseFieldDefinitions($entity_type);
 
+    $fields['activity_date_time'] = BaseFieldDefinition::create('datetime')
+      ->setLabel(t('Date and time'))
+      ->setDescription('')
+      ->setRevisionable(TRUE)
+      ->setRequired(TRUE)
+      ->setDefaultValueCallback('Drupal\opencase_entities\Entity\OCActivity::currentDateTime')
+      ->setDisplayOptions('view', [
+        'label' => 'above',
+        'type' => 'datetime_default',
+        'settings' => [
+          'format_type' => 'medium',
+        ],
+        'weight' => -3,
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'datetime_default',
+        'weight' => -3,
+      ]);
+
     // not currently in use. Will set view and form settings when ready
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Publishing status'))

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/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/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_reporting/config/install/views.view.reporting_actors.yml

@@ -52,7 +52,7 @@ display:
       pager:
         type: mini
         options:
-          items_per_page: 10
+          items_per_page: 50
           offset: 0
           id: 0
           total_pages: null

modules/opencase_reporting/opencase_reporting.links.menu.yml

@@ -1,6 +1,6 @@
-opencase_defaults.reporting_menu:
+opencase_reporting.reporting_menu:
   title: 'Reporting'
   description: 'Report on clients'
   menu_name: opencase
-  url: internal:#
+  route_name: opencase_reporting.reporting_menu
   weight: 10

modules/opencase_reporting/opencase_reporting.routing.yml

@@ -0,0 +1,4 @@
+opencase_reporting.reporting_menu:
+  path: '/'
+  requirements:
+    _permission: 'use opencase'

modules/opencase_search/config/install/views.view.actor_search.yml

@@ -50,7 +50,7 @@ display:
       pager:
         type: mini
         options:
-          items_per_page: 20
+          items_per_page: 50
           offset: 0
           id: 0
           total_pages: null

modules/opencase_search/opencase_search.info.yml

@@ -6,4 +6,3 @@ package: 'OpenCase'
 dependencies:
   - search_api
   - search_api_db
-  - opencase

opencase.info.yml

@@ -2,6 +2,7 @@ name: 'OpenCase'
 type: module
 description: 'Simple Case Management'
 core: 8.x
+version: 8.x-1.6
 package: 'OpenCase'
 dependencies:
   - opencase_entities

opencase.links.menu.yml

@@ -2,7 +2,7 @@ opencase.cases:
   title: 'Cases'
   description: 'View cases'
   menu_name: opencase 
-  url: internal:#
+  route_name: opencase.opencase_cases_menu
   weight: 0
 opencase.opencase_all_cases:
   title: 'All Cases'
@@ -16,7 +16,7 @@ opencase.opencase_add_people_menu:
   title: 'Add people'
   description: 'Add new people'
   menu_name: opencase 
-  url: internal:#
+  route_name: opencase.opencase_people_menu
   weight: 1
 opencase.add_people_links:
   class: Drupal\opencase\Plugin\Menu\AddActorsMenuLink
@@ -73,8 +73,8 @@ opencase.view_documentation:
   url: https://hoegrammer.gitbooks.io/opencase/content/
   weight: 0
 opencase.contact_developers:
-  title: 'Contact OpenCase'
+  title: 'Ask the developers'
-  description: 'Contact the OpenCase developers'
+  description: 'Ask us (erm, me actually) anything!'
   menu_name: opencase
   parent: opencase.opencase_support_menu 
   url: internal:/contact

opencase.module

@@ -138,6 +138,8 @@ function opencase_form_oc_case_type_edit_form_alter(&$form, $form_state) {
 function opencase_uninstall() {
   $configs = [
     'block.block.opencasecontextualmenu',
+    'block.block.opencase',
+    'system.menu.opencase',
     'views.view.cases',
     'views.view.activities'
   ];

opencase.routing.yml

@@ -2,3 +2,11 @@ opencase.opencase_admin_menu:
   path: '/'
   requirements:
     _permission: 'administer opencase entity bundles'
+opencase.opencase_cases_menu:
+  path: '/'
+  requirements:
+    _permission: 'use opencase'
+opencase.opencase_people_menu:
+  path: '/'
+  requirements:
+    _permission: 'use opencase'