v1.6.4 - more git issues

README.md

@@ -1,5 +1,5 @@
 # OpenCase
-A simple case-management system
+A simple case-management system for small altruistic organisations.
 
 ## The Plan
 OpenCase will be available as:
@@ -28,7 +28,7 @@ If you want to install OpenCase for yourself, please get in touch via Issues. It
 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/opencase/content/)
+* 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. 
 
 

ciac_opencase_customisations.libraries.yml

@@ -1,5 +0,0 @@
-ciac_grouped_views:
-  version: 1.x
-  css:
-    layout:
-      css/grouped_views.css: {}

config/install/views.view.activities.yml

@@ -384,21 +384,7 @@ display:
           entity_type: oc_activity
           plugin_id: entity_link
       filters: {  }
-      sorts:
+      sorts: {  }
-        activity_date_time:
-          id: activity_date_time
-          table: oc_activity_field_data
-          field: activity_date_time
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: DESC
-          exposed: false
-          expose:
-            label: ''
-          entity_type: oc_activity
-          entity_field: activity_date_time
-          plugin_id: standard
       title: 'Activity List'
       header: {  }
       footer: {  }

config/install/views.view.cases.yml

@@ -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:
@@ -584,7 +584,7 @@ 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 actors</b> menu in the left sidebar.</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

config/install/views.view.contact_details_changes.yml

@@ -1,852 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - user
-id: contact_details_changes
-label: 'Contact Details History'
-module: views
-description: ''
-tag: ''
-base_table: oc_actor_field_revision
-base_field: vid
-display:
-  default:
-    display_plugin: default
-    id: default
-    display_title: Master
-    position: 0
-    display_options:
-      access:
-        type: perm
-        options:
-          perm: 'view published client entities'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      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: none
-        options:
-          offset: 0
-      style:
-        type: table
-        options:
-          grouping:
-            1:
-              field: view_oc_actor
-              rendered: true
-              rendered_strip: false
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            first_name: first_name
-            middle_names: middle_names
-            last_name: last_name
-            id: id
-            revision_created: revision_created
-            view_oc_actor: view_oc_actor
-          info:
-            first_name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            middle_names:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            last_name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            id:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            revision_created:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            view_oc_actor:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: false
-      row:
-        type: fields
-        options:
-          inline: {  }
-          separator: ''
-          hide_empty: false
-          default_field_elements: true
-      fields:
-        revision_created:
-          id: revision_created
-          table: oc_actor_revision
-          field: revision_created
-          relationship: none
-          group_type: min
-          admin_label: ''
-          label: Date
-          exclude: false
-          alter:
-            alter_text: true
-            text: '{{ revision_created | date(''d/m/Y'') }}'
-            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
-          set_precision: false
-          precision: 0
-          decimal: .
-          separator: ''
-          format_plural: 0
-          format_plural_string: !!binary MQNAY291bnQ=
-          prefix: ''
-          suffix: ''
-          click_sort_column: value
-          type: timestamp
-          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
-          field_api_classes: false
-          entity_type: oc_actor
-          entity_field: revision_created
-          plugin_id: field
-        first_name:
-          id: first_name
-          table: oc_actor_field_revision
-          field: first_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'First Name'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          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_actor
-          entity_field: first_name
-          plugin_id: field
-        middle_names:
-          id: middle_names
-          table: oc_actor_field_revision
-          field: middle_names
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Middle Names'
-          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
-          entity_type: oc_actor
-          entity_field: middle_names
-          plugin_id: field
-        last_name:
-          id: last_name
-          table: oc_actor_field_revision
-          field: last_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Last Name'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          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_actor
-          entity_field: last_name
-          plugin_id: field
-        email:
-          id: email
-          table: oc_actor_field_revision
-          field: email
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Email Address'
-          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
-          entity_type: oc_actor
-          entity_field: email
-          plugin_id: field
-        phone:
-          id: phone
-          table: oc_actor_field_revision
-          field: phone
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Main Phone Number'
-          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
-          entity_type: oc_actor
-          entity_field: phone
-          plugin_id: field
-        phone2:
-          id: phone2
-          table: oc_actor_field_revision
-          field: phone2
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Alternative Phone Number'
-          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
-          entity_type: oc_actor
-          entity_field: phone2
-          plugin_id: field
-        postal_address:
-          id: postal_address
-          table: oc_actor_field_revision
-          field: postal_address
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Postal Address'
-          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: basic_string
-          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
-          entity_type: oc_actor
-          entity_field: postal_address
-          plugin_id: field
-        post_code:
-          id: post_code
-          table: oc_actor_field_revision
-          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
-          entity_type: oc_actor
-          entity_field: post_code
-          plugin_id: field
-        view_oc_actor:
-          id: view_oc_actor
-          table: oc_actor_field_revision
-          field: view_oc_actor
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: true
-          alter:
-            alter_text: true
-            text: "◀\tBack to current record"
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'See "rewrite results" (had to do it that way because contains HTML).'
-          output_url_as_text: false
-          absolute: false
-          entity_type: oc_actor
-          plugin_id: entity_link
-      filters: {  }
-      sorts:
-        revision_created:
-          id: revision_created
-          table: oc_actor_revision
-          field: revision_created
-          relationship: none
-          group_type: min
-          admin_label: ''
-          order: DESC
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-          entity_type: oc_actor
-          entity_field: revision_created
-          plugin_id: date
-      header: {  }
-      footer: {  }
-      empty: {  }
-      relationships: {  }
-      arguments:
-        id:
-          id: id
-          table: oc_actor_field_revision
-          field: id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          default_action: 'not found'
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            items_per_page: 25
-            override: false
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-          entity_type: oc_actor
-          entity_field: id
-          plugin_id: numeric
-      display_extenders: {  }
-      group_by: true
-      title: 'Contact Details History'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  page_1:
-    display_plugin: page
-    id: page_1
-    display_title: Page
-    position: 1
-    display_options:
-      path: opencase/oc_actor/%/contact_details_history
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }

