config update after removing separate case type for umbrella training

config/bartik.settings.yml

@@ -0,0 +1,12 @@
+features:
+  node_user_picture: true
+  comment_user_picture: true
+  comment_user_verification: true
+  favicon: true
+logo:
+  use_default: false
+  path: 'public://Screenshot from 2021-09-01 13-01-43.png'
+favicon:
+  use_default: false
+  path: 'public://Screenshot from 2021-09-01 13-01-43_0.png'
+  mimetype: image/png

config/block.block.views_block__trainings_block_1.yml

@@ -1,33 +0,0 @@
-uuid: 58e497bc-7e4a-4e5f-8cb0-ce0f0510ac38
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.trainings
-  module:
-    - route_condition
-    - views
-  theme:
-    - bartik
-_core:
-  default_config_hash: fZkkstXQN1epUGGOONx3-Ad2v_UkFlDelWqQOyi9_T4
-id: views_block__trainings_block_1
-theme: bartik
-region: content
-weight: -2
-provider: null
-plugin: 'views_block:trainings-block_1'
-settings:
-  id: 'views_block:trainings-block_1'
-  label: ''
-  provider: views
-  label_display: visible
-  views_label: ''
-  items_per_page: none
-  context_mapping: {  }
-visibility:
-  route:
-    id: route
-    routes: entity.oc_actor.canonical
-    negate: false
-    context_mapping: {  }

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-b1834811/logo.svg'
+stylesheets:
+  - 'public://color/bartik-b1834811/colors.css'
+files:
+  - 'public://color/bartik-b1834811/logo.svg'
+  - 'public://color/bartik-b1834811/colors.css'

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

@@ -16,14 +16,14 @@ bundle: project
 mode: default
 content:
   field_contract_signed_date:
-    weight: 27
+    weight: 2
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_fee:
     type: entity_reference_paragraphs
-    weight: 26
+    weight: 1
     settings:
       title: Paragraph
       title_plural: Paragraphs
@@ -33,4 +33,13 @@ content:
       default_paragraph_type: ''
     third_party_settings: {  }
     region: content
-hidden: {  }
+  files:
+    type: file_generic
+    weight: 0
+    settings:
+      progress_indicator: throbber
+    region: content
+    third_party_settings: {  }
+hidden:
+  client: true
+  user_id: true

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

@@ -20,14 +20,24 @@ targetEntityType: oc_case
 bundle: training
 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_date_of_training:
-    weight: 2
+    weight: 4
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_project:
-    weight: 26
+    weight: 1
     settings:
       match_operator: CONTAINS
       match_limit: 10
@@ -38,7 +48,7 @@ content:
     region: content
   field_trainer:
     type: entity_reference_paragraphs
-    weight: 3
+    weight: 5
     settings:
       title: Trainer
       title_plural: Trainers
@@ -49,15 +59,23 @@ content:
     third_party_settings: {  }
     region: content
   field_training_status:
-    weight: 1
+    weight: 3
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_training_type:
-    weight: 0
+    weight: 2
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
-hidden: {  }
+  files:
+    type: file_generic
+    weight: 6
+    settings:
+      progress_indicator: throbber
+    region: content
+    third_party_settings: {  }
+hidden:
+  user_id: true

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

@@ -1,54 +0,0 @@
-uuid: e1497fe3-207b-43a5-99c7-3513e32072ea
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_case.training_for_umbrella_client.field_date_of_training
-    - field.field.oc_case.training_for_umbrella_client.field_project
-    - field.field.oc_case.training_for_umbrella_client.field_trainer
-    - field.field.oc_case.training_for_umbrella_client.field_training_type_umbrella
-    - opencase_cases.oc_case_type.training_for_umbrella_client
-  module:
-    - datetime
-    - file
-    - paragraphs
-id: oc_case.training_for_umbrella_client.default
-targetEntityType: oc_case
-bundle: training_for_umbrella_client
-mode: default
-content:
-  field_date_of_training:
-    weight: 1
-    settings: {  }
-    third_party_settings: {  }
-    type: datetime_default
-    region: content
-  field_project:
-    weight: 26
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: entity_reference_autocomplete
-    region: content
-  field_trainer:
-    weight: 2
-    settings:
-      title: Paragraph
-      title_plural: Paragraphs
-      edit_mode: open
-      add_mode: dropdown
-      form_display_mode: default
-      default_paragraph_type: ''
-    third_party_settings: {  }
-    type: entity_reference_paragraphs
-    region: content
-  field_training_type_umbrella:
-    weight: 0
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-hidden: {  }

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

