Added photo caption field to debrief

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_caption_for_photo
     - 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
@@ -20,6 +21,14 @@ targetEntityType: oc_activity
 bundle: trainer_debrief
 mode: default
 content:
+  field_caption_for_photo:
+    type: string_textarea
+    weight: 9
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   field_issues_and_difficulties:
     type: string_textarea
     weight: 4
@@ -95,7 +104,7 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 9
+    weight: 10
     region: content
     settings:
       display_label: true

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

@@ -13,18 +13,28 @@ bundle: trainer
 mode: default
 content:
   field_rate:
+    type: number
     weight: 2
+    region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number
-    region: content
   field_rate_type:
+    type: options_buttons
     weight: 3
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
+  oc_case:
+    type: entity_reference_autocomplete
+    weight: 4
     region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   oc_case_provider_role:
     type: options_select
     weight: 1

config/core.entity_form_display.user.user.default.yml

@@ -3,10 +3,14 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.user.user.field_last_password_reset
     - field.field.user.user.field_linked_opencase_actor
+    - field.field.user.user.field_password_expiration
+    - field.field.user.user.field_pending_expire_sent
     - field.field.user.user.user_picture
     - image.style.thumbnail
   module:
+    - datetime
     - image
     - user
 _core:
@@ -26,6 +30,12 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  field_last_password_reset:
+    type: datetime_default
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   field_linked_opencase_actor:
     type: entity_reference_autocomplete
     weight: 1
@@ -36,6 +46,13 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_password_expiration:
+    type: boolean_checkbox
+    weight: 3
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   language:
     weight: 3
     region: content
@@ -52,4 +69,5 @@ content:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-hidden: {  }
+hidden:
+  field_pending_expire_sent: 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_caption_for_photo
     - 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
@@ -20,6 +21,13 @@ targetEntityType: oc_activity
 bundle: trainer_debrief
 mode: default
 content:
+  field_caption_for_photo:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 9
+    region: content
   field_issues_and_difficulties:
     type: basic_string
     label: above

config/core.entity_view_display.user.user.compact.yml

@@ -4,7 +4,10 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.user.compact
+    - field.field.user.user.field_last_password_reset
     - field.field.user.user.field_linked_opencase_actor
+    - field.field.user.user.field_password_expiration
+    - field.field.user.user.field_pending_expire_sent
     - field.field.user.user.user_picture
     - image.style.thumbnail
   module:
@@ -19,14 +22,17 @@ mode: compact
 content:
   user_picture:
     type: image
+    label: hidden
+    settings:
+      image_link: content
+      image_style: thumbnail
+    third_party_settings: {  }
     weight: 0
     region: content
-    settings:
-      image_style: thumbnail
-      image_link: content
-    third_party_settings: {  }
-    label: hidden
 hidden:
+  field_last_password_reset: true
   field_linked_opencase_actor: true
+  field_password_expiration: true
+  field_pending_expire_sent: true
   member_for: true
   search_api_excerpt: true

config/core.entity_view_display.user.user.default.yml

@@ -3,7 +3,10 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.user.user.field_last_password_reset
     - field.field.user.user.field_linked_opencase_actor
+    - field.field.user.user.field_password_expiration
+    - field.field.user.user.field_pending_expire_sent
     - field.field.user.user.user_picture
     - image.style.thumbnail
   module:
@@ -39,4 +42,7 @@ content:
     weight: 1
     region: content
 hidden:
+  field_last_password_reset: true
+  field_password_expiration: true
+  field_pending_expire_sent: true
   search_api_excerpt: true

config/core.extension.yml

@@ -53,6 +53,7 @@ module:
   opencase_search: 0
   options: 0
   page_cache: 0
+  password_strength: 0
   path: 0
   path_alias: 0
   quickedit: 0
@@ -79,6 +80,7 @@ module:
   views_autosubmit: 0
   views_summarize: 0
   views_ui: 0
+  password_policy: 10
   views: 10
   paragraphs: 11
   standard: 1000

config/feeds.feed_type.cav_projects_2.yml

@@ -39,14 +39,17 @@ custom_sources:
     label: CLIENT
     value: CLIENT
     machine_name: client
+    type: csv
   project:
     label: PROJECT
     value: PROJECT
     machine_name: project
+    type: csv
   project_date:
     label: 'PROJECT DATE'
     value: 'PROJECT DATE'
     machine_name: project_date