css/opencase.css

@@ -46,42 +46,3 @@ body {
 td.views-field {
     vertical-align: top;
 }
-
-/* Entity displays */
-.oc_entity .left {
-  display: inline-block;
-  width: 45%;
-  padding: 1em;
-}
-
-.oc_entity .right {
-  display: inline-block;
-  width: 45%;
-  padding: 1em;
-  float: right;
-}
-.oc_entity .field {
-  margin-top: 1em;
-}
-
-/* Make entity reference field labels match normal field labels */
-.field--type-entity-reference .field__label {
-  font-family: Georgia, "Times New Roman", Times, serif;
-  font-size: 1em !important;
-  font-weight: bold !important;
-}
-
-/* Styling for grouped views */
-table.views-table.views-view-table caption {
-  text-align: left;
-  margin-bottom: 1em;
-  margin-top: 2em;
-  font-weight: bold;
-}
-
-/* remove "details" accordion, see https://drupal.stackexchange.com/questions/294312/why-has-this-details-accordion-appeared-in-this-view */
-.views-table details {
-
-    display: none;
-
-}

docs/composer.json

@@ -1,84 +0,0 @@
-{
-    "name": "drupal/recommended-project",
-    "description": "Project template for Drupal 8 projects with a relocated document root",
-    "type": "project",
-    "license": "GPL-2.0-or-later",
-    "homepage": "https://www.drupal.org/project/drupal",
-    "support": {
-        "docs": "https://www.drupal.org/docs/user_guide/en/index.html",
-        "chat": "https://www.drupal.org/node/314178"
-    },
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://packages.drupal.org/8"
-        },{
-
-            "type": "vcs",
-            "url": "https://git.autonomic.zone/autonomic-cooperative/opencase.git"
-        }
-    ],
-    "require": {
-        "composer/installers": "^1.2",
-        "drupal/admin_toolbar": "^2.0",
-        "drupal/console": "*",
-        "drupal/core-composer-scaffold": "^8.8",
-        "drupal/core-project-message": "^8.8",
-        "drupal/core-recommended": "^8.8",
-        "drupal/datetimehideseconds": "1.x-dev",
-        "drupal/devel": "^2.1",
-        "drupal/facets": "^1.4",
-        "drupal/opencase": "^1.7",
-        "drupal/search_api": "^1.15",
-        "drupal/search_api_db": "^1.15",
-        "drupal/security_review": "1.x-dev",
-        "drupal/smtp": "^1.0@beta",
-        "drupal/superfish": "^1.3",
-        "drupal/views_aggregator": "^1.0@beta",
-        "drupal/views_data_export": "^1.0@beta",
-        "drush/drush": "^10.2"
-    },
-    "require-dev": {
-    },
-    "conflict": {
-        "drupal/drupal": "*"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-        "composer-exit-on-patch-failure": true,
-        "patchLevel": {
-            "drupal/core": "-p2"
-        },
-        "installer-paths": {
-            "web/core": ["type:drupal-core"],
-            "web/libraries/{$name}": ["type:drupal-library"],
-            "web/modules/contrib/{$name}": ["type:drupal-module"],
-            "web/profiles/contrib/{$name}": ["type:drupal-profile"],
-            "web/themes/contrib/{$name}": ["type:drupal-theme"],
-            "drush/Commands/{$name}": ["type:drupal-drush"]
-        },
-        "drupal-core-project-message": {
-            "include-keys": ["homepage", "support"],
-            "post-create-project-cmd-message": [
-                "<bg=blue;fg=white>                                                         </>",
-                "<bg=blue;fg=white>  Congratulations, you’ve installed the Drupal codebase  </>",
-                "<bg=blue;fg=white>  from the drupal/recommended-project template!          </>",
-                "<bg=blue;fg=white>                                                         </>",
-                "",
-                "<bg=yellow;fg=black>Next steps</>:",
-
-                "  * Install the site: https://www.drupal.org/docs/8/install",
-                "  * Read the user guide: https://www.drupal.org/docs/user_guide/en/index.html",
-                "  * Get support: https://www.drupal.org/support",
-                "  * Get involved with the Drupal community:",
-                "      https://www.drupal.org/getting-involved",
-                "  * Remove the plugin that prints this message:",
-                "      composer remove drupal/core-project-message"
-            ]
-        }
-    }
-}