@@ -16,8 +16,16 @@ targetEntityType: oc_case
 bundle: project
 mode: default
 content:
+  client:
+    type: entity_reference_label
+    weight: 1
+    region: content
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
   field_contract_signed_date:
-    weight: 86
+    weight: 2
     label: above
     settings:
       format_type: medium
@@ -27,12 +35,32 @@ content:
     region: content
   field_fee:
     type: entity_reference_revisions_entity_view
-    weight: 83
+    weight: 3
     label: above
     settings:
       view_mode: default
       link: ''
     third_party_settings: {  }
     region: content
+  files:
+    label: above
+    settings:
+      use_description_as_link_text: true
+    region: content
+    weight: 5
+    third_party_settings: {  }
+    type: file_default
+  trainings:
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  user_id:
+    label: above
+    type: author
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   search_api_excerpt: true

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

@@ -27,8 +27,16 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  client:
+    type: entity_reference_label
+    weight: 0
+    region: content
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
   debriefs:
-    weight: 4
+    weight: 7
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -38,7 +46,7 @@ content:
     settings: {  }
     third_party_settings: {  }
   evaluations:
-    weight: 5
+    weight: 8
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -48,7 +56,7 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_date_of_training:
-    weight: 2
+    weight: 4
     label: above
     settings:
       format_type: medium
@@ -75,7 +83,7 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_project:
-    weight: 83
+    weight: 1
     label: above
     settings:
       link: true
@@ -84,7 +92,7 @@ content:
     region: content
   field_trainer:
     type: entity_reference_revisions_entity_view
-    weight: 3
+    weight: 5
     label: above
     settings:
       view_mode: default
@@ -92,18 +100,33 @@ content:
     third_party_settings: {  }
     region: content
   field_training_status:
-    weight: 1
+    weight: 3
     label: above
     settings: {  }
     third_party_settings: {  }
     type: list_default
     region: content
   field_training_type:
-    weight: 0
+    weight: 2
     label: above
     settings: {  }
     third_party_settings: {  }
     type: list_default
     region: content
+  files:
+    label: above
+    settings:
+      use_description_as_link_text: true
+    region: content
+    weight: 6
+    third_party_settings: {  }
+    type: file_default
+  user_id:
+    label: above
+    type: author
+    weight: 9
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   search_api_excerpt: true

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

@@ -1,56 +0,0 @@
-uuid: 39e3eb48-5dea-40c8-abd7-660ce5f60ec3
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_case.training_for_umbrella_client.field_date_of_training
-    - field.field.oc_case.training_for_umbrella_client.field_project
-    - field.field.oc_case.training_for_umbrella_client.field_trainer
-    - field.field.oc_case.training_for_umbrella_client.field_training_type_umbrella
-    - opencase_cases.oc_case_type.training_for_umbrella_client
-  module:
-    - datetime
-    - entity_reference_revisions
-    - file
-    - options
-    - user
-id: oc_case.training_for_umbrella_client.default
-targetEntityType: oc_case
-bundle: training_for_umbrella_client
-mode: default
-content:
-  field_date_of_training:
-    weight: 83
-    label: above
-    settings:
-      format_type: medium
-      timezone_override: ''
-    third_party_settings: {  }
-    type: datetime_default
-    region: content
-  field_project:
-    weight: 92
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    type: entity_reference_label
-    region: content
-  field_trainer:
-    weight: 86
-    label: above
-    settings:
-      view_mode: default
-      link: ''
-    third_party_settings: {  }
-    type: entity_reference_revisions_entity_view
-    region: content
-  field_training_type_umbrella:
-    weight: 89
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-hidden:
-  search_api_excerpt: true

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