+    type: csv
 mappings:
   -
     target: name

config/feeds.feed_type.csv_case_provisions.yml

@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - core.base_field_override.oc_case_provision.trainer.oc_provider
     - opencase_cases.oc_case_provision_type.trainer
   module:
     - opencase_cases
@@ -38,26 +39,32 @@ custom_sources:
     label: Training
     value: Training
     machine_name: training
+    type: csv
   trainer:
     label: Trainer
     value: Trainer
     machine_name: trainer
+    type: csv
   role:
     label: Role
     value: Role
     machine_name: role
+    type: csv
   trainer_:
     label: Trainer
     value: Trainer
     machine_name: trainer_
+    type: csv
   name:
     label: Name
     value: Name
     machine_name: name
+    type: csv
   loop:
     label: Loop
     value: Loop
     machine_name: loop
+    type: csv
 mappings:
   -
     target: oc_case

config/feeds.feed_type.csv_clients.yml

@@ -42,26 +42,32 @@ custom_sources:
     label: Tags
     value: Tags
     machine_name: tags
+    type: csv
   name:
     label: Name
     value: Name
     machine_name: name
+    type: csv
   umbrella_client:
     label: 'Umbrella Client'
     value: 'Umbrella Client'
     machine_name: umbrella_client
+    type: csv
   client_type:
     label: 'Client type'
     value: 'Client type'
     machine_name: client_type
+    type: csv
   client_subtype:
     label: 'Client subtype'
     value: 'Client subtype'
     machine_name: client_subtype
+    type: csv
   umbrella_client_2:
     label: 'Umbrella client'
     value: 'Umbrella client'
     machine_name: umbrella_client_2
+    type: csv
 mappings:
   -
     target: field_tags

config/feeds.feed_type.csv_fee_categories_and_fees.yml

@@ -38,18 +38,22 @@ custom_sources:
     label: 'FEE CATEGORY'
     value: 'FEE CATEGORY'
     machine_name: fee_category
+    type: csv
   fee_amount:
     label: 'FEE AMOUNT'
     value: 'FEE AMOUNT'
     machine_name: fee_amount
+    type: csv
   project:
     label: PROJECT
     value: PROJECT
     machine_name: project
+    type: csv
   name:
     label: NAME
     value: NAME
     machine_name: name
+    type: csv
 mappings:
   -
     target: oc_fee_category

config/feeds.feed_type.csv_training_entities.yml

@@ -41,26 +41,32 @@ custom_sources:
     label: CLIENT
     value: CLIENT
     machine_name: client
+    type: csv
   training_name:
     label: 'TRAINING NAME'
     value: 'TRAINING NAME'
     machine_name: training_name
+    type: csv
   training_type:
     label: 'TRAINING TYPE'
     value: 'TRAINING TYPE'
     machine_name: training_type
+    type: csv
   date_of_training:
     label: 'DATE OF TRAINING'
     value: 'DATE OF TRAINING'
     machine_name: date_of_training
+    type: csv
   number_of_participants:
     label: 'NUMBER OF PARTICIPANTS'
     value: 'NUMBER OF PARTICIPANTS'
     machine_name: number_of_participants
+    type: csv
   notes:
     label: NOTES
     value: NOTES
     machine_name: notes
+    type: csv
 mappings:
   -
     target: client

config/feeds.feed_type.csv_umbrella_client.yml

@@ -39,14 +39,17 @@ custom_sources:
     label: name
     value: name
     machine_name: name
+    type: csv
   field_type_of_umbrella_client:
     label: field_type_of_umbrella_client
     value: field_type_of_umbrella_client
     machine_name: field_type_of_umbrella_client
+    type: csv
   contact_name:
     label: contact_name
     value: contact_name
     machine_name: contact_name
+    type: csv
 mappings:
   -
     target: name

config/field.field.oc_activity.trainer_debrief.field_caption_for_photo.yml

@@ -0,0 +1,19 @@
+uuid: b9f11c90-860d-473c-bbb7-485742ca4cff
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_activity.field_caption_for_photo
+    - opencase_entities.oc_activity_type.trainer_debrief
+id: oc_activity.trainer_debrief.field_caption_for_photo
+field_name: field_caption_for_photo
+entity_type: oc_activity
+bundle: trainer_debrief
+label: 'Caption for photo'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long

