Added logo to saved config

.drone.yml

@@ -1,35 +0,0 @@
----
-kind: pipeline
-name: deploy to docker container
-steps:
-  - name: deploy via ssh
-    image: appleboy/drone-ssh
-    settings:
-      host: dev.autonomic.zone
-      port: 222
-      username: gno
-      key:
-        from_secret: drone_ssh_dev.autonomic.zone
-      script:
-        - cd /var/www/gno
-        - git pull
-        - composer install
-        - /var/www/gno/vendor/bin/drush updb
-        - /var/www/gno/vendor/bin/drush config:import --source=../config
-  - name: notify on failure
-    image: plugins/slack
-    settings:
-      username: comradebritney
-      channel: clients.goodnightout
-      template: "{{repo.owner}}/{{repo.name}} build failed: {{build.link}}. Last commit by @{{build.author}}"
-      webhook:
-        from_secret: rc_builds_url
-    depends_on:
-      - deploy via ssh
-    when:
-      status:
-        - failure
-
-trigger:
-  branch:
-    - dev

.gitignore

@@ -5,9 +5,3 @@
 !.gitignore
 !config
 !config/*
-!docs/*
-
-config/security_review.check.security_review-file_perms.yml
-config/security_review.check.security_review-executable_php.yml
-config/security_review.checks.yml
-config/color.theme.bartik.yml

composer.json

@@ -35,12 +35,11 @@
         "drupal/devel_entity_updates": "^3.0",
         "drupal/entity_extra_field": "^2.0@alpha",
         "drupal/entity_reference_revisions": "^1.9",
-        "drupal/feeds": "^3.0@alpha",
         "drupal/field_permissions": "^1.1",
         "drupal/password_strength": "^2.0@beta",
         "drupal/restui": "^1.20",
         "drupal/route_condition": "^2.0",
-        "drupal/security_review": "^1.0@alpha",
+        "drupal/security_review": "*",
         "drupal/typed_data": "^1.0@alpha",
         "drupal/views_aggregator": "^1.0@beta",
         "drupal/views_autosubmit": "^1.4",

config/bartik.settings.yml

@@ -5,8 +5,8 @@ features:
   favicon: true
 logo:
   use_default: false
-  path: modules/contrib/goodnightout_opencase/images/GNO-logo.png
+  path: 'public://Screenshot from 2021-09-01 13-01-43.png'
 favicon:
   use_default: false
-  path: 'modules/contrib/goodnightout_opencase/images/Screenshot from 2021-09-01 13-01-43_0.png'
+  path: 'public://Screenshot from 2021-09-01 13-01-43_0.png'
   mimetype: image/png

config/block.block.accreditationcount.yml

@@ -1,20 +0,0 @@
-uuid: 441fec17-02e0-491e-b7e0-e8113cb826ba
-langcode: en
-status: true
-dependencies:
-  module:
-    - goodnightout_opencase
-  theme:
-    - bartik
-id: accreditationcount
-theme: bartik
-region: header
-weight: -7
-provider: null
-plugin: accreditation_count
-settings:
-  id: accreditation_count
-  label: 'Accreditation Count'
-  provider: goodnightout_opencase
-  label_display: visible
-visibility: {  }

config/block.block.bartik_branding.yml

@@ -11,7 +11,7 @@ _core:
 id: bartik_branding
 theme: bartik
 region: header
-weight: -5
+weight: 0
 provider: null
 plugin: system_branding_block
 settings:

config/block.block.exposedformactor_searchpage_1.yml

@@ -13,7 +13,7 @@ _core:
 id: exposedformactor_searchpage_1
 theme: bartik
 region: header
-weight: -6
+weight: -9
 provider: null
 plugin: 'views_exposed_filter_block:actor_search-page_1'
 settings:

config/color.theme.bartik.yml

@@ -0,0 +1,16 @@
+palette:
+  top: '#2A419A'
+  bottom: '#1d84c3'
+  bg: '#ffffff'
+  sidebar: '#f6f6f2'
+  sidebarborders: '#f9f9f9'
+  footer: '#FF5800'
+  titleslogan: '#fffeff'
+  text: '#3b3b3b'
+  link: '#0071b3'
+logo: 'public://color/bartik-9853583d/logo.svg'
+stylesheets:
+  - 'public://color/bartik-9853583d/colors.css'
+files:
+  - 'public://color/bartik-9853583d/logo.svg'
+  - 'public://color/bartik-9853583d/colors.css'

config/content_as_config.taxonomy_term.yml

@@ -234,7 +234,7 @@ edd4a0ac-3c1b-4717-8ea9-2486f8239545:
   uuid: 1f990032-7dbe-4302-9004-28af68822305
   tid: '23'
   vid: clie
-  name: 'Confirmation follow-up sent'
+  name: 'Follow-up sent'
   langcode: en
   description: ''
   weight: '5'
@@ -245,7 +245,7 @@ edd4a0ac-3c1b-4717-8ea9-2486f8239545:
   vid: clie
   name: 'Recently Accredited'
   langcode: en
-  description: "<p>NB: There is code in the GNO module which relies on this status existing and having ID 24. It checks for clients who've been accredited for 3 months who have this substatus and changes it to \"3-month folow-up due\".</p>\r\n"
+  description: ''
   weight: '6'
   parent: '0'
 9915606c-1775-4f68-be24-ffaa629ee0b1:
@@ -254,7 +254,7 @@ edd4a0ac-3c1b-4717-8ea9-2486f8239545:
   vid: clie
   name: '3-month follow-up due'
   langcode: en
-  description: "<p>NB: There is code in the GNO module which relies on this status existing and having ID 25.&nbsp;</p>\r\n"
+  description: ''
   weight: '7'
   parent: '0'
 98d1370b-e29f-45fb-b053-b911c2538870:
@@ -263,7 +263,7 @@ edd4a0ac-3c1b-4717-8ea9-2486f8239545:
   vid: clie
   name: '6-month follow-up due'
   langcode: en
-  description: "<p>NB: There is code in the GNO module which relies on this status existing and having ID 26.&nbsp;</p>\r\n"
+  description: ''
   weight: '9'
   parent: '0'
 a6a9c46d-376f-4bb7-a598-90b8e78fc40c:
@@ -272,7 +272,7 @@ a6a9c46d-376f-4bb7-a598-90b8e78fc40c:
   vid: clie
   name: '3-month follow-up sent'
   langcode: en
-  description: "<p>NB: There is code in the GNO module which relies on this status existing and having ID 27. It checks for clients who've been accredited for 6 months who have this substatus and changes it to \"6-month folow-up due\".</p>\r\n"
+  description: ''
   weight: '8'
   parent: '0'
 ab927ebd-555a-4f28-bcda-cc14628fc75a:
@@ -413,3 +413,4 @@ c0c6397d-4f7c-4077-af51-1860ccad26a3:
   description: ''
   weight: '15'
   parent: '0'
+

config/core.base_field_override.oc_organisation_relation.link_between_clients.organisations.yml

@@ -17,10 +17,7 @@ default_value: {  }
 default_value_callback: '\Drupal\opencase_entities\Entity\OCOrganisationRelation::defaultValueCallback'
 settings:
   handler_settings:
-    view:
-      view_name: all_clients
-      display_name: entity_reference_1
     target_bundles:
       - client
-  handler: views
+  handler: default
 field_type: entity_reference

config/core.date_format.short.yml

@@ -7,4 +7,4 @@ _core:
 id: short
 label: 'Default short date'
 locked: false
-pattern: d-M-Y
+pattern: 'm/d/Y - H:i'

config/core.entity_form_display.oc_activity.evaluation.default.yml

@@ -26,93 +26,86 @@ mode: default
 content:
   activity_date_time:
     type: datetime_default
-    weight: 0
+    weight: -3
     region: content
     settings: {  }
     third_party_settings: {  }
   field_a:
     type: options_select
-    weight: 9
+    weight: 6
     region: content
     settings: {  }
     third_party_settings: {  }
   field_after_knowledge:
     type: options_select
-    weight: 10
+    weight: 7
     region: content
     settings: {  }
     third_party_settings: {  }
   field_after_skills:
     type: options_select
-    weight: 11
+    weight: 8
     region: content
     settings: {  }
     third_party_settings: {  }
   field_age:
     type: options_select
-    weight: 3
+    weight: 0
     region: content
     settings: {  }
     third_party_settings: {  }
   field_b:
     type: options_select
-    weight: 7
+    weight: 4
     region: content
     settings: {  }
     third_party_settings: {  }
   field_before_confidence:
     type: options_select
-    weight: 6
+    weight: 3
     region: content
     settings: {  }
     third_party_settings: {  }
   field_before_skills:
     type: options_select
-    weight: 8
+    weight: 5
     region: content
     settings: {  }
     third_party_settings: {  }
   field_d:
     type: options_select
-    weight: 5
+    weight: 2
     region: content
     settings: {  }
     third_party_settings: {  }
   field_ease:
     type: options_select
-    weight: 12
+    weight: 9
     region: content
     settings: {  }
     third_party_settings: {  }
   field_gender:
     type: options_select
-    weight: 4
+    weight: 1
     region: content
     settings: {  }
     third_party_settings: {  }
   field_relevance:
     type: options_select
-    weight: 13
+    weight: 10
     region: content
     settings: {  }
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 1
+    weight: -3
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 14
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
   time_taken:
-    weight: 2
+    weight: -3
     region: content
     settings:
       placeholder: ''

config/core.entity_form_display.oc_activity.trainer_debrief.default.yml

@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.oc_activity.trainer_debrief.field_how_was_this_delivered_
     - field.field.oc_activity.trainer_debrief.field_issues_and_difficulties
     - field.field.oc_activity.trainer_debrief.field_issues_with_group_dynamics
     - field.field.oc_activity.trainer_debrief.field_number_of_participants
@@ -29,6 +30,12 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  field_how_was_this_delivered_:
+    weight: 2
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
   field_issues_and_difficulties:
     weight: 5
     settings:
@@ -110,13 +117,6 @@ content:
     third_party_settings: {  }
     type: string_textarea
     region: content
-  status:
-    type: boolean_checkbox
-    weight: 12
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
 hidden:
   name: true
   time_taken: true

config/core.entity_form_display.oc_actor.trainer.default.yml

@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_actor.trainer.feeds_item
     - field.field.oc_actor.trainer.field_availability
     - field.field.oc_actor.trainer.field_delivery_partners
     - field.field.oc_actor.trainer.field_emergency_contact
@@ -135,15 +134,7 @@ content:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 13
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
 hidden:
-  feeds_item: true
   full_name: true
   middle_names: true
   phone2: true

config/core.entity_form_display.oc_case.project.default.yml

@@ -5,7 +5,6 @@ dependencies:
   config:
     - field.field.oc_case.project.field_contract_signed_date
     - field.field.oc_case.project.field_fee
-    - field.field.oc_case.project.field_total_fee
     - opencase_cases.oc_case_type.project
   module:
     - datetime
@@ -16,25 +15,15 @@ targetEntityType: oc_case
 bundle: project
 mode: default
 content:
-  client:
-    type: entity_reference_autocomplete
-    weight: 0
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   field_contract_signed_date:
-    weight: 3
+    weight: 2
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_fee:
     type: entity_reference_paragraphs
-    weight: 2
+    weight: 1
     settings:
       title: Paragraph
       title_plural: Paragraphs
@@ -46,18 +35,11 @@ content:
     region: content
   files:
     type: file_generic
-    weight: 1
+    weight: 0
     settings:
       progress_indicator: throbber
     region: content
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 4
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
 hidden:
-  field_total_fee: true
+  client: true
   user_id: true

config/core.entity_form_display.oc_case.training.default.yml

@@ -4,11 +4,9 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.training.field_date_of_training
-    - field.field.oc_case.training.field_number_of_participants
     - field.field.oc_case.training.field_project
     - field.field.oc_case.training.field_social_media
     - field.field.oc_case.training.field_trainer
-    - field.field.oc_case.training.field_training_delivery_format
     - field.field.oc_case.training.field_training_status
     - field.field.oc_case.training.field_training_type
     - opencase_cases.oc_case_type.training
@@ -50,7 +48,7 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_social_media:
-    weight: 8
+    weight: 26
     settings:
       display_label: true
     third_party_settings: {  }
@@ -58,7 +56,7 @@ content:
     region: content
   field_trainer:
     type: entity_reference_paragraphs
-    weight: 6
+    weight: 5
     settings:
       title: Trainer
       title_plural: Trainers
@@ -68,12 +66,6 @@ content:
       default_paragraph_type: _none
     third_party_settings: {  }
     region: content
-  field_training_delivery_format:
-    weight: 5
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
   field_training_status:
     weight: 3
     settings: {  }
@@ -88,18 +80,10 @@ content:
     region: content
   files:
     type: file_generic
-    weight: 7
+    weight: 6
     settings:
       progress_indicator: throbber
     region: content
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 9
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
 hidden:
-  field_number_of_participants: true
   user_id: true

config/core.entity_form_display.oc_event.train_the_trainer.default.yml

@@ -1,29 +0,0 @@
-uuid: 12afe302-9a15-4267-b4f4-0a0a4d70977f
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_event_type.train_the_trainer
-  module:
-    - datetime
-id: oc_event.train_the_trainer.default
-targetEntityType: oc_event
-bundle: train_the_trainer
-mode: default
-content:
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 1
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden: {  }

config/core.entity_form_display.oc_organisation.client.default.yml

@@ -3,8 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_organisation.client.feeds_item
-    - field.field.oc_organisation.client.field_accreditation_date
     - field.field.oc_organisation.client.field_client_status
     - field.field.oc_organisation.client.field_client_substatus
     - field.field.oc_organisation.client.field_client_subtype
@@ -19,7 +17,6 @@ dependencies:
     - field.field.oc_organisation.client.field_umbrella_client
     - opencase_entities.oc_organisation_type.client
   module:
-    - datetime
     - file
 _core:
   default_config_hash: OUNi7pV7COebgUedxmuEz4ZF1VF4QDet2AcZ_2j3jQs
@@ -28,12 +25,6 @@ targetEntityType: oc_organisation
 bundle: client
 mode: default
 content:
-  field_accreditation_date:
-    weight: 5
-    settings: {  }
-    third_party_settings: {  }
-    type: datetime_default
-    region: content
   field_client_status:
     weight: 4
     settings: {  }
@@ -65,7 +56,7 @@ content:
     type: options_buttons
     region: content
   field_location_festival_event:
-    weight: 9
+    weight: 8
     settings:
       size: 60
       placeholder: ''
@@ -73,28 +64,28 @@ content:
     type: string_textfield
     region: content
   field_number_of_events_per_year:
-    weight: 10
+    weight: 9
     settings:
       placeholder: ''
     third_party_settings: {  }
     type: number
     region: content
   field_number_of_staff:
-    weight: 8
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-    type: number
-    region: content
-  field_premises_capacity:
     weight: 7
     settings:
       placeholder: ''
     third_party_settings: {  }
     type: number
     region: content
+  field_premises_capacity:
+    weight: 6
+    settings:
+      placeholder: ''
+    third_party_settings: {  }
+    type: number
+    region: content
   field_tags:
-    weight: 11
+    weight: 10
     settings:
       match_operator: CONTAINS
       match_limit: 10
@@ -104,7 +95,7 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_umbrella_client:
-    weight: 6
+    weight: 5
     settings:
       match_operator: CONTAINS
       match_limit: 10
@@ -121,13 +112,5 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 13
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
 hidden:
-  feeds_item: true
   field_images: true

config/core.entity_form_display.oc_organisation.partner_organisation.default.yml

@@ -1,29 +0,0 @@
-uuid: 83703815-32f2-4aa4-9bea-d5106ffa28b6
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_organisation_type.partner_organisation
-  module:
-    - file
-id: oc_organisation.partner_organisation.default
-targetEntityType: oc_organisation
-bundle: partner_organisation
-mode: default
-content:
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 1
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden: {  }

config/core.entity_form_display.oc_organisation.umbrella_client.default.yml

@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_organisation.umbrella_client.feeds_item
     - field.field.oc_organisation.umbrella_client.field_tags
     - field.field.oc_organisation.umbrella_client.field_type_of_umbrella_client
     - opencase_entities.oc_organisation_type.umbrella_client
@@ -17,7 +16,7 @@ bundle: umbrella_client
 mode: default
 content:
   field_tags:
-    weight: 2
+    weight: 62
     settings:
       match_operator: CONTAINS
       match_limit: 10
@@ -27,25 +26,17 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_type_of_umbrella_client:
-    weight: 1
+    weight: -99
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   name:
     type: string_textfield
-    weight: 0
+    weight: -100
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  status:
+hidden: {  }
-    type: boolean_checkbox
-    weight: 3
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden:
-  feeds_item: true

config/core.entity_view_display.oc_activity.trainer_debrief.default.yml

@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.oc_activity.trainer_debrief.field_how_was_this_delivered_
     - field.field.oc_activity.trainer_debrief.field_issues_and_difficulties
     - field.field.oc_activity.trainer_debrief.field_issues_with_group_dynamics
     - field.field.oc_activity.trainer_debrief.field_number_of_participants
@@ -17,6 +18,7 @@ dependencies:
   module:
     - datetime
     - image
+    - options
     - user
 id: oc_activity.trainer_debrief.default
 targetEntityType: oc_activity
@@ -32,6 +34,13 @@ content:
     weight: 0
     region: content
     third_party_settings: {  }
+  field_how_was_this_delivered_:
+    weight: 3
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
   field_issues_and_difficulties:
     weight: 6
     label: above

config/core.entity_view_display.oc_actor.trainer.default.yml

@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_actor.trainer.feeds_item
     - field.field.oc_actor.trainer.field_availability
     - field.field.oc_actor.trainer.field_delivery_partners
     - field.field.oc_actor.trainer.field_emergency_contact
@@ -128,7 +127,6 @@ content:
     settings: {  }
     third_party_settings: {  }
 hidden:
-  feeds_item: true
   full_name: true
   middle_names: true
   phone2: true

config/core.entity_view_display.oc_case.project.default.yml

@@ -5,7 +5,6 @@ dependencies:
   config:
     - field.field.oc_case.project.field_contract_signed_date
     - field.field.oc_case.project.field_fee
-    - field.field.oc_case.project.field_total_fee
     - opencase_cases.oc_case_type.project
   module:
     - datetime
@@ -29,8 +28,8 @@ content:
     weight: 2
     label: above
     settings:
+      format_type: medium
       timezone_override: ''
-      format_type: short
     third_party_settings: {  }
     type: datetime_default
     region: content
@@ -43,23 +42,12 @@ content:
       link: ''
     third_party_settings: {  }
     region: content
-  field_total_fee:
-    weight: 4
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    type: number_decimal
-    region: content
   files:
     label: above
     settings:
       use_description_as_link_text: true
     region: content
-    weight: 6
+    weight: 5
     third_party_settings: {  }
     type: file_default
   trainings:
@@ -70,7 +58,7 @@ content:
   user_id:
     label: above
     type: author
-    weight: 5
+    weight: 4
     region: content
     settings: {  }
     third_party_settings: {  }

config/core.entity_view_display.oc_case.training.default.yml

@@ -4,11 +4,9 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.training.field_date_of_training
-    - field.field.oc_case.training.field_number_of_participants
     - field.field.oc_case.training.field_project
     - field.field.oc_case.training.field_social_media
     - field.field.oc_case.training.field_trainer
-    - field.field.oc_case.training.field_training_delivery_format
     - field.field.oc_case.training.field_training_status
     - field.field.oc_case.training.field_training_type
     - opencase_cases.oc_case_type.training
@@ -39,7 +37,7 @@ content:
       link: true
     third_party_settings: {  }
   debriefs:
-    weight: 10
+    weight: 7
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -49,7 +47,7 @@ content:
     settings: {  }
     third_party_settings: {  }
   evaluations:
-    weight: 11
+    weight: 8
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -85,15 +83,6 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-  field_number_of_participants:
-    weight: 7
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    type: number_integer
-    region: content
   field_project:
     weight: 1
     label: above
@@ -103,7 +92,7 @@ content:
     type: entity_reference_label
     region: content
   field_social_media:
-    weight: 8
+    weight: 81
     label: above
     settings:
       format: default
@@ -114,20 +103,13 @@ content:
     region: content
   field_trainer:
     type: entity_reference_revisions_entity_view
-    weight: 6
+    weight: 5
     label: above
     settings:
       view_mode: default
       link: ''
     third_party_settings: {  }
     region: content
-  field_training_delivery_format:
-    weight: 5
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
   field_training_status:
     weight: 3
     label: above
@@ -147,13 +129,13 @@ content:
     settings:
       use_description_as_link_text: true
     region: content
-    weight: 9
+    weight: 6
     third_party_settings: {  }
     type: file_default
   user_id:
     label: above
     type: author
-    weight: 12
+    weight: 9
     region: content
     settings: {  }
     third_party_settings: {  }

config/core.entity_view_display.oc_organisation.client.default.yml

@@ -3,8 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_organisation.client.feeds_item
-    - field.field.oc_organisation.client.field_accreditation_date
     - field.field.oc_organisation.client.field_client_status
     - field.field.oc_organisation.client.field_client_substatus
     - field.field.oc_organisation.client.field_client_subtype
@@ -19,7 +17,6 @@ dependencies:
     - field.field.oc_organisation.client.field_umbrella_client
     - opencase_entities.oc_organisation_type.client
   module:
-    - datetime
     - file
     - options
 _core:
@@ -29,24 +26,7 @@ targetEntityType: oc_organisation
 bundle: client
 mode: default
 content:
-  field_accreditation_date:
-    weight: 8
-    label: above
-    settings:
-      timezone_override: ''
-      format_type: short
-    third_party_settings: {  }
-    type: datetime_default
-    region: content
   field_client_status:
-    weight: 7
-    label: above
-    settings:
-      link: false
-    third_party_settings: {  }
-    type: entity_reference_label
-    region: content
-  field_client_substatus:
     weight: 6
     label: above
     settings:
@@ -54,7 +34,7 @@ content:
     third_party_settings: {  }
     type: entity_reference_label
     region: content
-  field_client_subtype:
+  field_client_substatus:
     weight: 5
     label: above
     settings:
@@ -62,7 +42,7 @@ content:
     third_party_settings: {  }
     type: entity_reference_label
     region: content
-  field_client_type:
+  field_client_subtype:
     weight: 4
     label: above
     settings:
@@ -70,15 +50,23 @@ content:
     third_party_settings: {  }
     type: entity_reference_label
     region: content
+  field_client_type:
+    weight: 3
+    label: above
+    settings:
+      link: false
+    third_party_settings: {  }
+    type: entity_reference_label
+    region: content
   field_how_did_you_hear_about_us:
-    weight: 15
+    weight: 14
     label: above
     settings: {  }
     third_party_settings: {  }
     type: list_default
     region: content
   field_location_festival_event:
-    weight: 12
+    weight: 10
     label: above
     settings:
       link_to_entity: false
@@ -86,15 +74,6 @@ content:
     type: string
     region: content
   field_number_of_events_per_year:
-    weight: 13
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    type: number_integer
-    region: content
-  field_number_of_staff:
     weight: 11
     label: above
     settings:
@@ -103,8 +82,17 @@ content:
     third_party_settings: {  }
     type: number_integer
     region: content
+  field_number_of_staff:
+    weight: 9
+    label: above
+    settings:
+      thousand_separator: ''
+      prefix_suffix: true
+    third_party_settings: {  }
+    type: number_integer
+    region: content
   field_premises_capacity:
-    weight: 10
+    weight: 8
     label: above
     settings:
       thousand_separator: ''
@@ -113,7 +101,7 @@ content:
     type: number_integer
     region: content
   field_tags:
-    weight: 14
+    weight: 12
     label: above
     settings:
       link: false
@@ -121,7 +109,7 @@ content:
     type: entity_reference_label
     region: content
   field_umbrella_client:
-    weight: 9
+    weight: 7
     label: above
     settings:
       link: true
@@ -130,28 +118,27 @@ content:
     region: content
   linked_clients:
     weight: 0
-    region: content
     settings: {  }
     third_party_settings: {  }
+    region: content
   name:
     label: hidden
     type: string
-    weight: 3
+    weight: 2
     region: content
     settings:
       link_to_entity: false
     third_party_settings: {  }
   projects:
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  trainings:
     weight: 1
     region: content
     settings: {  }
     third_party_settings: {  }
+  trainings:
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
-  feeds_item: true
   field_images: true
   search_api_excerpt: true

config/core.entity_view_display.oc_organisation.umbrella_client.default.yml

@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_organisation.umbrella_client.feeds_item
     - field.field.oc_organisation.umbrella_client.field_tags
     - field.field.oc_organisation.umbrella_client.field_type_of_umbrella_client
     - opencase_entities.oc_organisation_type.umbrella_client
@@ -53,6 +52,5 @@ content:
     settings: {  }
     third_party_settings: {  }
 hidden:
-  feeds_item: true
   name: true
   search_api_excerpt: true

config/core.entity_view_mode.feeds_feed.full.yml

@@ -1,12 +0,0 @@
-uuid: cdfdb2b5-968b-4aaa-a8ca-4524230213dc
-langcode: en
-status: false
-dependencies:
-  module:
-    - feeds
-_core:
-  default_config_hash: 8I9Vm3L0dLCdctKfCjpw5vLwMetyaJzxbWNMzb2V7-I
-id: feeds_feed.full
-label: 'Full feed'
-targetEntityType: feeds_feed
-cache: true

config/core.extension.yml

@@ -23,7 +23,6 @@ module:
   entity_extra_field: 0
   entity_extra_field_ui: 0
   entity_reference_revisions: 0
-  feeds: 0
   field: 0
   field_permissions: 0
   field_ui: 0
@@ -55,7 +54,6 @@ module:
   search: 0
   search_api: 0
   search_api_db: 0
-  security_review: 0
   serialization: 0
   shortcut: 0
   superfish: 0

config/editor.editor.basic_html.yml

@@ -1,6 +1,6 @@
 uuid: bce05a02-b793-466b-a492-1febe92d1f85
 langcode: en
-status: false
+status: true
 dependencies:
   config:
     - filter.format.basic_html

config/feeds.feed_type.csv_clients.yml

@@ -1,103 +0,0 @@
-uuid: 4eb11220-0e79-4e7f-a0d8-2300fb7b365b
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_organisation.client.field_client_subtype
-    - field.field.oc_organisation.client.field_client_type
-    - field.field.oc_organisation.client.field_tags
-    - field.field.oc_organisation.client.field_umbrella_client
-    - opencase_entities.oc_organisation_type.client
-  module:
-    - opencase_entities
-id: csv_clients
-label: 'CSV Clients'
-description: ''
-help: ''
-import_period: -1
-fetcher: upload
-fetcher_configuration:
-  allowed_extensions: 'txt csv tsv xml opml'
-  directory: 'public://feeds'
-parser: csv
-parser_configuration:
-  delimiter: ','
-  no_headers: false
-  line_limit: 100
-processor: 'entity:oc_organisation'
-processor_configuration:
-  langcode: en
-  update_existing: 0
-  update_non_existent: _delete
-  expire: -1
-  owner_feed_author: true
-  owner_id: 0
-  authorize: true
-  skip_hash_check: false
-  values:
-    type: client
-custom_sources:
-  tags:
-    label: Tags
-    value: Tags
-    machine_name: tags
-  name:
-    label: Name
-    value: Name
-    machine_name: name
-  umbrella_client:
-    label: 'Umbrella Client'
-    value: 'Umbrella Client'
-    machine_name: umbrella_client
-  client_type:
-    label: 'Client type'
-    value: 'Client type'
-    machine_name: client_type
-  client_subtype:
-    label: 'Client subtype'
-    value: 'Client subtype'
-    machine_name: client_subtype
-  umbrella_client_2:
-    label: 'Umbrella client'
-    value: 'Umbrella client'
-    machine_name: umbrella_client_2
-mappings:
-  -
-    target: field_tags
-    map:
-      target_id: tags
-    settings:
-      language: ''
-      reference_by: name
-      autocreate: '1'
-  -
-    target: name
-    map:
-      value: name
-    unique: {  }
-    settings: {  }
-  -
-    target: field_umbrella_client
-    map:
-      target_id: umbrella_client_2
-    settings:
-      language: ''
-      reference_by: id
-      feeds_item: guid
-      autocreate: 0
-  -
-    target: field_client_type
-    map:
-      target_id: client_type
-    settings:
-      language: ''
-      reference_by: name
-      autocreate: '1'
-  -
-    target: field_client_subtype
-    map:
-      target_id: client_subtype
-    settings:
-      language: ''
-      reference_by: name
-      autocreate: '1'

config/feeds.feed_type.csv_umbrella_client.yml

@@ -1,36 +0,0 @@
-uuid: 17ebbce1-9756-400f-a58a-65b765f00813
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_organisation_type.umbrella_client
-  module:
-    - opencase_entities
-id: csv_umbrella_client
-label: 'CSV Umbrella Clients'
-description: ''
-help: ''
-import_period: 3600
-fetcher: upload
-fetcher_configuration:
-  allowed_extensions: 'txt csv tsv xml opml'
-  directory: 'public://feeds'
-parser: csv
-parser_configuration:
-  delimiter: ','
-  no_headers: false
-  line_limit: 100
-processor: 'entity:oc_organisation'
-processor_configuration:
-  langcode: en
-  update_existing: 1
-  update_non_existent: _delete
-  expire: -1
-  owner_feed_author: true
-  owner_id: 0
-  authorize: true
-  skip_hash_check: false
-  values:
-    type: umbrella_client
-custom_sources: {  }
-mappings: {  }

config/feeds.feed_type.trainers.yml

@@ -1,39 +0,0 @@
-uuid: ad3e47c2-2f4b-46d5-9107-86192040fead
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_actor_type.trainer
-  module:
-    - opencase_entities
-id: trainers
-label: 'CSV Trainers'
-description: ''
-help: ''
-import_period: 3600
-fetcher: http
-fetcher_configuration:
-  auto_detect_feeds: false
-  use_pubsubhubbub: false
-  always_download: false
-  fallback_hub: ''
-  request_timeout: 30
-parser: csv
-parser_configuration:
-  delimiter: ','
-  no_headers: false
-  line_limit: 100
-processor: 'entity:oc_actor'
-processor_configuration:
-  langcode: en
-  update_existing: 0
-  update_non_existent: _keep
-  expire: -1
-  owner_feed_author: false
-  owner_id: 0
-  authorize: true
-  skip_hash_check: false
-  values:
-    type: trainer
-custom_sources: {  }
-mappings: {  }

config/field.field.oc_activity.trainer_debrief.field_how_was_this_delivered_.yml

@@ -0,0 +1,21 @@
+uuid: 78379738-8834-4314-a1cb-e5f19c4ffb5c
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_activity.field_how_was_this_delivered_
+    - opencase_entities.oc_activity_type.trainer_debrief
+  module:
+    - options
+id: oc_activity.trainer_debrief.field_how_was_this_delivered_
+field_name: field_how_was_this_delivered_
+entity_type: oc_activity
+bundle: trainer_debrief
+label: 'How was this delivered?'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string

config/field.field.oc_actor.trainer.feeds_item.yml

@@ -1,23 +0,0 @@
-uuid: 48212965-7239-40e6-b653-cb162c079816
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.feeds_item
-    - opencase_entities.oc_actor_type.trainer
-  module:
-    - feeds
-id: oc_actor.trainer.feeds_item
-field_name: feeds_item
-entity_type: oc_actor
-bundle: trainer
-label: 'Feeds item'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:feeds_feed'
-  handler_settings: {  }
-field_type: feeds_item

config/field.field.oc_case.project.field_total_fee.yml

@@ -1,23 +0,0 @@
-uuid: 244c5c44-44f0-40b8-8dc3-5a0b2119d536
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_total_fee
-    - opencase_cases.oc_case_type.project
-id: oc_case.project.field_total_fee
-field_name: field_total_fee
-entity_type: oc_case
-bundle: project
-label: 'Total fee'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: £
-  suffix: ''
-field_type: decimal

config/field.field.oc_case.training.field_number_of_participants.yml

@@ -1,23 +0,0 @@
-uuid: 588f54aa-5542-4e6c-902b-88ccc3088dc4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_number_of_participants
-    - opencase_cases.oc_case_type.training
-id: oc_case.training.field_number_of_participants
-field_name: field_number_of_participants
-entity_type: oc_case
-bundle: training
-label: 'Number of participants'
-description: 'This is a read-only field which will be populated when a trainer submits their debrief.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer

config/field.field.oc_case.training.field_project.yml

@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.storage.oc_case.field_project
+    - opencase_cases.oc_case_type.project
     - opencase_cases.oc_case_type.training
 id: oc_case.training.field_project
 field_name: field_project
@@ -16,10 +17,12 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: views
+  handler: 'default:oc_case'
   handler_settings:
-    view:
+    target_bundles:
-      view_name: projects
+      project: project
-      display_name: entity_reference_1
+    sort:
-      arguments: {  }
+      field: _none
+    auto_create: false
+    auto_create_bundle: ''
 field_type: entity_reference

config/field.field.oc_case.training.field_training_delivery_format.yml

@@ -1,23 +0,0 @@
-uuid: a405f668-5418-4ac5-a3a7-e176a2aa378a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_training_delivery_format
-    - opencase_cases.oc_case_type.training
-  module:
-    - options
-id: oc_case.training.field_training_delivery_format
-field_name: field_training_delivery_format
-entity_type: oc_case
-bundle: training
-label: 'Delivery format'
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 'In person'
-default_value_callback: ''
-settings: {  }
-field_type: list_string

config/field.field.oc_organisation.client.feeds_item.yml

@@ -1,23 +0,0 @@
-uuid: e8cd1296-438d-41df-afd6-328f1cf83741
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.feeds_item
-    - opencase_entities.oc_organisation_type.client
-  module:
-    - feeds
-id: oc_organisation.client.feeds_item
-field_name: feeds_item
-entity_type: oc_organisation
-bundle: client
-label: 'Feeds item'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:feeds_feed'
-  handler_settings: {  }
-field_type: feeds_item

config/field.field.oc_organisation.client.field_accreditation_date.yml

@@ -1,21 +0,0 @@
-uuid: 3261ac4b-36e5-483b-af01-ec2a7852ac5b
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_accreditation_date
-    - opencase_entities.oc_organisation_type.client
-  module:
-    - datetime
-id: oc_organisation.client.field_accreditation_date
-field_name: field_accreditation_date
-entity_type: oc_organisation
-bundle: client
-label: 'Accreditation date'
-description: 'If the client has more than one accreditation then this will show the date of the most recent one.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: datetime

config/field.field.oc_organisation.client.field_umbrella_client.yml

@@ -5,6 +5,7 @@ dependencies:
   config:
     - field.storage.oc_organisation.field_umbrella_client
     - opencase_entities.oc_organisation_type.client
+    - opencase_entities.oc_organisation_type.umbrella_client
 _core:
   default_config_hash: tIK3YfjqaKVW_2O0nXhBMu3VaM82TN4nIb5ecnX4zZY
 id: oc_organisation.client.field_umbrella_client
@@ -18,10 +19,12 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: views
+  handler: 'default:oc_organisation'
   handler_settings:
-    view:
+    target_bundles:
-      view_name: all_umbrella_clients
+      umbrella_client: umbrella_client
-      display_name: entity_reference_1
+    sort:
-      arguments: {  }
+      field: _none
+    auto_create: false
+    auto_create_bundle: ''
 field_type: entity_reference

config/field.field.oc_organisation.umbrella_client.feeds_item.yml

@@ -1,23 +0,0 @@
-uuid: 17d8780f-7a4c-450f-ab68-e1620725f319
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.feeds_item
-    - opencase_entities.oc_organisation_type.umbrella_client
-  module:
-    - feeds
-id: oc_organisation.umbrella_client.feeds_item
-field_name: feeds_item
-entity_type: oc_organisation
-bundle: umbrella_client
-label: 'Feeds item'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:feeds_feed'
-  handler_settings: {  }
-field_type: feeds_item

config/field.field.paragraph.trainer.field_trainer.yml

@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.storage.paragraph.field_trainer
+    - opencase_entities.oc_actor_type.trainer
     - paragraphs.paragraphs_type.trainer
 _core:
   default_config_hash: d9Ea50H6q3WNZweoghPEUnWEu8HsSdxaK0ExEn0Cyq4
@@ -18,10 +19,12 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: views
+  handler: 'default:oc_actor'
   handler_settings:
-    view:
+    target_bundles:
-      view_name: all_trainers
+      trainer: trainer
-      display_name: entity_reference_1
+    sort:
-      arguments: {  }
+      field: _none
+    auto_create: false
+    auto_create_bundle: ''
 field_type: entity_reference

config/field.storage.oc_activity.field_how_was_this_delivered_.yml

@@ -1,26 +1,22 @@
-uuid: e349155a-7746-4e18-90df-041c62ebbef1
+uuid: 73efb630-e24f-4edc-8fda-f112da0c1162
 langcode: en
 status: true
 dependencies:
   module:
-    - field_permissions
+    - opencase_entities
-    - opencase_cases
     - options
-third_party_settings:
+id: oc_activity.field_how_was_this_delivered_
-  field_permissions:
+field_name: field_how_was_this_delivered_
-    permission_type: public
+entity_type: oc_activity
-id: oc_case.field_training_delivery_format
-field_name: field_training_delivery_format
-entity_type: oc_case
 type: list_string
 settings:
   allowed_values:
-    -
-      value: 'In person'
-      label: 'In person'
     -
       value: Zoom
       label: Zoom
+    -
+      value: 'In person'
+      label: 'In person'
   allowed_values_function: ''
 module: options
 locked: false

config/field.storage.oc_actor.feeds_item.yml

@@ -1,20 +0,0 @@
-uuid: fbac65af-99cb-46cc-911c-04a831121ecf
-langcode: en
-status: true
-dependencies:
-  module:
-    - feeds
-    - opencase_entities
-id: oc_actor.feeds_item
-field_name: feeds_item
-entity_type: oc_actor
-type: feeds_item
-settings:
-  target_type: feeds_feed
-module: feeds
-locked: false
-cardinality: 1
-translatable: false
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

config/field.storage.oc_case.field_number_of_participants.yml

@@ -1,24 +0,0 @@
-uuid: 7278be3c-e085-452a-93d4-09e8e7b24c60
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case.field_number_of_participants
-field_name: field_number_of_participants
-entity_type: oc_case
-type: integer
-settings:
-  unsigned: false
-  size: normal
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

config/field.storage.oc_case.field_total_fee.yml

@@ -1,24 +0,0 @@
-uuid: 4bb28508-5949-4bf5-9b70-97c68ab50473
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case.field_total_fee
-field_name: field_total_fee
-entity_type: oc_case
-type: decimal
-settings:
-  precision: 10
-  scale: 2
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

config/field.storage.oc_organisation.feeds_item.yml

@@ -1,20 +0,0 @@
-uuid: 68bb9674-ea4e-48ef-87b6-da010fa674ec
-langcode: en
-status: true
-dependencies:
-  module:
-    - feeds
-    - opencase_entities
-id: oc_organisation.feeds_item
-field_name: feeds_item
-entity_type: oc_organisation
-type: feeds_item
-settings:
-  target_type: feeds_feed
-module: feeds
-locked: false
-cardinality: 1
-translatable: false
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

config/field.storage.oc_organisation.field_accreditation_date.yml

@@ -1,24 +0,0 @@
-uuid: dcd05ff2-5201-46ba-ae2a-3da730db0826
-langcode: en
-status: true
-dependencies:
-  module:
-    - datetime
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_organisation.field_accreditation_date
-field_name: field_accreditation_date
-entity_type: oc_organisation
-type: datetime
-settings:
-  datetime_type: date
-module: datetime
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

config/field.storage.oc_organisation.field_umbrella_client.yml

@@ -3,11 +3,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - field_permissions
     - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
 _core:
   default_config_hash: 1U8GYQXtF_GX3zLP-YCI-xlO1LHVaC6yBcj8hcpcYSA
 id: oc_organisation.field_umbrella_client

config/filter.format.basic_html.yml

@@ -1,6 +1,6 @@
 uuid: 4b8e98d8-da03-48f8-a3cc-4525b628f5a5
 langcode: en
-status: false
+status: true
 dependencies:
   module:
     - editor

config/filter.format.restricted_html.yml

@@ -1,6 +1,6 @@
 uuid: e2433365-4de4-44cf-a519-9a22c3a656a7
 langcode: en
-status: false
+status: true
 dependencies: {  }
 _core:
   default_config_hash: oz6NyPDAB4HB6N9hgH2LwNVtCd-sXbMG1fbn5KsRIDI

config/security_review.check.security_review-admin_permissions.yml

@@ -1 +0,0 @@
-id: security_review-admin_permissions

config/security_review.check.security_review-error_reporting.yml

@@ -1 +0,0 @@
-id: security_review-error_reporting

config/security_review.check.security_review-failed_logins.yml

@@ -1 +0,0 @@
-id: security_review-failed_logins

config/security_review.check.security_review-field.yml

@@ -1 +0,0 @@
-id: security_review-field

config/security_review.check.security_review-input_formats.yml

@@ -1 +0,0 @@
-id: security_review-input_formats

config/security_review.check.security_review-private_files.yml

@@ -1 +0,0 @@
-id: security_review-private_files

config/security_review.check.security_review-query_errors.yml

@@ -1 +0,0 @@
-id: security_review-query_errors

config/security_review.check.security_review-temporary_files.yml

@@ -1 +0,0 @@
-id: security_review-temporary_files

config/security_review.check.security_review-trusted_hosts.yml

@@ -1,3 +0,0 @@
-id: security_review-trusted_hosts
-settings:
-  method: token

config/security_review.check.security_review-upload_extensions.yml

@@ -1 +0,0 @@
-id: security_review-upload_extensions

config/security_review.check.security_review-views_access.yml

@@ -1 +0,0 @@
-id: security_review-views_access

config/security_review.settings.yml

@@ -1,7 +0,0 @@
-configured: true
-untrusted_roles:
-  - anonymous
-  - authenticated
-log: true
-_core:
-  default_config_hash: ylcsF3ZfWc6Ua1nUaTXyVy2TNwupiRAtBA6w_whTMGg

config/system.action.feeds_feed_delete_action.yml

@@ -1,13 +0,0 @@
-uuid: e1de8102-418b-4b0d-961f-f52a1f4a2045
-langcode: en
-status: true
-dependencies:
-  module:
-    - feeds
-_core:
-  default_config_hash: yZW4ELH2L51kf2mGKd7f62uozGH-jFuWz1k9abACq1U
-id: feeds_feed_delete_action
-label: 'Delete selected feeds'
-type: feeds_feed
-plugin: feeds_feed_delete_action
-configuration: {  }

config/system.action.user_add_role_action.follow_up_alerts.yml

@@ -1,14 +0,0 @@
-uuid: 2477506b-d3d4-484d-9d71-f2a93b341996
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.follow_up_alerts
-  module:
-    - user
-id: user_add_role_action.follow_up_alerts
-label: 'Add the Follow-up alerts role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: follow_up_alerts

config/system.action.user_add_role_action.gno_admin_user.yml

@@ -1,14 +0,0 @@
-uuid: ba93670a-ccb1-42d9-90e1-571ed5c89309
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.gno_admin_user
-  module:
-    - user
-id: user_add_role_action.gno_admin_user
-label: 'Add the GNO Admin user role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: gno_admin_user

config/system.action.user_add_role_action.gno_standard_user.yml

@@ -0,0 +1,14 @@
+uuid: 168c7f04-3c80-4746-ac53-0d5bba6033b7
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.gno_standard_user
+  module:
+    - user
+id: user_add_role_action.gno_standard_user
+label: 'Add the GNO Standard User role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: gno_standard_user

config/system.action.user_remove_role_action.follow_up_alerts.yml

@@ -1,14 +0,0 @@
-uuid: c1953991-174f-4390-a5db-d992c6c9395d
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.follow_up_alerts
-  module:
-    - user
-id: user_remove_role_action.follow_up_alerts
-label: 'Remove the Follow-up alerts role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: follow_up_alerts

config/system.action.user_remove_role_action.gno_admin_user.yml

@@ -1,14 +0,0 @@
-uuid: c596d543-d07d-450f-ae48-7536026c466b
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.gno_admin_user
-  module:
-    - user
-id: user_remove_role_action.gno_admin_user
-label: 'Remove the GNO Admin user role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: gno_admin_user

config/system.action.user_remove_role_action.gno_standard_user.yml

@@ -0,0 +1,14 @@
+uuid: 8380c29c-d573-4330-bfb2-f304b9c58aff
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.gno_standard_user
+  module:
+    - user
+id: user_remove_role_action.gno_standard_user
+label: 'Remove the GNO Standard User role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: gno_standard_user

config/system.date.yml

@@ -4,7 +4,7 @@ first_day: 0
 timezone:
   default: Europe/London
   user:
-    configurable: false
+    configurable: true
     warn: false
     default: 0
 _core:

config/update.settings.yml

@@ -8,6 +8,6 @@ fetch:
 notification:
   emails:
     - helo@autonomic.zone
-  threshold: security
+  threshold: all
 _core:
   default_config_hash: 2QzULf0zovJQx3J06Y9rufzzfi-CY2CTTlEfJJh2Qyw

config/user.role.authenticated.yml

@@ -11,32 +11,9 @@ is_admin: false
 permissions:
   - 'access comments'
   - 'access content'
-  - 'add activity entities'
+  - 'access shortcuts'
-  - 'add case entities'
+  - 'access site-wide contact form'
-  - 'add event entities'
+  - 'post comments'
-  - 'add organisation entities'
+  - 'search content'
-  - 'add organisation relation entities'
+  - 'skip comment approval'
-  - 'add trainer entities'
+  - 'use text format basic_html'
-  - 'create paragraph content availability'
-  - 'create paragraph content trainer'
-  - 'create terms in tags'
-  - 'delete organisation relation entities'
-  - 'delete paragraph content availability'
-  - 'delete paragraph content trainer'
-  - 'edit activity entities'
-  - 'edit case entities'
-  - 'edit event entities'
-  - 'edit organisation entities'
-  - 'edit organisation relation entities'
-  - 'edit trainer entities'
-  - 'update paragraph content availability'
-  - 'update paragraph content trainer'
-  - 'use opencase'
-  - 'view paragraph content availability'
-  - 'view paragraph content trainer'
-  - 'view published activity entities'
-  - 'view published case entities'
-  - 'view published event entities'
-  - 'view published organisation entities'
-  - 'view published organisation relation entities'
-  - 'view published trainer entities'

config/user.role.follow_up_alerts.yml

@@ -1,9 +0,0 @@
-uuid: 53c0d18d-4e94-4997-9b59-7f2d5e1770e4
-langcode: en
-status: true
-dependencies: {  }
-id: follow_up_alerts
-label: 'Follow-up alerts'
-weight: 5
-is_admin: null
-permissions: {  }

config/user.role.gno_admin_user.yml

@@ -1,30 +0,0 @@
-uuid: 1b23a802-601d-4d00-8818-392b5e496f9d
-langcode: en
-status: true
-dependencies: {  }
-id: gno_admin_user
-label: 'GNO Additional Admin Permissions'
-weight: 4
-is_admin: null
-permissions:
-  - 'add equal opps entities'
-  - 'administer users'
-  - 'delete activity entities'
-  - 'delete all trainer revisions'
-  - 'delete bank account entities'
-  - 'delete case entities'
-  - 'delete equal opps entities'
-  - 'delete event entities'
-  - 'delete organisation entities'
-  - 'delete trainer entities'
-  - 'edit equal opps entities'
-  - 'view edit delete all actor entities'
-  - 'view published equal opps entities'
-  - 'view unpublished activity entities'
-  - 'view unpublished actor entities'
-  - 'view unpublished bank account entities'
-  - 'view unpublished case entities'
-  - 'view unpublished equal opps entities'
-  - 'view unpublished event entities'
-  - 'view unpublished organisation entities'
-  - 'view unpublished organisation relation entities'

config/user.role.gno_standard_user.yml

@@ -0,0 +1,49 @@
+uuid: fadbdf8e-6636-4d22-82e9-cac3c46717fc
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: pKb8BpZ9MCyV5Vh20ssa14Pt37_eeich0iKafucnMpE
+id: gno_standard_user
+label: 'GNO Standard User'
+weight: 3
+is_admin: null
+permissions:
+  - 'access content'
+  - 'add activity entities'
+  - 'add case entities'
+  - 'add equal opps entities'
+  - 'add event entities'
+  - 'add organisation entities'
+  - 'add organisation relation entities'
+  - 'add trainer entities'
+  - 'create paragraph content availability'
+  - 'create paragraph content trainer'
+  - 'create terms in tags'
+  - 'delete activity entities'
+  - 'delete case entities'
+  - 'delete equal opps entities'
+  - 'delete organisation entities'
+  - 'delete organisation relation entities'
+  - 'delete paragraph content availability'
+  - 'delete paragraph content trainer'
+  - 'delete trainer entities'
+  - 'edit activity entities'
+  - 'edit case entities'
+  - 'edit equal opps entities'
+  - 'edit event entities'
+  - 'edit organisation entities'
+  - 'edit organisation relation entities'
+  - 'edit trainer entities'
+  - 'update paragraph content availability'
+  - 'update paragraph content trainer'
+  - 'use opencase'
+  - 'view paragraph content availability'
+  - 'view paragraph content trainer'
+  - 'view published activity entities'
+  - 'view published case entities'
+  - 'view published equal opps entities'
+  - 'view published event entities'
+  - 'view published organisation entities'
+  - 'view published organisation relation entities'
+  - 'view published trainer entities'

config/views.view.actor_search.yml

@@ -47,7 +47,7 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-          text_input_required_format: full_html
+          text_input_required_format: basic_html
       pager:
         type: mini
         options:

config/views.view.all_clients.yml

@@ -9,16 +9,11 @@ dependencies:
     - field.storage.oc_organisation.field_client_type
     - field.storage.oc_organisation.field_tags
     - opencase_entities.oc_organisation_type.client
-    - opencase_entities.oc_organisation_type.umbrella_client
     - system.menu.opencase
-    - taxonomy.vocabulary.clie
     - taxonomy.vocabulary.client_status
     - user.role.authenticated
   content:
-    - 'taxonomy_term:clie:98d1370b-e29f-45fb-b053-b911c2538870'
+    - 'taxonomy_term:client_status:2397c3f5-8d18-4e4f-956e-404c62614135'
-    - 'taxonomy_term:clie:9915606c-1775-4f68-be24-ffaa629ee0b1'
-    - 'taxonomy_term:clie:c0c6397d-4f7c-4077-af51-1860ccad26a3'
-    - 'taxonomy_term:client_status:057c3514-8413-463f-989e-cd8deda6c71c'
   module:
     - opencase_entities
     - taxonomy
@@ -85,73 +80,6 @@ display:
             offset_label: Offset
       style:
         type: table
-        options:
-          grouping: {  }
-          row_class: '{{ status }}'
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            name: name
-            field_client_type: field_client_type
-            field_client_subtype: field_client_subtype
-            field_client_status: field_client_status
-            field_client_substatus: field_client_substatus
-            field_tags: field_tags
-            status: status
-          info:
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_type:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_subtype:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_substatus:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_tags:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: false
       row:
         type: fields
       fields:
@@ -535,74 +463,20 @@ display:
           separator: ', '
           field_api_classes: false
           plugin_id: field
+      filters:
         status:
-          id: status
+          value: '1'
           table: oc_organisation_field_data
           field: status
-          relationship: none
+          plugin_id: boolean
-          group_type: group
-          admin_label: ''
-          label: 'Publishing status'
-          exclude: true
-          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: boolean
-          settings:
-            format: default
-            format_custom_true: ''
-            format_custom_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_organisation
           entity_field: status
-          plugin_id: field
+          id: status
-      filters:
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+          group: 1
         type:
           id: type
           table: oc_organisation_field_data
@@ -672,141 +546,6 @@ display:
         - 'config:field.storage.oc_organisation.field_client_subtype'
         - 'config:field.storage.oc_organisation.field_client_type'
         - 'config:field.storage.oc_organisation.field_tags'
-  attachment_1:
-    display_plugin: attachment
-    id: attachment_1
-    display_title: 'Follow-ups due'
-    position: 1
-    display_options:
-      display_extenders: {  }
-      display_description: ''
-      footer:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content:
-            value: '<h2>Other clients</h2>'
-            format: full_html
-          plugin_id: text
-      defaults:
-        footer: false
-        empty: false
-        filters: false
-        filter_groups: false
-        title: false
-        header: false
-        css_class: false
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content: 'No clients have follow-ups due'
-          plugin_id: text_custom
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          value:
-            client: client
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        field_client_substatus_target_id:
-          id: field_client_substatus_target_id
-          table: oc_organisation__field_client_substatus
-          field: field_client_substatus_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: or
-          value:
-            25: 25
-            26: 26
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          type: select
-          limit: true
-          vid: clie
-          hierarchy: false
-          error_message: true
-          plugin_id: taxonomy_index_tid
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      title: 'Follow-ups due'
-      header:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content: '<h2>Clients with follow-ups due</h2>'
-          plugin_id: text_custom
-      displays:
-        page_1: page_1
-      css_class: follow-ups-due
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_client_status'
-        - 'config:field.storage.oc_organisation.field_client_substatus'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
   block_1:
     display_plugin: block
     id: block_1
@@ -894,357 +633,6 @@ display:
         - 'config:field.storage.oc_organisation.field_client_subtype'
         - 'config:field.storage.oc_organisation.field_client_type'
         - 'config:field.storage.oc_organisation.field_tags'
-  entity_reference_1:
-    display_plugin: entity_reference
-    id: entity_reference_1
-    display_title: 'Entity Reference'
-    position: 6
-    display_options:
-      display_extenders: {  }
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          value:
-            client: client
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        status:
-          id: status
-          table: oc_organisation_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          entity_type: oc_organisation
-          entity_field: status
-          plugin_id: boolean
-      defaults:
-        filters: false
-        filter_groups: false
-        fields: false
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      row:
-        type: entity_reference
-        options:
-          default_field_elements: true
-          inline:
-            name: name
-          separator: '-'
-          hide_empty: false
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            name: name
-            field_client_type: '0'
-            field_client_subtype: '0'
-            field_client_status: '0'
-            field_client_substatus: '0'
-            field_tags: '0'
-            status: '0'
-      fields:
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.roles
-      tags: {  }
-  entity_reference_2:
-    display_plugin: entity_reference
-    id: entity_reference_2
-    display_title: 'Entity Reference'
-    position: 6
-    display_options:
-      display_extenders: {  }
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: in
-          value:
-            client: client
-            umbrella_client: umbrella_client
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          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_organisation
-          entity_field: type
-          plugin_id: bundle
-        status:
-          id: status
-          table: oc_organisation_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          entity_type: oc_organisation
-          entity_field: status
-          plugin_id: boolean
-      defaults:
-        filters: false
-        filter_groups: false
-        fields: false
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      row:
-        type: entity_reference
-        options:
-          default_field_elements: true
-          inline:
-            name: name
-          separator: '-'
-          hide_empty: false
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            name: name
-            field_client_type: '0'
-            field_client_subtype: '0'
-            field_client_status: '0'
-            field_client_substatus: '0'
-            field_tags: '0'
-            status: '0'
-      fields:
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.roles
-      tags: {  }
   page_1:
     display_plugin: page
     id: page_1
@@ -1272,20 +660,20 @@ display:
         title: false
         header: false
       empty: {  }
-      title: 'All clients'
-      header:
-        display_link:
-          id: display_link
-          table: views
-          field: display_link
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          display_id: page_3
-          label: 'This display does not include closed clients. Click here to see them'
-          plugin_id: display_link
       filters:
+        status:
+          value: '1'
+          table: oc_organisation_field_data
+          field: status
+          plugin_id: boolean
+          entity_type: oc_organisation
+          entity_field: status
+          id: status
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+          group: 1
         type:
           id: type
           table: oc_organisation_field_data
@@ -1298,18 +686,16 @@ display:
           expose:
             operator_limit_selection: false
             operator_list: {  }
-        field_client_substatus_target_id:
+        field_client_status_target_id:
-          id: field_client_substatus_target_id
+          id: field_client_status_target_id
-          table: oc_organisation__field_client_substatus
+          table: oc_organisation__field_client_status
-          field: field_client_substatus_target_id
+          field: field_client_status_target_id
           relationship: none
           group_type: group
           admin_label: ''
           operator: not
           value:
-            25: 25
+            41: 41
-            26: 26
-            42: 42
           group: 1
           exposed: false
           expose:
@@ -1342,7 +728,7 @@ display:
           reduce_duplicates: false
           type: select
           limit: true
-          vid: clie
+          vid: client_status
           hierarchy: false
           error_message: true
           plugin_id: taxonomy_index_tid
@@ -1350,6 +736,19 @@ display:
         operator: AND
         groups:
           1: AND
+      title: 'All clients'
+      header:
+        display_link:
+          id: display_link
+          table: views
+          field: display_link
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          display_id: page_3
+          label: 'This display does not include closed clients. Click here to see them'
+          plugin_id: display_link
     cache_metadata:
       max-age: -1
       contexts:
@@ -1462,6 +861,19 @@ display:
         empty: false
         footer: false
       filters:
+        status:
+          value: '1'
+          table: oc_organisation_field_data
+          field: status
+          plugin_id: boolean
+          entity_type: oc_organisation
+          entity_field: status
+          id: status
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+          group: 1
         type:
           id: type
           table: oc_organisation_field_data

config/views.view.all_trainers.yml

@@ -71,35 +71,6 @@ display:
             offset_label: Offset
       style:
         type: table
-        options:
-          grouping: {  }
-          row_class: '{{ status }}'
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            name: name
-            status: status
-          info:
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: false
       row:
         type: fields
       fields:
@@ -168,73 +139,6 @@ display:
           entity_type: null
           entity_field: name
           plugin_id: field
-        status:
-          id: status
-          table: oc_actor_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Publishing status'
-          exclude: true
-          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: boolean
-          settings:
-            format: default
-            format_custom_true: ''
-            format_custom_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: status
-          plugin_id: field
       filters:
         type:
           id: type
@@ -264,86 +168,6 @@ display:
         - url.query_args
         - user.roles
       tags: {  }
-  entity_reference_1:
-    display_plugin: entity_reference
-    id: entity_reference_1
-    display_title: 'Entity Reference'
-    position: 2
-    display_options:
-      display_extenders: {  }
-      filters:
-        type:
-          id: type
-          table: oc_actor_field_data
-          field: type
-          value:
-            trainer: trainer
-          entity_type: oc_actor
-          entity_field: type
-          plugin_id: bundle
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        status:
-          id: status
-          table: oc_actor_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          entity_type: oc_actor
-          entity_field: status
-          plugin_id: boolean
-      defaults:
-        filters: false
-        filter_groups: false
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            name: name
-            status: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.roles
-      tags: {  }
   page_1:
     display_plugin: page
     id: page_1

config/views.view.all_umbrella_clients.yml

@@ -76,7 +76,7 @@ display:
         type: table
         options:
           grouping: {  }
-          row_class: '{{ status }}'
+          row_class: ''
           default_row_class: true
           override: true
           sticky: false
@@ -85,9 +85,6 @@ display:
           description: ''
           columns:
             name: name
-            field_type_of_umbrella_client: field_type_of_umbrella_client
-            field_tags: field_tags
-            status: status
           info:
             name:
               sortable: false
@@ -96,25 +93,6 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-            field_type_of_umbrella_client:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_tags:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
           default: '-1'
           empty_table: false
       row:
@@ -315,74 +293,20 @@ display:
           separator: ', '
           field_api_classes: false
           plugin_id: field
+      filters:
         status:
-          id: status
+          value: '1'
           table: oc_organisation_field_data
           field: status
-          relationship: none
+          plugin_id: boolean
-          group_type: group
-          admin_label: ''
-          label: Published
-          exclude: true
-          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: boolean
-          settings:
-            format: default
-            format_custom_true: ''
-            format_custom_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_organisation
           entity_field: status
-          plugin_id: field
+          id: status
-      filters:
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+          group: 1
         type:
           id: type
           table: oc_organisation_field_data
@@ -427,152 +351,6 @@ display:
       tags:
         - 'config:field.storage.oc_organisation.field_tags'
         - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
-  entity_reference_1:
-    display_plugin: entity_reference
-    id: entity_reference_1
-    display_title: 'Entity Reference'
-    position: 2
-    display_options:
-      display_extenders: {  }
-      fields:
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-      defaults:
-        fields: false
-        filters: false
-        filter_groups: false
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            name: name
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          value:
-            umbrella_client: umbrella_client
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        status:
-          id: status
-          table: oc_organisation_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          entity_type: oc_organisation
-          entity_field: status
-          plugin_id: boolean
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.roles
-      tags: {  }
   page_1:
     display_plugin: page
     id: page_1

config/views.view.debriefs.yml

@@ -75,7 +75,7 @@ display:
         type: table
         options:
           grouping: {  }
-          row_class: '{{ status }}'
+          row_class: ''
           default_row_class: true
           override: true
           sticky: false
@@ -83,11 +83,16 @@ display:
           summary: 'Trainer Debrief'
           description: ''
           columns:
+            name: name
             activity_date_time: activity_date_time
-            field_trainer: field_trainer
-            view_oc_activity: view_oc_activity
-            status: status
           info:
+            name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
             activity_date_time:
               sortable: false
               default_sort_order: asc
@@ -95,27 +100,6 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-            field_trainer:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            view_oc_activity:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
           default: '-1'
           empty_table: false
       row:
@@ -263,73 +247,6 @@ display:
           plugin_id: entity_link
           output_url_as_text: false
           absolute: false
-        status:
-          id: status
-          table: oc_activity_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Publishing status'
-          exclude: true
-          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: boolean
-          settings:
-            format: default
-            format_custom_true: ''
-            format_custom_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_activity
-          entity_field: status
-          plugin_id: field
       filters:
         type:
           id: type
@@ -399,7 +316,7 @@ display:
           tokenize: false
           content:
             value: 'Trainer debriefs will appear here once they are added.'
-            format: full_html
+            format: basic_html
           plugin_id: text
       relationships:
         oc_case:

config/views.view.equal_opps_records.yml

@@ -254,7 +254,7 @@ display:
           tokenize: false
           content:
             value: 'There is no Equal Opps record by that name. Please check the spelling'
-            format: full_html
+            format: basic_html
           plugin_id: text
       relationships:
         oc_actor:

config/views.view.evaluations.yml

@@ -74,7 +74,7 @@ display:
         type: table
         options:
           grouping: {  }
-          row_class: '{{ status }}'
+          row_class: ''
           default_row_class: true
           override: true
           sticky: false
@@ -84,7 +84,6 @@ display:
           columns:
             name: name
             activity_date_time: activity_date_time
-            status: status
           info:
             name:
               sortable: false
@@ -100,13 +99,6 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
           default: '-1'
           empty_table: false
       row:
@@ -248,73 +240,6 @@ display:
           entity_type: oc_activity
           entity_field: activity_date_time
           plugin_id: field
-        status:
-          id: status
-          table: oc_activity_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Publishing status'
-          exclude: true
-          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: boolean
-          settings:
-            format: default
-            format_custom_true: ''
-            format_custom_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_activity
-          entity_field: status
-          plugin_id: field
       filters:
         type:
           id: type
@@ -354,7 +279,7 @@ display:
           tokenize: false
           content:
             value: 'Evaluations will appear here once they are added.'
-            format: full_html
+            format: basic_html
           plugin_id: text
       relationships:
         oc_case:

config/views.view.feeds_feed.yml

@@ -1,741 +0,0 @@
-uuid: 6b047e2d-1057-4786-9ad8-179a87ed80be
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.admin
-  module:
-    - feeds
-    - user
-_core:
-  default_config_hash: qEFCGJZmfPO8q5G05QiqwLQcMxrQ7PaLQMmF3nt3iMY
-id: feeds_feed
-label: Feeds
-module: views
-description: ''
-tag: ''
-base_table: feeds_feed
-base_field: fid
-display:
-  default:
-    display_plugin: default
-    id: default
-    display_title: Master
-    position: 0
-    display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access feed overview'
-      cache:
-        type: none
-        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: full
-        options:
-          items_per_page: 50
-          offset: 0
-          id: 0
-          total_pages: null
-          tags:
-            previous: '‹ previous'
-            next: 'next ›'
-            first: '« first'
-            last: 'last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            feeds_feed_bulk_form: feeds_feed_bulk_form
-            title: title
-            type: type
-            name: name
-            changed: changed
-            imported: imported
-            operations: operations
-          info:
-            feeds_feed_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            title:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            imported:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            operations:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: true
-      row:
-        type: fields
-      fields:
-        feeds_feed_bulk_form:
-          id: feeds_feed_bulk_form
-          table: feeds_feed
-          field: feeds_feed_bulk_form
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Bulk update'
-          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
-          action_title: 'With selection'
-          include_exclude: exclude
-          selected_actions: {  }
-          entity_type: feeds_feed
-          plugin_id: bulk_form
-        title:
-          id: title
-          table: feeds_feed
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: null
-          entity_field: title
-          plugin_id: field
-        type:
-          id: type
-          table: feeds_feed
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Type
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: feeds_feed
-          entity_field: type
-          plugin_id: field
-        name:
-          id: name
-          table: users_field_data
-          field: name
-          relationship: uid
-          group_type: group
-          admin_label: ''
-          label: Author
-          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: user_name
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-        changed:
-          id: changed
-          table: feeds_feed
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: feeds_feed
-          entity_field: changed
-          plugin_id: field
-        imported:
-          id: imported
-          table: feeds_feed
-          field: imported
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Imported
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: feeds_feed
-          entity_field: imported
-          plugin_id: field
-        operations:
-          id: operations
-          table: feeds_feed
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Operations
-          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
-          destination: true
-          entity_type: feeds_feed
-          plugin_id: entity_operations
-      filters:
-        title:
-          id: title
-          table: feeds_feed
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: title_op
-            label: Title
-            description: ''
-            use_operator: false
-            operator: title_op
-            identifier: title
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-            operator_limit_selection: false
-            operator_list: {  }
-          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: feeds_feed
-          entity_field: title
-          plugin_id: string
-        type:
-          id: type
-          table: feeds_feed
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: type_op
-            label: Type
-            description: ''
-            use_operator: false
-            operator: type_op
-            identifier: type
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-            reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
-          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: feeds_feed
-          entity_field: type
-          plugin_id: bundle
-      sorts:
-        changed:
-          id: changed
-          table: feeds_feed
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: DESC
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-          entity_type: feeds_feed
-          entity_field: changed
-          plugin_id: date
-      title: Feeds
-      header: {  }
-      footer: {  }
-      empty:
-        result:
-          id: result
-          table: views
-          field: result
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          content: 'There are no feeds yet.'
-          plugin_id: result
-      relationships:
-        uid:
-          id: uid
-          table: feeds_feed
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: Author
-          required: false
-          entity_type: feeds_feed
-          entity_field: uid
-          plugin_id: standard
-      arguments: {  }
-      display_extenders: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  page_1:
-    display_plugin: page
-    id: page_1
-    display_title: Page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: admin/content/feed
-      menu:
-        type: normal
-        title: Feeds
-        description: ''
-        expanded: false
-        parent: system.admin_content
-        weight: 0
-        context: '0'
-        menu_name: admin
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }

config/views.view.partner_organisations.yml

@@ -69,35 +69,6 @@ display:
             next: ››
       style:
         type: table
-        options:
-          grouping: {  }
-          row_class: '{{ status }}'
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            name: name
-            status: status
-          info:
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: false
       row:
         type: fields
       fields:
@@ -166,74 +137,20 @@ display:
           entity_type: null
           entity_field: name
           plugin_id: field
+      filters:
         status:
-          id: status
+          value: '1'
           table: oc_organisation_field_data
           field: status
-          relationship: none
+          plugin_id: boolean
-          group_type: group
-          admin_label: ''
-          label: Published
-          exclude: true
-          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: boolean
-          settings:
-            format: default
-            format_custom_true: ''
-            format_custom_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_organisation
           entity_field: status
-          plugin_id: field
+          id: status
-      filters:
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+          group: 1
         type:
           id: type
           table: oc_organisation_field_data

config/views.view.projects.yml

@@ -4,7 +4,6 @@ status: true
 dependencies:
   config:
     - field.storage.oc_case.field_contract_signed_date
-    - field.storage.oc_case.field_total_fee
     - opencase_cases.oc_case_type.project
     - system.menu.opencase
     - user.role.authenticated
@@ -257,73 +256,7 @@ display:
           type: datetime_default
           settings:
             timezone_override: ''
-            format_type: short
+            format_type: medium
-          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_total_fee:
-          id: field_total_fee
-          table: oc_case__field_total_fee
-          field: field_total_fee
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Total fee'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_decimal
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-            decimal_separator: .
-            scale: 2
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -365,7 +298,6 @@ display:
         - user.roles
       tags:
         - 'config:field.storage.oc_case.field_contract_signed_date'
-        - 'config:field.storage.oc_case.field_total_fee'
   block_1:
     display_plugin: block
     id: block_1
@@ -546,73 +478,7 @@ display:
           type: datetime_default
           settings:
             timezone_override: ''
-            format_type: short
+            format_type: medium
-          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_total_fee:
-          id: field_total_fee
-          table: oc_case__field_total_fee
-          field: field_total_fee
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Total fee'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_decimal
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-            decimal_separator: .
-            scale: 2
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -634,153 +500,6 @@ display:
         - user.roles
       tags:
         - 'config:field.storage.oc_case.field_contract_signed_date'
-        - 'config:field.storage.oc_case.field_total_fee'
-  entity_reference_1:
-    display_plugin: entity_reference
-    id: entity_reference_1
-    display_title: 'Entity Reference'
-    position: 3
-    display_options:
-      display_extenders: {  }
-      fields:
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-      defaults:
-        fields: false
-        filters: false
-        filter_groups: false
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            name: name
-      filters:
-        type:
-          id: type
-          table: oc_case_field_data
-          field: type
-          value:
-            project: project
-          entity_type: oc_case
-          entity_field: type
-          plugin_id: bundle
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        status:
-          id: status
-          table: oc_case_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          entity_type: oc_case
-          entity_field: status
-          plugin_id: boolean
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.roles
-      tags: {  }
   page_1:
     display_plugin: page
     id: page_1
@@ -810,4 +529,3 @@ display:
         - user.roles
       tags:
         - 'config:field.storage.oc_case.field_contract_signed_date'
-        - 'config:field.storage.oc_case.field_total_fee'

docs/deploy_changes.md

@@ -1,15 +0,0 @@
-# How to deploy code and config changes
-
-## Before deploying, ensure that on your local site:
-* Both modules are fully committed and pushed
-* Config is exported
-* You have run `composer update`
-* Composer repo is fully committed and pushed, including any new config files
-
-
-## Deployment
-* Pull the composer repo to the staging site (this should be CI when pushing to staging branch)
-* `composer install`
-* `drush config:import --source ../config`
-* Test - see manual_tests.md
-* Deploy to live by same method (this should be CI when pushing to live branch)

manual_tests.md

@@ -1,33 +1,33 @@
 # First
     - Log in as a user with the role "GNO Standard User".
 
-# Client & training
+# Client & training & project
-    - Go to Add New -> Client.
+    - Billing fields are not there at first but there is a button to add them and when you click it is adds them.
-    - Check that billing address fields are not there but there is a button to add them.
+    - Save the client without filling in any billing fields, then edit it - the fields should be gone and the button shoud be there
-    - Click the button and billing fields should appear.* Do not fill in the billing fields at this stage however.
+    - Add one or more billing fields, save and edit - all the billing fields should show, and not the button.
-    - Upload a file to the Files field.
+    - You can upload files, and when you save it you can view or download them.
-    - Fill in all required fields and save. You should arrive at the screen for the client you just created.
+    - Client shows up on "all clients" list
-    - Click the Edit tab. The billing fields should be gone and the button shoud be there
+    - Searching for the client by name brings them up
-    - Add one or more billing fields, save and then click the edit tab again- all the billing fields should show, and not the button.
-    - You should be able to download the file you uploaded.
     - On the client screen there is a button to add a training 
-    - Click this and and fill in the required fields
+    - Add  training with 3 trainers:
-    -  Add 3 trainers:
+        - one with no rate (rate input should disappear), then change it to Standard and the box should appear and be disabled and grey and say 115, then change to custom and the box shuould clear and become editable, then input 400
-        - one with no rate (rate input should disappear), then change it to Standard and the box should appear and be disabled and grey and say 115, then change to custom and the box shuould clear and become editable, then input 400*
         - Add another trainer with "None" rate and one with Standard 
     - Save it, the trainers and rates should show , then when you edit it again the input box should be gone for the none one and disabled for the standard
+    - The training immediately shows up in the training list for that client
+    - It also appears in "All trainings", at the top  
+    - Add a project and add multiple fees
+    - Save it and all the fees should be displayed
+    - The project should appear in the project list for the client and also in All Projects
+
+
 # Umbrella client
+    - Choose menu item "Add new umbrella client" and add one
+    - Client shows up on "all umbrella clients" list
     - There is a button on the umbrella client screen to add a client
-    - After adding a client it shows up on the umbrella client's screen
+    - Adding a client creates one attached to that umbrella client and it immediately shows up in the client list for that  umbrella client and also in "All clients", at the top of each 
     - You can add a project to the umbrella client and it appears at the top of the list on the umbrella client screen
     - You can add a training to the umbrella client and it appears at the top of the list on the umbrella client screen
     - Add a training to the client who is attached to the umbrella client. It should show up on the umbrella client screen in the "Trainings for clients within this umrella" list.
----------------
-STUFF BELOW HERE MIGHT BE ABLE TO BE DONE IN PYTEST
------------------
-
-
-    - Adding a client creates one attached to that umbrella client and it immediately shows up in the client list for that  umbrella client and also in "All clients", at the top of each 
 
 # Equal opps 
     - Should not be able to see the menu items for adding or listing EOs as GNO standard user
@@ -35,6 +35,12 @@ STUFF BELOW HERE MIGHT BE ABLE TO BE DONE IN PYTEST
     - Create one
     - It should appear in the All Equal Opps list
 
+# Emergency contact
+# 
+
+
+# Adding new client using the GUI
+
 ## Tests for GUI settings
 * When adding a new client in the GUI, the status should default to Lead and the substatus to New Lead. (Setting: default values for those fields.)
 * Neither the status nor the substatus dropdown should not contain a placeholder option such as "None" or "Select". (Setting: Required field)
@@ -60,75 +66,45 @@ STUFF BELOW HERE MIGHT BE ABLE TO BE DONE IN PYTEST
 * The subtypes dropdown should be populated according to the existing value of the types dropdown. E.g. save a client as "licensed premises" type and reopen; the subtypes should be a list  including "Pub or Bar"
 * The status dropdown should be populated according to the existing value of the substatuses dropdown. E.g. save a client as substatus "One-off Training" and reopen; the status should be set to "Confirmed" and that should be the only option in the status dropdown.
 
-
+# Automatic client status
-# Email notification
-## Tests for mail hook and post-save hook in goodnightout_opencase.module
-* Ensure there is a user with the role "Follow-up alerts" whose email address you have access to
-* Change a client's status from something else to "3-month followup due" - said user should receive an email about it with "3-month followup due for <client name>" as the subject and a link to the client in the body
-* Same for 6-month
-* Should not happen when client is saved without changing substatus (even if another field is changed)
-* Should not happen when status is changed to something else
-
-# Automatic client status & accreditation date
 ## Tests for presave hook in goodnightout_opencase.module
 
 * Setup a client with status "Lead" and give it multiple trainings - leave the training status as N/A.
 * Set some but not all of the trainings to status  "post training materials sent"
 * The status of the client should not change
 * Set all the remaining trainings to  status  "post training materials sent"
-* This should automatically set the client status to "Accredited", their substatus to "Recently Accredited", and their Accreditation Date to today.
+* This should automatically set the client status to "Accredited" and their substatus to "Recently Accredited"
 
-## Tests for cron hook in goodnightout_opencase.module
+# Trainings linked to projects or clients
 
-* Start with a client whose substatus is "Recently Accredited"
+* Add a training from a client screen
-* Change the accreditation date to one that's more than 3 months in the past
+* It should have the client filled in by default, and a box for the project
-* Run cron
+* Fill in a project and save
-* The status should change to 3-month follow-up due and an email alert should be sen
+* On the training screen there should be a link to the project
-* Change the status to "3-month follow-up sent" and change the accreditation date to one that's more than 6 months in the past
+* Click it to open the project, then add another training
-* Run cron
+* The project field should default to the project and there should be a box for the client
-* The status should change to 6-month follow-up due and an email alert should be sent
+* Add a client and save
+* There should be a link to the client on the project screen
+* Click it and the project should be listed there
+
+# Email notification
+## Tests for mail hook and post-save hook in goodnightout_opencase.module
+
+* Change a client's status from something else to "3-month followup due" - the site admin should receive an email about it with "3-month followup due for <client name>" as the subject and a link to the client in the body
+* Same for 6-month
+* Should not happen when client is saved without changing status
+* Should not happen when status is changed to something else
 
 # Number of participants
 
 * Create a debrief for a training and fill in "Number of participants".
 * The number should appear on the training when you view it.
-* Edit the debrief to set a different number - it should overwrite the number on the training
+* Edit the debreief - it should change the training too
-* Create another debrief - should also overwrite
+* Create another - so should that
-* Delete a debrief - number on training should not change
 
 # Total fees on a project
 * Create a project and add some fees
-* When you view the project the fees should be listed and also total fee should be displayed
+* When you view the project the total fee should be displayed
 * Edit it and change a fee, delete a fee, add a fee
 * The total should update
-* The project along with its total fee should appear in the All Projects list
+* The total should appear in the list of projects 
-
-## Unpublishing and deleting entities
-### As a GNO Standard User
-* There should be no delete tab on any entities (although you can delete links between clients)
-* All these entities should a checkbox for whether they are published:
-    * Client / Umbrella Client
-    * Training / Project / Partner Organistion
-    * Train the trainer event
-    * Debrief / Evaluation
-    * Trainer
-    * List of trainings on client & umbrella client screens
-    * List of projects on client & umbrella client screens screen
-    * List of clients on umbrella client screens
-    * List of debriefs and evaluations on trainings screen
-* Unpublished entities should not show up in any autocomplete fields. i.e.:
-    * Unpublished trainers should not come up as an option when filling in the trainer field on a training
-    * Unpublished clients should not come up as an option when filling in the client field of a training or a project, or when adding a linked client to another client
-    * Unpublished projects should not come up as an option when filling in the project field of a training 
-    * Unpublished umbrella clients should not come up as an option when filling in the umbrella client field of a client
-
-### As a GNO Admin user
-* When you unpublish an entity you can still see it
-* Unpublished entities should appear in all the lists, but in grey (and should not show up in autocomplete fields)
-* You should be able to delete all entities
-* When you delete a training it should warn you it's going to delete the debriefs and evaulations as well.
-
-# Accredited Clients Block
-* Block at the top of screen should show how many Clients of each type are Accredited - that is, with status Accredited or Reaccreditation Due
-* When you change a client's status to or from one of these or add or delete a client with one of these statuses 
-* Unpublishing a client should remove them from the total and publishing them again should reinstate it.