docs/install.txt

@@ -1,64 +0,0 @@
-SYSTEM
-===========
-apt install php-gd php-mbstring php-xml php-curl composer
-a2enmod rewrite
-
-SITE
-====
-#TODO make the vhost
-#TODO in apache2.conf set Override All on the directory
-
-DRUPAL
-======
-composer create-project drupal/recommended-project drupal
-
-mysql -uroot -p
-	drop database ...;
-	create database ...;
-
-cd drupal
-mkdir -p config/sync
-mkdir private
-
-# if web server user =/= deployment user:
-
-    sudo chgrp www-data config/sync
-    cd web
-    sudo chgrp www-data . -R
-    sudo chmod g+w sites/default/files -R
-    sudo find -type d -exec chmod g+s {} \;
-
-
-# TODO run the installer
-
-drush pm-uninstall search
-drush en superfish  admin_toolbar smtp superfish security_review opencase -y
-
-# if web server user =/= deployment user:
-
-    sudo chmod g-w sites/default/
-    sudo chmod a-w sites/default/settings.php
-    sudo chmod g-w sites
-    sudo chmod g-w sites ./sites/example.settings.local.php ./sites/development.services.yml ./sites/example.sites.php ./sites/default/default.services.yml ./sites/default/default.settings.php ./autoload.php 
-    sudo chmod g-w -R modules/
-    sudo chmod g-w -R core
-    sudo chmod g-w profiles index.php update.php 
-    sudo chmod g-w themes -R
-    sudo chmod g-w web.config robots.txt 
-    cd ../
-    sudo chmod g-w -R web/modules
-    sudo chgrp www-data private
-    sudo chmod g+w,o-r,o-x private
-
-
-# TODO set $trusted_host_patterns (in settings.php)
-# TODO private files (/home/foo/drupal/private) (in settings.php)
-# TODO Set all the HTML roles to admin only - /admin/config/content/formats
-# TODO run security review (make eveything untrusted except CRM Admin and Admin) - /admin/config/security-review
-# TODO homepage -> /opencase/all-cases, 403 - /user/login - /admin/config/system/site-information
-# TODO disable blocks: tools, main navigation, footer menu - /admin/structure/block
-# TODO logo & colours - admin/appearance/settings/bartik
-# TODO disallow registering an account & turn off personal contact forms - /admin/config/people/accounts 
-# TODO add linked actor field to form display and display display - top of both
-# TODO change which contact form is the default - /admin/structure/contact
-# TODO change "short" date formate to d/m/Y - /admin/config/regional/date-time

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