config/field.field.user.user.field_last_password_reset.yml

@@ -0,0 +1,29 @@
+uuid: 6482cced-5372-40f2-9dea-2649c3594838
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.user.field_last_password_reset
+  module:
+    - datetime
+    - user
+  enforced:
+    module:
+      - password_policy
+_core:
+  default_config_hash: 9KNibQftQSQkxINz3CmNcDC0f6rp2Krw6lkJ2en-G7g
+id: user.user.field_last_password_reset
+field_name: field_last_password_reset
+entity_type: user
+bundle: user
+label: 'Last Password Reset'
+description: ''
+required: false
+translatable: false
+default_value:
+  -
+    default_date_type: now
+    default_date: now
+default_value_callback: ''
+settings: {  }
+field_type: datetime

config/field.field.user.user.field_password_expiration.yml

@@ -0,0 +1,29 @@
+uuid: 0cd16f22-646d-4012-bca6-f30bf84db5ca
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.user.field_password_expiration
+  module:
+    - user
+  enforced:
+    module:
+      - password_policy
+_core:
+  default_config_hash: 0ivgsjOQ8AUH27JwMzGE7C0VC8M0dGiAZd1JKmC1liQ
+id: user.user.field_password_expiration
+field_name: field_password_expiration
+entity_type: user
+bundle: user
+label: 'Password Expiration'
+description: 'Control whether the user must reset their password. If the password has expired, this field is automatically checked after the execution of Cron.'
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'Expired Password'
+  off_label: 'Non-expired Password'
+field_type: boolean

config/field.field.user.user.field_pending_expire_sent.yml

@@ -0,0 +1,31 @@
+uuid: 2e6b10f8-5337-4d7c-8252-a3fcd736e09c
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.user.field_pending_expire_sent
+  module:
+    - user
+  enforced:
+    module:
+      - password_policy
+_core:
+  default_config_hash: oYe3JWMO6vLsJ9iypb1Bg9YQcT3TGqGtKwzHc3jcTXg
+id: user.user.field_pending_expire_sent
+field_name: field_pending_expire_sent
+entity_type: user
+bundle: user
+label: 'Pending Expiration Mail Count'
+description: 'Whether an email notifying of a pending password expiration has been sent'
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  min: 0
+  max: null
+  prefix: ''
+  suffix: ''
+field_type: integer

config/field.storage.oc_activity.field_caption_for_photo.yml

@@ -0,0 +1,19 @@
+uuid: efe1c754-c21b-4bc9-a8ef-3f238c87edf3
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+id: oc_activity.field_caption_for_photo
+field_name: field_caption_for_photo
+entity_type: oc_activity
+type: string_long
+settings:
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/field.storage.user.field_last_password_reset.yml

@@ -0,0 +1,25 @@
+uuid: e5b7ebb7-c2eb-45d8-ad18-aefd62362b8f
+langcode: en
+status: true
+dependencies:
+  module:
+    - datetime
+    - user
+  enforced:
+    module:
+      - password_policy
+_core:
+  default_config_hash: fe_vhJzBU4DNfc97fsLUU54pydpOw-caxcFMckk-UA4
+id: user.field_last_password_reset
+field_name: field_last_password_reset
+entity_type: user
+type: datetime
+settings:
+  datetime_type: datetime
+module: datetime
+locked: true
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/field.storage.user.field_password_expiration.yml

@@ -0,0 +1,23 @@
+uuid: 446e3a97-1ae2-4bec-8b2d-6be49a09ddb3
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+  enforced:
+    module:
+      - password_policy
+_core:
+  default_config_hash: hZ92ctP_IPOvYwFWeh-8cu0xIcJJXuJ0nV-6IbQT3vM
+id: user.field_password_expiration
+field_name: field_password_expiration
+entity_type: user
+type: boolean
+settings: {  }
+module: core
+locked: true
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/field.storage.user.field_pending_expire_sent.yml

@@ -0,0 +1,25 @@
+uuid: 73d33e56-f266-480c-8d66-1e21ef9777ba
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+  enforced:
+    module:
+      - password_policy
+_core:
+  default_config_hash: FkcjtYqR-bTc6oZBLdP6A89u1UPfdRIV1NYQg_kkUkg
+id: user.field_pending_expire_sent
+field_name: field_pending_expire_sent
+entity_type: user
+type: integer
+settings:
+  unsigned: false
+  size: normal
+module: core
+locked: true
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/password_policy.settings.yml