@@ -16,8 +16,13 @@ targetEntityType: oc_organisation
 bundle: umbrella_client
 mode: default
 content:
+  clients:
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   field_tags:
-    weight: 3
+    weight: 5
     label: above
     settings:
       link: false
@@ -25,24 +30,27 @@ content:
     type: entity_reference_label
     region: content
   field_type_of_umbrella_client:
-    weight: 2
+    weight: 4
     label: above
     settings: {  }
     third_party_settings: {  }
     type: list_default
     region: content
-  name:
+  projects:
-    label: hidden
-    type: string
     weight: 1
     region: content
-    settings:
+    settings: {  }
-      link_to_entity: false
     third_party_settings: {  }
-  projects:
+  trainings_for_clients_within_this_umbrella:
-    weight: 0
+    weight: 3
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  trainings_for_this_umbrella_client:
+    weight: 2
     region: content
     settings: {  }
     third_party_settings: {  }
 hidden:
+  name: true
   search_api_excerpt: true

config/core.extension.yml

@@ -16,6 +16,8 @@ module:
   datetime: 0
   dblog: 0
   dbug: 0
+  devel: 0
+  devel_entity_updates: 0
   dynamic_page_cache: 0
   editor: 0
   entity_extra_field: 0

config/devel.settings.yml

@@ -0,0 +1,12 @@
+page_alter: false
+raw_names: false
+error_handlers:
+  1: 1
+rebuild_theme: false
+debug_mail_file_format: '%to-%subject-%datetime.mail.txt'
+debug_mail_directory: 'temporary://devel-mails'
+devel_dumper: default
+debug_logfile: 'temporary://drupal_debug.txt'
+debug_pre: true
+_core:
+  default_config_hash: Aqx6J0yYT6mVqT0fbjeP4JkoL-700nmudVF5d6Pq2Yo

config/devel.toolbar.settings.yml

@@ -0,0 +1,10 @@
+toolbar_items:
+  - devel.admin_settings_link
+  - devel.cache_clear
+  - devel.container_info.service
+  - devel.menu_rebuild
+  - devel.reinstall
+  - devel.route_info
+  - devel.run_cron
+_core:
+  default_config_hash: IQjf_ytthngZTAk_MU8-74VecArWD3G5g0oEH6PM6GA

config/entity_extra_field.extra_field.oc_case.project.trainings.yml

@@ -0,0 +1,53 @@
+uuid: 724b0e99-12c3-4028-a805-df614711c22f
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_date_of_training
+    - field.storage.oc_case.field_project
+    - field.storage.oc_case.field_training_status
+    - field.storage.oc_case.field_training_type
+    - opencase_cases.oc_case_type.training
+    - system.menu.opencase
+  module:
+    - datetime
+    - opencase_cases
+    - opencase_entities
+    - options
+    - paragraphs
+    - user
+id: oc_case.project.trainings
+label: Trainings
+display_label: true
+name: trainings
+description: ''
+base_entity_type_id: oc_case
+base_bundle_type_id: project
+field_type_id: views
+field_type_config:
+  view_name: trainings
+  display: block_5
+  arguments: ''
+field_type_condition:
+  'entity_bundle:oc_case':
+    id: 'entity_bundle:oc_case'
+    bundles:
+      project: project
+    context_mapping:
+      oc_case: entity_extra_field.target_entity
+    negate: false
+  route:
+    id: route
+    routes: ''
+    negate: false
+  current_theme:
+    id: current_theme
+    theme: ''
+    negate: 0
+  request_path:
+    id: request_path
+    pages: ''
+    negate: false
+field_conditions_all_pass: false
+display:
+  type: view