@@ -1,728 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.field_asylum_status
-    - field.storage.oc_actor.field_marital_
-  module:
-    - opencase_entities
-    - options
-    - user
-id: name_and_status_changes
-label: 'Name and Status Changes'
-module: views
-description: ''
-tag: ''
-base_table: oc_actor_field_revision
-base_field: vid
-display:
-  default:
-    display_plugin: default
-    id: default
-    display_title: Master
-    position: 0
-    display_options:
-      access:
-        type: perm
-        options:
-          perm: 'view published case entities'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Go
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: false
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: none
-        options:
-          offset: 0
-      style:
-        type: table
-        options:
-          grouping:
-            -
-              field: view_oc_actor
-              rendered: true
-              rendered_strip: false
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            first_name: first_name
-            middle_names: middle_names
-            last_name: last_name
-            field_asylum_status-revision_id: field_asylum_status-revision_id
-            field_marital_-revision_id: field_marital_-revision_id
-            view_oc_actor: view_oc_actor
-            revision_created: revision_created
-          info:
-            first_name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            middle_names:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            last_name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_asylum_status-revision_id:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_marital_-revision_id:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            view_oc_actor:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            revision_created:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: false
-      row:
-        type: fields
-        options:
-          inline: {  }
-          separator: ''
-          hide_empty: false
-          default_field_elements: true
-      fields:
-        revision_created:
-          id: revision_created
-          table: oc_actor_revision
-          field: revision_created
-          relationship: none
-          group_type: min
-          admin_label: ''
-          label: 'Date changed'
-          exclude: false
-          alter:
-            alter_text: true
-            text: '{{ revision_created | date(''d/m/Y'') }}'
-            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
-          set_precision: false
-          precision: 0
-          decimal: .
-          separator: ''
-          format_plural: 0
-          format_plural_string: !!binary MQNAY291bnQ=
-          prefix: ''
-          suffix: ''
-          click_sort_column: value
-          type: timestamp
-          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
-          field_api_classes: false
-          entity_type: oc_actor
-          entity_field: revision_created
-          plugin_id: field
-        first_name:
-          id: first_name
-          table: oc_actor_field_revision
-          field: first_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'First Name'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          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_actor
-          entity_field: first_name
-          plugin_id: field
-        middle_names:
-          id: middle_names
-          table: oc_actor_field_revision
-          field: middle_names
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Middle Names'
-          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
-          entity_type: oc_actor
-          entity_field: middle_names
-          plugin_id: field
-        last_name:
-          id: last_name
-          table: oc_actor_field_revision
-          field: last_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Last Name'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          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_actor
-          entity_field: last_name
-          plugin_id: field
-        field_asylum_status-revision_id:
-          id: field_asylum_status-revision_id
-          table: oc_actor_revision__field_asylum_status
-          field: field_asylum_status-revision_id
-          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
-          plugin_id: field
-        field_marital_-revision_id:
-          id: field_marital_-revision_id
-          table: oc_actor_revision__field_marital_
-          field: field_marital_-revision_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Marital 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
-          plugin_id: field
-        view_oc_actor:
-          id: view_oc_actor
-          table: oc_actor_field_revision
-          field: view_oc_actor
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: true
-          alter:
-            alter_text: true
-            text: 'View current record for this person ▼'
-            make_link: true
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'See "rewrite results" (had to do it that way because contains HTML).'
-          output_url_as_text: false
-          absolute: false
-          entity_type: oc_actor
-          plugin_id: entity_link
-      filters:
-        first_name:
-          id: first_name
-          table: oc_actor_field_revision
-          field: first_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: starts
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: first_name_op
-            label: 'First Name'
-            description: ''
-            use_operator: false
-            operator: first_name_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: first_name
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              overseer: '0'
-              caseworker: '0'
-              volunteer_co_ord: '0'
-              opencase_admin: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          entity_type: oc_actor
-          entity_field: first_name
-          plugin_id: string
-        last_name:
-          id: last_name
-          table: oc_actor_field_revision
-          field: last_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: starts
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: last_name_op
-            label: 'Last Name'
-            description: ''
-            use_operator: false
-            operator: last_name_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: last_name
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              overseer: '0'
-              caseworker: '0'
-              volunteer_co_ord: '0'
-              opencase_admin: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          entity_type: oc_actor
-          entity_field: last_name
-          plugin_id: string
-      sorts:
-        revision_created:
-          id: revision_created
-          table: oc_actor_revision
-          field: revision_created
-          relationship: none
-          group_type: min
-          admin_label: ''
-          order: ASC
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-          entity_type: oc_actor
-          entity_field: revision_created
-          plugin_id: date
-      header: {  }
-      footer: {  }
-      empty: {  }
-      relationships: {  }
-      arguments: {  }
-      display_extenders: {  }
-      group_by: true
-      use_ajax: true
-      title: 'Name, Asylum and Marital Status Report'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags:
-        - 'config:field.storage.oc_actor.field_asylum_status'
-        - 'config:field.storage.oc_actor.field_marital_'
-  page_1:
-    display_plugin: page
-    id: page_1
-    display_title: Page
-    position: 1
-    display_options:
-      path: opencase/reporting/name_and_status_changes
-      display_extenders:
-        library_in_views_display_extender: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags:
-        - 'config:field.storage.oc_actor.field_asylum_status'
-        - 'config:field.storage.oc_actor.field_marital_'

modules/opencase_default_reporting/opencase_default_reporting.links.menu.yml

@@ -1,7 +0,0 @@
-opencase_default_reporting.report_on_status_changes:
-  title: 'Status Changes'
-  description: "Report on changes to people's name, asylum or marital status"
-  parent: opencase_reporting.reporting_menu
-  url: internal:/opencase/reporting/name_and_status_changes
-  weight: 2
-

modules/opencase_default_reporting/opencase_default_reporting.module