@@ -0,0 +1,3 @@
+_core:
+  default_config_hash: ylS3vsh8Ssk63Wrb_g1Np12zqe2qfK0NX4AOV1OYgLQ
+cron_threshold: 250

config/password_strength.settings.yml

@@ -0,0 +1,11 @@
+_core:
+  default_config_hash: YeBe2Sr-ePva2qvjDyOI1kxGGr8by1JqcGGm6YINNnI
+enabled_matchers:
+  zxcvbn_datematch: zxcvbn_datematch
+  zxcvbn_digitmatch: zxcvbn_digitmatch
+  zxcvbn_l33tmatch: zxcvbn_l33tmatch
+  zxcvbn_repeatmatch: zxcvbn_repeatmatch
+  zxcvbn_sequencematch: zxcvbn_sequencematch
+  zxcvbn_spatialmatch: zxcvbn_spatialmatch
+  zxcvbn_yearmatch: zxcvbn_yearmatch
+  zxcvbn_dictionarymatch: zxcvbn_dictionarymatch

config/views.view.case_provision_report.yml

@@ -21,59 +21,12 @@ base_table: oc_case_provision_field_data
 base_field: id
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
+      title: 'Trainer report'
-        type: role
-        options:
-          role:
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: mini
-        options:
-          items_per_page: 50
-          offset: 0
-          id: 0
-          total_pages: null
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: ‹‹
-            next: ››
-      style:
-        type: table
-      row:
-        type: fields
       fields:
         oc_provider:
           id: oc_provider
@@ -82,6 +35,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_provider
+          plugin_id: field
           label: Trainer
           exclude: false
           alter:
@@ -137,9 +93,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: oc_case_provision
-          entity_field: oc_provider
-          plugin_id: field
         oc_case:
           id: oc_case
           table: oc_case_provision_field_data
@@ -147,6 +100,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case
+          plugin_id: field
           label: Training
           exclude: false
           alter:
@@ -202,9 +158,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: oc_case_provision
-          entity_field: oc_case
-          plugin_id: field
         client:
           id: client
           table: oc_case_field_data
@@ -212,6 +165,9 @@ display:
           relationship: oc_case
           group_type: group
           admin_label: ''
+          entity_type: oc_case
+          entity_field: client
+          plugin_id: field
           label: Client
           exclude: false
           alter:
@@ -267,9 +223,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: field
         field_rate:
           id: field_rate
           table: oc_case_provision__field_rate
@@ -277,6 +230,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: Rate
           exclude: false
           alter:
@@ -322,9 +276,9 @@ display:
           type: number_decimal
           settings:
             thousand_separator: ','
-            prefix_suffix: true
             decimal_separator: .
             scale: 2
+            prefix_suffix: true
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -335,7 +289,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
         field_rate_type:
           id: field_rate_type
           table: oc_case_provision__field_rate_type
@@ -343,6 +296,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: 'Rate type'
           exclude: false
           alter:
@@ -397,7 +351,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
         oc_case_provider_role:
           id: oc_case_provider_role
           table: oc_case_provision_field_data
@@ -405,6 +358,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case_provider_role
+          plugin_id: field
           label: Role
           exclude: false
           alter:
@@ -460,23 +416,70 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: oc_case_provision
+      pager:
-          entity_field: oc_case_provider_role
+        type: mini
-          plugin_id: field
+        options:
+          offset: 0
+          items_per_page: 50
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+          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
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: true
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: role
+        options:
+          role:
+            gno_admin_user: gno_admin_user
+      cache:
+        type: tag
+        options: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text_custom
+          empty: true
+          content: 'None found'
+          tokenize: false
+      sorts: {  }
+      arguments: {  }
       filters:
         status:
-          value: '1'
+          id: status
           table: oc_case_provision_field_data
           field: status
-          plugin_id: boolean
           entity_type: oc_case_provision
           entity_field: status
-          id: status
+          plugin_id: boolean
+          value: '1'
+          group: 1
           expose:
             operator: ''
             operator_limit_selection: false
             operator_list: {  }
-          group: 1
         first_name:
           id: first_name
           table: oc_actor_field_data
@@ -484,6 +487,9 @@ display:
           relationship: oc_provider
           group_type: group
           admin_label: ''