config/entity_extra_field.extra_field.oc_organisation.umbrella_client.trainings_for_clients_within_this_umbrella.yml

@@ -1,4 +1,4 @@
-uuid: ca9acd77-296c-438d-9e8a-870f20b7e67e
+uuid: ce2aa5ef-25d4-4f02-921a-d6298b43210f
 langcode: en
 status: true
 dependencies:
@@ -6,9 +6,7 @@ dependencies:
     - field.storage.oc_case.field_date_of_training
     - field.storage.oc_case.field_training_status
     - field.storage.oc_case.field_training_type
-    - field.storage.oc_case.field_training_type_umbrella
     - opencase_cases.oc_case_type.training
-    - opencase_cases.oc_case_type.training_for_umbrella_client
     - system.menu.opencase
   module:
     - datetime
@@ -17,10 +15,10 @@ dependencies:
     - options
     - paragraphs
     - user
-id: oc_organisation.umbrella_client.trainings
+id: oc_organisation.umbrella_client.trainings_for_clients_within_this_umbrella
-label: 'Client trainings within this umbrella'
+label: 'Trainings for clients within this umbrella'
 display_label: true
-name: trainings
+name: trainings_for_clients_within_this_umbrella
 description: ''
 base_entity_type_id: oc_organisation
 base_bundle_type_id: umbrella_client
@@ -49,11 +47,6 @@ field_type_condition:
     id: request_path
     pages: ''
     negate: false
-  webform:
+field_conditions_all_pass: false
-    id: webform
-    webforms: {  }
-    context_mapping: {  }
-    negate: false
-field_conditions_all_pass: true
 display:
   type: view

config/entity_extra_field.extra_field.oc_organisation.umbrella_client.trainings_for_this_umbrella_client.yml

@@ -1,4 +1,4 @@
-uuid: 7e7c83ef-a642-48a0-91ad-4d85001c3209
+uuid: 22df4e28-b8ef-41ef-b1fd-d04e19ff42e8
 langcode: en
 status: true
 dependencies:
@@ -6,9 +6,7 @@ dependencies:
     - field.storage.oc_case.field_date_of_training
     - field.storage.oc_case.field_training_status
     - field.storage.oc_case.field_training_type
-    - field.storage.oc_case.field_training_type_umbrella
     - opencase_cases.oc_case_type.training
-    - opencase_cases.oc_case_type.training_for_umbrella_client
     - system.menu.opencase
   module:
     - datetime
@@ -17,10 +15,10 @@ dependencies:
     - options
     - paragraphs
     - user
-id: oc_organisation.umbrella_client.tranings_for_this_umbrella_client
+id: oc_organisation.umbrella_client.trainings_for_this_umbrella_client
-label: 'Tranings for this umbrella client'
+label: 'Trainings for this Umbrella Client'
 display_label: true
-name: tranings_for_this_umbrella_client
+name: trainings_for_this_umbrella_client
 description: ''
 base_entity_type_id: oc_organisation
 base_bundle_type_id: umbrella_client
@@ -49,11 +47,6 @@ field_type_condition:
     id: request_path
     pages: ''
     negate: false
-  webform:
+field_conditions_all_pass: false
-    id: webform
-    webforms: {  }
-    context_mapping: {  }
-    negate: false
-field_conditions_all_pass: true
 display:
   type: view

config/field.field.oc_case.training_for_umbrella_client.field_date_of_training.yml

@@ -1,21 +0,0 @@
-uuid: f222d189-fdde-4255-8525-fd0e71a00310
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_date_of_training
-    - opencase_cases.oc_case_type.training_for_umbrella_client
-  module:
-    - datetime
-id: oc_case.training_for_umbrella_client.field_date_of_training
-field_name: field_date_of_training
-entity_type: oc_case
-bundle: training_for_umbrella_client
-label: 'Date of training'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: datetime