@@ -17,7 +17,6 @@ function opencase_default_reporting_uninstall() {
     'views.view.reporting_clients',
     'views.view.reporting_volunteers',
     'views.view.reporting_cases',
-    'views.view.name_and_status_changes',
     'facets.facet.asylum_status_export',
     'facets.facet.disability',
     'facets.facet.nationalities_export',

modules/opencase_defaults/config/install/views.view.name_and_status_changes.yml

@@ -1,633 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.field_asylum_status
-    - field.storage.oc_actor.field_marital_
-  module:
-    - opencase_entities
-    - options
-    - user
-id: name_and_status_changes
-label: 'Name and Status Changes'
-module: views
-description: ''
-tag: ''
-base_table: oc_actor_field_revision
-base_field: vid
-display:
-  default:
-    display_plugin: default
-    id: default
-    display_title: Master
-    position: 0
-    display_options:
-      access:
-        type: perm
-        options:
-          perm: 'view published case entities'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      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: none
-        options:
-          offset: 0
-      style:
-        type: table
-        options:
-          grouping:
-            -
-              field: view_oc_actor
-              rendered: true
-              rendered_strip: false
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            first_name: first_name
-            middle_names: middle_names
-            last_name: last_name
-            field_asylum_status-revision_id: field_asylum_status-revision_id
-            field_marital_-revision_id: field_marital_-revision_id
-            view_oc_actor: view_oc_actor
-            revision_created: revision_created
-          info:
-            first_name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            middle_names:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            last_name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_asylum_status-revision_id:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_marital_-revision_id:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            view_oc_actor:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            revision_created:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: false
-      row:
-        type: fields
-        options:
-          inline: {  }
-          separator: ''
-          hide_empty: false
-          default_field_elements: true
-      fields:
-        revision_created:
-          id: revision_created
-          table: oc_actor_revision
-          field: revision_created
-          relationship: none
-          group_type: min
-          admin_label: ''
-          label: 'Date changed'
-          exclude: false
-          alter:
-            alter_text: true
-            text: '{{ revision_created | date(''d/m/Y'') }}'
-            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
-          set_precision: false
-          precision: 0
-          decimal: .
-          separator: ''
-          format_plural: 0
-          format_plural_string: !!binary MQNAY291bnQ=
-          prefix: ''
-          suffix: ''
-          click_sort_column: value
-          type: timestamp
-          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
-          field_api_classes: false
-          entity_type: oc_actor
-          entity_field: revision_created
-          plugin_id: field
-        first_name:
-          id: first_name
-          table: oc_actor_field_revision
-          field: first_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'First Name'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          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_actor
-          entity_field: first_name
-          plugin_id: field
-        middle_names:
-          id: middle_names
-          table: oc_actor_field_revision
-          field: middle_names
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Middle Names'
-          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
-          entity_type: oc_actor
-          entity_field: middle_names
-          plugin_id: field
-        last_name:
-          id: last_name
-          table: oc_actor_field_revision
-          field: last_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Last Name'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          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_actor
-          entity_field: last_name
-          plugin_id: field
-        field_asylum_status-revision_id:
-          id: field_asylum_status-revision_id
-          table: oc_actor_revision__field_asylum_status
-          field: field_asylum_status-revision_id
-          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
-          plugin_id: field
-        field_marital_-revision_id:
-          id: field_marital_-revision_id
-          table: oc_actor_revision__field_marital_
-          field: field_marital_-revision_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Marital 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
-          plugin_id: field
-        view_oc_actor:
-          id: view_oc_actor
-          table: oc_actor_field_revision
-          field: view_oc_actor
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: true
-          alter:
-            alter_text: true
-            text: 'View the current record for this person ▼'
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: ''
-          output_url_as_text: false
-          absolute: false
-          entity_type: oc_actor
-          plugin_id: entity_link
-      filters: {  }
-      sorts:
-        revision_created:
-          id: revision_created
-          table: oc_actor_revision
-          field: revision_created
-          relationship: none
-          group_type: min
-          admin_label: ''
-          order: DESC
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-          entity_type: oc_actor
-          entity_field: revision_created
-          plugin_id: date
-      header: {  }
-      footer: {  }
-      empty: {  }
-      relationships: {  }
-      arguments: {  }
-      display_extenders: {  }
-      group_by: true
-      title: 'Name, Asylum and Marital Status Report'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.permissions
-      tags:
-        - 'config:field.storage.oc_actor.field_asylum_status'
-        - 'config:field.storage.oc_actor.field_marital_'
-  page_1:
-    display_plugin: page
-    id: page_1
-    display_title: Page
-    position: 1
-    display_options:
-      display_extenders:
-        library_in_views_display_extender:
-          attach_library:
-            attach_library: opencase/opencase-grouped-views
-      path: opencase/reporting/name_and_status_changes
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.permissions
-      tags:
-        - 'config:field.storage.oc_actor.field_asylum_status'
-        - 'config:field.storage.oc_actor.field_marital_'

modules/opencase_defaults/opencase_defaults.links.menu.yml

@@ -10,15 +10,3 @@ opencase_defaults.report_on_volunteers:
   parent: opencase_reporting.reporting_menu
   url: internal:/opencase/reporting/volunteers
   weight: 1
-opencase.opencase_add_people_menu:
-  title: 'Add people'
-  description: 'Add new people'
-  menu_name: opencase 
-  route_name: opencase.opencase_people_menu
-  weight: 1
-opencase.add_people_links:
-  class: Drupal\opencase\Plugin\Menu\AddActorsMenuLink
-  deriver: Drupal\opencase\Plugin\Derivative\AddActorsMenuLink
-  menu_name: opencase
-  parent: opencase.opencase_add_people_menu
-

modules/opencase_entities/oc_activity.page.inc

@@ -22,23 +22,9 @@ use Drupal\Core\Render\Element;
 function template_preprocess_oc_activity(array &$variables) {
   // Fetch OCActivity Entity Object.
   $oc_activity = $variables['elements']['#oc_activity'];
-  $variables['id'] = $oc_activity->get('id')[0]->get('value')->getValue();
 
   // Helpful $content variable for templates.
   foreach (Element::children($variables['elements']) as $key) {
     $variables['content'][$key] = $variables['elements'][$key];
   }
-  // Separate the fields into two sections to be displayed in two columns.
-  // Remove the name (title) field as this is displayed anyway.
-  $variables['base_fields'] = array();
-  $variables['other_fields'] = array();
-  foreach (Element::children($variables['elements']) as $key) {
-    $variables['content'][$key] = $variables['elements'][$key];
-    if (in_array($key, ['activity_date_time', 'time_taken', 'description', 'user_id'])) {
-      $variables['base_fields'][$key] = $variables['elements'][$key];
-    } else {
-      $variables['other_fields'][$key] = $variables['elements'][$key];
-      unset($variables['other_fields']['name']);
-    }
-  }
 }

modules/opencase_entities/oc_actor.page.inc

@@ -20,17 +20,11 @@ use Drupal\Core\Render\Element;
  *   - attributes: HTML attributes for the containing element.
  */
 function template_preprocess_oc_actor(array &$variables) {
-  // Make the id available to the template and also separate the fields
+  // Fetch OCActor Entity Object.
-  // into two sections to be displayed in two columns.
+  $oc_actor = $variables['elements']['#oc_actor'];
-  $variables['id'] = $variables['elements']['#oc_actor']->get('id')[0]->get('value')->getValue();
+
-  $variables['contact_details'] = array();
+  // Helpful $content variable for templates.
-  $variables['fields_other_than_contact_details'] = array();
   foreach (Element::children($variables['elements']) as $key) {
     $variables['content'][$key] = $variables['elements'][$key];
-    if (in_array($key, ['email', 'phone', 'phone2', 'postal_address', 'post_code'])) {
-      $variables['contact_details'][$key] = $variables['elements'][$key];
-    } else {
-      $variables['fields_other_than_contact_details'][$key] = $variables['elements'][$key];
-    }
   }
 }

modules/opencase_entities/oc_case.page.inc

@@ -20,18 +20,11 @@ use Drupal\Core\Render\Element;
  *   - attributes: HTML attributes for the containing element.
  */
 function template_preprocess_oc_case(array &$variables) {
-  // Separate the fields into two sections to be displayed in two columns.
+  // Fetch OCCase Entity Object.
-  // Remove the name (title) field as this is displayed anyway.
+  $oc_case = $variables['elements']['#oc_case'];
-  $variables['id'] = $variables['elements']['#oc_case']->get('id')[0]->get('value')->getValue();
+
-  $variables['base_fields'] = array();
+  // Helpful $content variable for templates.
-  $variables['other_fields'] = array();
   foreach (Element::children($variables['elements']) as $key) {
     $variables['content'][$key] = $variables['elements'][$key];
-    if (in_array($key, ['created', 'changed', 'files', 'actors_involved', 'status', 'user_id'])) {
-      $variables['base_fields'][$key] = $variables['elements'][$key];
-    } else {
-      $variables['other_fields'][$key] = $variables['elements'][$key];
-      unset($variables['other_fields']['name']);
-    }
   }
 }

modules/opencase_entities/opencase_entities.install

@@ -1,28 +1,5 @@
 <?php
 
-
-use \Drupal\Core\Entity\Sql\SqlContentEntityStorageSchemaConverter;
-
-function opencase_entities_update_80192(&$sandbox) {
-  $schema_converter = new SqlContentEntityStorageSchemaConverter(
-    'oc_actor',
-    \Drupal::entityTypeManager(),
-    \Drupal::entityDefinitionUpdateManager(),
-    \Drupal::service('entity.last_installed_schema.repository'),
-    \Drupal::keyValue('entity.storage_schema.sql'),
-    \Drupal::database()
-  );
-
-  $contact_details_fields = ['email', 'phone', 'phone2', 'postal_address', 'post_code'];
-  $schema_converter->convertToRevisionable($sandbox, $contact_details_fields);
-}
-
-function opencase_entities_update_8016() {
-  $update_manager = \Drupal::entityDefinitionUpdateManager();
-  $definition = $update_manager->getFieldStorageDefinition('activity_date_time', 'oc_activity');
-  $update_manager->updateFieldStorageDefinition($definition);
-}
-
 /**
  * Add 'activity_date_time' field to 'oc_activity' entities.
  */
@@ -47,3 +24,4 @@ function opencase_entities_update_8003() {
   \Drupal::entityDefinitionUpdateManager()
     ->installFieldStorageDefinition('activity_date_time', 'oc_activity', 'oc_activity', $storage_definition);
 }
+

modules/opencase_entities/src/Entity/OCActivity.php

@@ -86,6 +86,7 @@ class OCActivity extends RevisionableContentEntityBase implements OCActivityInte
   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;
   }
   /**

modules/opencase_entities/src/Entity/OCActor.php

@@ -247,6 +247,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
         'text_processing' => 0,
       ])
       ->setDefaultValue('')
+      ->setDisplayOptions('view', [
+        'label' => 'above',
+        'type' => 'string',
+        'weight' => -9,
+      ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -9,
@@ -262,6 +267,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
         'text_processing' => 0,
       ])
       ->setDefaultValue('')
+      ->setDisplayOptions('view', [
+        'label' => 'above',
+        'type' => 'string',
+        'weight' => -8,
+      ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -8,
@@ -277,6 +287,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
         'text_processing' => 0,
       ])
       ->setDefaultValue('')
+      ->setDisplayOptions('view', [
+        'label' => 'above',
+        'type' => 'string',
+        'weight' => -7,
+      ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -7,
@@ -298,7 +313,6 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
     // so it is not exposed to user configuration. 
     $fields['email'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Email Address'))
-      ->setRevisionable(TRUE)
       ->setSettings(array(
         'default_value' => '',
         'max_length' => 30,
@@ -315,7 +329,6 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ));
     $fields['phone'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Main Phone Number'))
-      ->setRevisionable(TRUE)
       ->setSettings(array(
         'default_value' => '',
         'max_length' => 20,
@@ -331,7 +344,6 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
         'weight' => -4,
       ));
     $fields['phone2'] = BaseFieldDefinition::create('string')
-      ->setRevisionable(TRUE)
       ->setLabel(t('Alternative Phone Number'))
       ->setSettings(array(
         'default_value' => '',
@@ -348,7 +360,6 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
         'weight' => -3,
       ));
     $fields['postal_address'] = BaseFieldDefinition::create('string_long')
-      ->setRevisionable(TRUE)
       ->setLabel(t('Postal Address'))
       ->setDescription(t('Full address, apart from post code.'))
       ->setSettings(array(
@@ -366,7 +377,6 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
         'weight' => -2,
       ));
     $fields['post_code'] = BaseFieldDefinition::create('string')
-      ->setRevisionable(TRUE)
       ->setLabel(t('Post Code'))
       ->setSettings(array(
         'default_value' => '',

modules/opencase_entities/src/Entity/OCCase.php

@@ -222,15 +222,16 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ->setDefaultValue(TRUE);
 
     $fields['user_id'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Created by'))
+      ->setLabel(t('Entered by'))
       ->setDescription(t('The user ID of author of the Case entity.'))
       ->setRevisionable(TRUE)
       ->setSetting('target_type', 'user')
       ->setSetting('handler', 'default')
       ->setTranslatable(TRUE)
       ->setDisplayOptions('view', [
-        'label' => 'above',
+        'label' => 'inline',
         'type' => 'author',
+        'weight' => -4,
       ]);
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Case Title'))
@@ -244,6 +245,7 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'string',
+        'weight' => -3,
       ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
@@ -259,7 +261,6 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ->setTranslatable(TRUE)
       ->setCardinality(-1)
       ->setDisplayOptions('form', [
-        'label' => 'above',
         'type' => 'entity_reference_autocomplete',
         'weight' => -2,
         'settings' => [
@@ -271,8 +272,8 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ])
       ->setDisplayOptions('view', [
         'label' => 'above',
+        'weight' => -2
       ])
-      ->setDisplayConfigurable('form', true)
       ->setDefaultValueCallback('Drupal\opencase_entities\Entity\OCCase::defaultVal')
       ->setRequired(TRUE);
 
@@ -294,22 +295,17 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ])
       ->setDisplayOptions('view', [
         'label' => 'above',
+        'weight' => -1,
         'settings' => ['use_description_as_link_text' => 'true']
       ]);
 
     $fields['created'] = BaseFieldDefinition::create('created')
-      ->setLabel(t('Created on'))
+      ->setLabel(t('Created'))
-      ->setDescription(t('When the case was created.'))
+      ->setDescription(t('The time that the entity was created.'));
-      ->setDisplayOptions('view', [
-        'label' => 'above',
-      ]);
 
     $fields['changed'] = BaseFieldDefinition::create('changed')
-      ->setLabel(t('Last updated'))
+      ->setLabel(t('Changed'))
-      ->setDescription(t('When the case was last edited.'))
+      ->setDescription(t('The time that the entity was last edited.'));
-      ->setDisplayOptions('view', [
-        'label' => 'above',
-      ]);
 
     $fields['revision_translation_affected'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Revision translation affected'))

modules/opencase_entities/src/Form/OCActorForm.php

@@ -38,11 +38,18 @@ class OCActorForm extends ContentEntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $entity = $this->entity;
-    // Always make a new revision for a person. They are not changed often and people are likely to
+
-    // want to know what has happened to them over time.
+    // Save as a new revision if requested to do so.
+    if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
       $entity->setNewRevision();
+
+      // If a new revision is created, save the current user as revision author.
       $entity->setRevisionCreationTime(REQUEST_TIME);
       $entity->setRevisionUserId(\Drupal::currentUser()->id());
+    }
+    else {
+      $entity->setNewRevision(FALSE);
+    }
 
     $status = parent::save($form, $form_state);
 

modules/opencase_entities/templates/oc_activity.html.twig

@@ -16,18 +16,7 @@
  */
 #}
 <div{{ attributes.addClass('oc_activity') }}>