+          entity_type: oc_actor
+          entity_field: first_name
+          plugin_id: string
           operator: '='
           value: ''
           group: 1
@@ -520,9 +526,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: oc_actor
-          entity_field: first_name
-          plugin_id: string
         last_name:
           id: last_name
           table: oc_actor_field_data
@@ -530,6 +533,9 @@ display:
           relationship: oc_provider
           group_type: group
           admin_label: ''
+          entity_type: oc_actor
+          entity_field: last_name
+          plugin_id: string
           operator: '='
           value: ''
           group: 1
@@ -566,25 +572,79 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: oc_actor
+      style:
-          entity_field: last_name
+        type: table
-          plugin_id: string
+        options:
-      sorts: {  }
+          grouping: {  }
-      title: 'Trainer report'
+          row_class: ''
-      header: {  }
+          default_row_class: true
-      footer: {  }
+          columns:
-      empty:
+            oc_provider: oc_provider
-        area_text_custom:
+            oc_case: oc_case
-          id: area_text_custom
+            client: client
-          table: views
+            field_rate: field_rate
-          field: area_text_custom
+            field_rate_type: field_rate_type
-          relationship: none
+            oc_case_provider_role: oc_case_provider_role
-          group_type: group
+          default: '-1'
-          admin_label: ''
+          info:
-          empty: true
+            oc_provider:
-          tokenize: false
+              sortable: true
-          content: 'None found'
+              default_sort_order: asc
-          plugin_id: text_custom
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            oc_case:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            client:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_rate:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_rate_type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            oc_case_provider_role:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          override: true
+          sticky: false
+          summary: ''
+          empty_table: false
+          caption: ''
+          description: ''
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
       relationships:
         oc_case:
           id: oc_case
@@ -593,10 +653,10 @@ display:
           relationship: none
           group_type: group
           admin_label: Case
-          required: false
           entity_type: oc_case_provision
           entity_field: oc_case
           plugin_id: standard
+          required: false
         client:
           id: client
           table: oc_case_field_data
@@ -604,10 +664,10 @@ display:
           relationship: oc_case
           group_type: group
           admin_label: Organisation
-          required: false
           entity_type: oc_case
           entity_field: client
           plugin_id: standard
+          required: false
         oc_provider:
           id: oc_provider
           table: oc_case_provision_field_data
@@ -615,11 +675,12 @@ display:
           relationship: none
           group_type: group
           admin_label: Person
-          required: false
           entity_type: oc_case_provision
           entity_field: oc_provider
           plugin_id: standard
-      arguments: {  }
+          required: false
+      header: {  }
+      footer: {  }
       display_extenders: {  }
     cache_metadata:
       max-age: -1
@@ -633,23 +694,23 @@ display:
         - 'config:field.storage.oc_case_provision.field_rate'
         - 'config:field.storage.oc_case_provision.field_rate_type'
   page_1:
-    display_plugin: page
     id: page_1
     display_title: Page
+    display_plugin: page
     position: 1
     display_options:
+      exposed_block: true
       display_extenders: {  }
       path: trainer-report
       menu:
         type: normal
         title: 'Trainer report'
         description: ''
-        expanded: false
-        parent: opencase.reporting
         weight: 0
-        context: '0'
+        expanded: false
         menu_name: opencase
-      exposed_block: true
+        parent: opencase.reporting
+        context: '0'
     cache_metadata:
       max-age: -1
       contexts:

config/views.view.trainings.yml

@@ -553,10 +553,12 @@ display:
           default_row_class: true
           columns:
             id: id
+            name: name
             client: client
             field_training_type: field_training_type
             field_date_of_training: field_date_of_training
-            field_trainer: field_trainer
+            field_training_status: field_training_status
+            field_project: field_project
           default: '-1'
           info:
             id:
@@ -566,30 +568,46 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
             client:
-              sortable: false
+              sortable: true
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
             field_training_type:
-              sortable: false
+              sortable: true
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
             field_date_of_training:
-              sortable: false
+              sortable: true
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            field_trainer:
+            field_training_status:
+              sortable: true
+              default_sort_order: asc
               align: ''
-              separator: ','
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_project:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
               empty_column: false
               responsive: ''
           override: true
@@ -1261,6 +1279,7 @@ display:
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
+        - url.query_args
         - user.roles
       tags:
         - 'config:field.storage.oc_case.field_date_of_training'