config/field.field.oc_case.training_for_umbrella_client.field_project.yml

@@ -1,28 +0,0 @@
-uuid: 1e8039f2-6d75-4f4c-abaa-5a636ab23621
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_project
-    - opencase_cases.oc_case_type.project
-    - opencase_cases.oc_case_type.training_for_umbrella_client
-id: oc_case.training_for_umbrella_client.field_project
-field_name: field_project
-entity_type: oc_case
-bundle: training_for_umbrella_client
-label: Project
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:oc_case'
-  handler_settings:
-    target_bundles:
-      project: project
-    sort:
-      field: _none
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference

config/field.field.oc_case.training_for_umbrella_client.field_trainer.yml

@@ -1,40 +0,0 @@
-uuid: 5f261c3e-719d-4400-a60a-8de136188cb7
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_trainer
-    - opencase_cases.oc_case_type.training_for_umbrella_client
-    - paragraphs.paragraphs_type.trainer
-  module:
-    - entity_reference_revisions
-id: oc_case.training_for_umbrella_client.field_trainer
-field_name: field_trainer
-entity_type: oc_case
-bundle: training_for_umbrella_client
-label: Trainers
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:paragraph'
-  handler_settings:
-    negate: 0
-    target_bundles:
-      trainer: trainer
-    target_bundles_drag_drop:
-      availability:
-        weight: 5
-        enabled: false
-      emergency_contact:
-        weight: 6
-        enabled: false
-      fee:
-        weight: 7
-        enabled: false
-      trainer:
-        enabled: true
-        weight: 8
-field_type: entity_reference_revisions

config/field.field.oc_case.training_for_umbrella_client.field_training_type_umbrella.yml

@@ -1,21 +0,0 @@
-uuid: efc306a0-d36c-4832-8cb5-d802b528d008
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_training_type_umbrella
-    - opencase_cases.oc_case_type.training_for_umbrella_client
-  module:
-    - options
-id: oc_case.training_for_umbrella_client.field_training_type_umbrella
-field_name: field_training_type_umbrella
-entity_type: oc_case
-bundle: training_for_umbrella_client
-label: 'Training type'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string

config/field.storage.oc_case.field_training_type_umbrella.yml

@@ -1,27 +0,0 @@
-uuid: e4cc985c-4ad5-4f3a-b28e-a3212c7e873d
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_cases
-    - options
-id: oc_case.field_training_type_umbrella
-field_name: field_training_type_umbrella
-entity_type: oc_case
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: '[NAAW]'
-      label: '[NAAW]'
-    -
-      value: '[BESPOKE]'
-      label: '[BESPOKE]'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

config/opencase_cases.oc_case_type.training_for_umbrella_client.yml

@@ -1,7 +0,0 @@
-uuid: 7c9094ab-9d69-46ad-af37-fb6e151d5c3a
-langcode: en
-status: true
-dependencies: {  }
-id: training_for_umbrella_client
-label: Training
-allowedActivityTypes: null

config/system.menu.devel.yml

@@ -0,0 +1,13 @@
+uuid: d0dc58fa-693d-4b44-8fda-60678eb6e17c
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - devel
+_core:
+  default_config_hash: 3V-l1uuTcyirYOGLPZV5HWaDfr02uEbWZJIwc8Byz-c
+id: devel
+label: Development
+description: 'Links related to Devel module.'
+locked: true

config/views.view.trainings.yml

@@ -4,11 +4,10 @@ status: true
 dependencies:
   config:
     - field.storage.oc_case.field_date_of_training
+    - field.storage.oc_case.field_project
     - field.storage.oc_case.field_training_status
     - field.storage.oc_case.field_training_type
-    - field.storage.oc_case.field_training_type_umbrella
     - opencase_cases.oc_case_type.training
-    - opencase_cases.oc_case_type.training_for_umbrella_client
     - system.menu.opencase
   module:
     - datetime