-  <h2>{{ title }}</h2>
+  {% if content %}
-  <div class="oc_entity">
+    {{- content -}}
-    <div class="left">
+  {% endif %}
-      {{ base_fields.activity_date_time }}
-      {{ base_fields.description }}
-      {{ base_fields.time_taken }}
-      {{ base_fields.user_id }}
-    </div>
-    <div class="right">
-      {% for field in other_fields %}
-        {{ field }}
-      {% endfor %}
-    </div>
-  </div>
 </div>

modules/opencase_entities/templates/oc_actor.html.twig

@@ -16,20 +16,7 @@
  */
 #}
 <div{{ attributes.addClass('oc_actor') }}>
-  <div class="oc_entity">
+  {% if content %}
-    <div class="left">
+    {{- content -}}
-      {% for field in fields_other_than_contact_details %}
+  {% endif %}
-        {{ field }}
-      {% endfor %}
-    </div>
-    <div class="right">
-      <div id ="contact_details">
-        <h2>Contact Details</h2>
-        <a class="field" href="/opencase/oc_actor/{{ id }}/contact_details_history">See history</a>
-        {% for field in contact_details %}
-          {{ field }}
-        {% endfor %}
-      </div>
-    </div>
-  </div>
 </div>

modules/opencase_entities/templates/oc_case.html.twig

@@ -16,18 +16,7 @@
  */
 #}
 <div{{ attributes.addClass('oc_case') }}>
-  <h2>{{ title }}</h2>
+  {% if content %}
-  <div class="oc_entity">
+    {{- content -}}
-    <div class="left">
+  {% endif %}
-      {{ base_fields.actors_involved }}
-      {{ base_fields.changed }}
-      {{ base_fields.created }}
-      {{ base_fields.user_id }}
-    </div>
-    <div class="right">
-      {% for field in other_fields %}
-        {{ field }}
-      {% endfor %}
-    </div>
-  </div>
 </div>

opencase.info.yml

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

opencase.libraries.yml

@@ -5,8 +5,3 @@ opencase-lib:
       css/opencase.css: {}
   js: 
     js/opencase.js: {}
-opencase-grouped-views:
-  version: 1.x
-  css:
-    layout:
-      css/grouped_views.css: {}

opencase.links.menu.yml

@@ -12,6 +12,18 @@ opencase.opencase_all_cases:
   url: internal:/opencase/all-cases
   weight: 1
 
+opencase.opencase_add_people_menu:
+  title: 'Add people'
+  description: 'Add new people'
+  menu_name: opencase 
+  route_name: opencase.opencase_people_menu
+  weight: 1
+opencase.add_people_links:
+  class: Drupal\opencase\Plugin\Menu\AddActorsMenuLink
+  deriver: Drupal\opencase\Plugin\Derivative\AddActorsMenuLink
+  menu_name: opencase
+  parent: opencase.opencase_add_people_menu
+
 opencase.opencase_admin_menu:
   title: 'Administration'
   description: 'Management and Configuration'