@@ -503,6 +502,69 @@ display:
           separator: ', '
           field_api_classes: false
           plugin_id: field
+        field_project:
+          id: field_project
+          table: oc_case__field_project
+          field: field_project
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Project
+          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
+          plugin_id: field
       filters:
         type:
           id: type
@@ -564,6 +626,7 @@ display:
         - user.permissions
       tags:
         - 'config:field.storage.oc_case.field_date_of_training'
+        - 'config:field.storage.oc_case.field_project'
         - 'config:field.storage.oc_case.field_training_status'
         - 'config:field.storage.oc_case.field_training_type'
   block_1:
@@ -630,7 +693,6 @@ display:
           operator: in
           value:
             training: training
-            training_for_umbrella_client: training_for_umbrella_client
           group: 1
           exposed: false
           expose:
@@ -676,6 +738,7 @@ display:
         - user.permissions
       tags:
         - 'config:field.storage.oc_case.field_date_of_training'
+        - 'config:field.storage.oc_case.field_project'
         - 'config:field.storage.oc_case.field_training_status'
         - 'config:field.storage.oc_case.field_training_type'
   block_2:
@@ -730,6 +793,7 @@ display:
           entity_type: oc_case
           entity_field: client
           plugin_id: numeric
+      relationships: {  }
       fields:
         id:
           id: id
@@ -1115,7 +1179,69 @@ display:
           separator: ', '
           field_api_classes: false
           plugin_id: field
-      relationships: {  }
+        field_project:
+          id: field_project
+          table: oc_case__field_project
+          field: field_project
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Project
+          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
+          plugin_id: field
     cache_metadata:
       max-age: -1
       contexts:
@@ -1125,6 +1251,7 @@ display:
         - user.permissions
       tags:
         - 'config:field.storage.oc_case.field_date_of_training'
+        - 'config:field.storage.oc_case.field_project'
         - 'config:field.storage.oc_case.field_training_status'
         - 'config:field.storage.oc_case.field_training_type'
   block_3:
@@ -1208,6 +1335,7 @@ display:
         - user.permissions
       tags:
         - 'config:field.storage.oc_case.field_date_of_training'
+        - 'config:field.storage.oc_case.field_project'
         - 'config:field.storage.oc_case.field_training_status'
         - 'config:field.storage.oc_case.field_training_type'
   block_4:
@@ -1228,7 +1356,7 @@ display:
           admin_label: ''
           operator: in
           value:
-            training_for_umbrella_client: training_for_umbrella_client
+            training: training
           group: 1
           exposed: false
           expose:
@@ -1403,6 +1531,462 @@ display:
           entity_type: oc_case
           entity_field: name
           plugin_id: field
+        client:
+          id: client
+          table: oc_case_field_data
+          field: client
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Client
+          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: 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: oc_case
+          entity_field: client
+          plugin_id: field
+        field_date_of_training:
+          id: field_date_of_training
+          table: oc_case__field_date_of_training
+          field: field_date_of_training
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Date of training'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: datetime_default
+          settings:
+            timezone_override: ''
+            format_type: short
+          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_training_type:
+          id: field_training_type
+          table: oc_case__field_training_type
+          field: field_training_type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Training 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: value
+          type: list_default
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+        field_project:
+          id: field_project
+          table: oc_case__field_project
+          field: field_project
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Project
+          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
+          plugin_id: field
+      footer:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: true
+          content: '<a class="button" href="/opencase/oc_case/add/training?client_id={{ raw_arguments.client }}">Add training</a><br /><br />'
+          plugin_id: text_custom
+      arguments:
+        client:
+          id: client
+          table: oc_case_field_data
+          field: client
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: raw
+          default_argument_options:
+            index: 2
+            use_alias: false
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            items_per_page: 25
+            override: false
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          break_phrase: false
+          not: false
+          entity_type: oc_case
+          entity_field: client
+          plugin_id: numeric
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_case.field_date_of_training'
+        - 'config:field.storage.oc_case.field_project'
+        - 'config:field.storage.oc_case.field_training_type'
+  block_5:
+    display_plugin: block
+    id: block_5
+    display_title: 'By project'
+    position: 6
+    display_options:
+      display_extenders: {  }
+      display_description: ''
+      fields:
+        id:
+          id: id
+          table: oc_case_field_data
+          field: id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ID
+          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: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: 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: oc_case
+          entity_field: id
+          plugin_id: field
+        name:
+          id: name
+          table: oc_case_field_data
+          field: name
+          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: oc_case
+          entity_field: name
+          plugin_id: field
         client:
           id: client
           table: oc_case_field_data