opencase.module

@@ -9,29 +9,6 @@ use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\opencase\EntityTypeRelationsWidget;
 
-/**
- * Implements hook_element_info_alter().
- */
-function opencase_element_info_alter(array &$types) {
-  $types['datetime']['#process'][] = 'opencase_process_element';
-}
-
-/**
- * Element process callback for datetime fields. Removes the seconds part.
- */
-function opencase_process_element($element) {
-  if ($element['#date_time_element'] !== 'none') {
-    $element['#date_time_format'] = 'H:i';
-  }
-  if (!empty($element['time']['#value'])) {
-    $parts = explode(':', $element['time']['#value']);
-    $parts = array_splice($parts, 0, 2);
-    $element['time']['#value'] = implode(':', $parts);
-  }
-  // Remove seconds in browsers that support HTML5 type=date.
-  $element['time']['#attributes']['step'] = 60;
-  return $element;
-}
 
 /**
  * Implements hook_block_access
@@ -164,8 +141,7 @@ function opencase_uninstall() {
     'block.block.opencase',
     'system.menu.opencase',
     'views.view.cases',
-    'views.view.activities',
+    'views.view.activities'
-    'views.view.contact_details_changes'
   ];
   foreach($configs as $config) {
     Drupal::configFactory()->getEditable($config)->delete();