@@ -1468,6 +2052,68 @@ display:
           entity_type: oc_case
           entity_field: client
           plugin_id: field
+        field_training_type:
+          id: field_training_type
+          table: oc_case__field_training_type
+          field: field_training_type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Training type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: '/opencase/oc_case/{{ id }}'
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: list_default
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
         field_date_of_training:
           id: field_date_of_training
           table: oc_case__field_date_of_training
@@ -1532,14 +2178,14 @@ display:
           separator: ', '
           field_api_classes: false
           plugin_id: field
-        field_training_type_umbrella:
+        field_training_status:
-          id: field_training_type_umbrella
+          id: field_training_status
-          table: oc_case__field_training_type_umbrella
+          table: oc_case__field_training_status
-          field: field_training_type_umbrella
+          field: field_training_status
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'Training type'
+          label: 'Training Status'
           exclude: false
           alter:
             alter_text: false
@@ -1594,23 +2240,78 @@ display:
           separator: ', '
           field_api_classes: false
           plugin_id: field
-      footer:
+        field_project:
-        area_text_custom:
+          id: field_project
-          id: area_text_custom
+          table: oc_case__field_project
-          table: views
+          field: field_project
-          field: area_text_custom
           relationship: none
           group_type: group
           admin_label: ''
-          empty: true
+          label: Project
-          tokenize: true
+          exclude: true
-          content: '<a class="button" href="/opencase/oc_case/add/training_for_umbrella_client?client_id={{ raw_arguments.client }}">Add training</a><br /><br />'
+          alter:
-          plugin_id: text_custom
+            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
+          plugin_id: field
+      defaults:
+        fields: false
+        arguments: false
+        footer: false
       arguments:
-        client:
+        field_project_target_id:
-          id: client
+          id: field_project_target_id
-          table: oc_case_field_data
+          table: oc_case__field_project
-          field: client
+          field: field_project_target_id
           relationship: none
           group_type: group
           admin_label: ''
@@ -1642,9 +2343,19 @@ display:
           validate_options: {  }
           break_phrase: false
           not: false
-          entity_type: oc_case
-          entity_field: client
           plugin_id: numeric
+      footer:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: true
+          content: '<a class="button" href="/opencase/oc_case/add/training?project_id={{ raw_arguments.field_project_target_id }}">Add training</a><br /><br />'
+          plugin_id: text_custom
     cache_metadata:
       max-age: -1
       contexts:
@@ -1654,7 +2365,9 @@ display:
         - user.permissions
       tags:
         - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_training_type_umbrella'
+        - 'config:field.storage.oc_case.field_project'
+        - 'config:field.storage.oc_case.field_training_status'
+        - 'config:field.storage.oc_case.field_training_type'
   page_2:
     display_plugin: page
     id: page_2
@@ -1693,7 +2406,6 @@ display:
           operator: in
           value:
             training: training
-            training_for_umbrella_client: training_for_umbrella_client
           group: 1
           exposed: false
           expose:
@@ -1738,5 +2450,6 @@ display:
         - user.permissions
       tags:
         - 'config:field.storage.oc_case.field_date_of_training'
+        - 'config:field.storage.oc_case.field_project'
         - 'config:field.storage.oc_case.field_training_status'
         - 'config:field.storage.oc_case.field_training_type'