From 448ea4bd62b1bb4a101cebd19b4ff2ffe64510fe Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 21 Jan 2022 15:04:25 +0000 Subject: [PATCH] Code & config for logged-in trainer being automatically added to debrief. --- composer.lock | 66 ++-- ...ay.oc_activity.trainer_debrief.default.yml | 98 +++--- ..._form_display.oc_case.training.default.yml | 26 +- ...ay.oc_activity.trainer_debrief.default.yml | 58 ++-- ..._view_display.oc_case.training.default.yml | 5 + ....extra_field.oc_case.training.debrief.yml} | 8 +- ...activity.trainer_debrief.field_trainer.yml | 28 -- ...ield.storage.oc_activity.field_trainer.yml | 23 -- config/views.view.debrief_report.yml | 295 +++++++++--------- config/views.view.debriefs.yml | 19 +- config/views.view.trainings.yml | 8 +- 11 files changed, 292 insertions(+), 342 deletions(-) rename config/{entity_extra_field.extra_field.oc_case.training.debriefs.yml => entity_extra_field.extra_field.oc_case.training.debrief.yml} (85%) delete mode 100644 config/field.field.oc_activity.trainer_debrief.field_trainer.yml delete mode 100644 config/field.storage.oc_activity.field_trainer.yml diff --git a/composer.lock b/composer.lock index 35e1a95..398c995 100644 --- a/composer.lock +++ b/composer.lock @@ -68,7 +68,7 @@ "source": { "type": "git", "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/goodnightout_opencase.git", - "reference": "e51d8772ef4edd5c5bb70148d1e929306e25ac0c" + "reference": "ce2b7044f53846cf09ef880b0499e8b86c5c11d1" }, "require": { "drupal/admin_toolbar": "*", @@ -86,7 +86,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-01-19T10:25:36+00:00" + "time": "2022-01-21T15:01:10+00:00" }, { "name": "autonomic/opencase", @@ -94,7 +94,7 @@ "source": { "type": "git", "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git", - "reference": "40435a16be02628589bf2636b8e2d7d33fbaa020" + "reference": "cc551b085103edf895673f6cc08d0a55152d303c" }, "require": { "composer/installers": "*", @@ -111,7 +111,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-01-20T15:59:39+00:00" + "time": "2022-01-21T15:00:26+00:00" }, { "name": "bjeavons/zxcvbn-php", @@ -3026,17 +3026,17 @@ }, { "name": "drupal/facets", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/facets.git", - "reference": "2.0.0" + "reference": "2.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/facets-2.0.0.zip", - "reference": "2.0.0", - "shasum": "d7f1f0a494757a174a819d779bcf13a3abbc60bb" + "url": "https://ftp.drupal.org/files/projects/facets-2.0.1.zip", + "reference": "2.0.1", + "shasum": "ec6e9de9dd1726b6ca173abd79a69d2574db3e89" }, "require": { "drupal/core": "^9.2 || ^10.0" @@ -3050,8 +3050,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0", - "datestamp": "1639140521", + "version": "2.0.1", + "datestamp": "1642699685", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3883,17 +3883,17 @@ }, { "name": "drupal/search_api", - "version": "1.22.0", + "version": "1.23.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.22" + "reference": "8.x-1.23" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.22.zip", - "reference": "8.x-1.22", - "shasum": "bac5923161436830eecdf115ef0333b3b931657e" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.23.zip", + "reference": "8.x-1.23", + "shasum": "7de5425bba5b8daa37e98d47b677459dfb1abbe7" }, "require": { "drupal/core": "^8.8 || ^9" @@ -3914,8 +3914,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.22", - "datestamp": "1641998566", + "version": "8.x-1.23", + "datestamp": "1642769872", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3955,7 +3955,7 @@ }, { "name": "drupal/search_api_db", - "version": "1.22.0", + "version": "1.23.0", "require": { "drupal/core": "^8.8 || ^9", "drupal/search_api": "*" @@ -3963,8 +3963,8 @@ "type": "metapackage", "extra": { "drupal": { - "version": "8.x-1.22", - "datestamp": "1641998566", + "version": "8.x-1.23", + "datestamp": "1642769872", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4447,16 +4447,16 @@ }, { "name": "drush/drush", - "version": "11.0.2", + "version": "11.0.3", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "3c93b6393d6a463cb1df314dae3db27fbb640cd4" + "reference": "d5c63f337f52b059cbe9d39fca2f3090980450dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/3c93b6393d6a463cb1df314dae3db27fbb640cd4", - "reference": "3c93b6393d6a463cb1df314dae3db27fbb640cd4", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/d5c63f337f52b059cbe9d39fca2f3090980450dd", + "reference": "d5c63f337f52b059cbe9d39fca2f3090980450dd", "shasum": "" }, "require": { @@ -4582,7 +4582,7 @@ "irc": "irc://irc.freenode.org/drush", "issues": "https://github.com/drush-ops/drush/issues", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/drush-ops/drush/tree/11.0.2" + "source": "https://github.com/drush-ops/drush/tree/11.0.3" }, "funding": [ { @@ -4590,7 +4590,7 @@ "type": "github" } ], - "time": "2022-01-19T13:42:06+00:00" + "time": "2022-01-21T12:52:10+00:00" }, { "name": "egulias/email-validator", @@ -10591,16 +10591,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.11", + "version": "9.5.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "2406855036db1102126125537adb1406f7242fdd" + "reference": "93d4bf4c37aec6384bb9e5d390d9049a463a7256" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2406855036db1102126125537adb1406f7242fdd", - "reference": "2406855036db1102126125537adb1406f7242fdd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/93d4bf4c37aec6384bb9e5d390d9049a463a7256", + "reference": "93d4bf4c37aec6384bb9e5d390d9049a463a7256", "shasum": "" }, "require": { @@ -10678,7 +10678,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.11" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.12" }, "funding": [ { @@ -10690,7 +10690,7 @@ "type": "github" } ], - "time": "2021-12-25T07:07:57+00:00" + "time": "2022-01-21T05:54:47+00:00" }, { "name": "sebastian/cli-parser", diff --git a/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml b/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml index 7a5d2f6..bfbeea7 100644 --- a/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml +++ b/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml @@ -7,7 +7,6 @@ dependencies: - field.field.oc_activity.trainer_debrief.field_issues_with_group_dynamics - field.field.oc_activity.trainer_debrief.field_number_of_participants - field.field.oc_activity.trainer_debrief.field_photo - - field.field.oc_activity.trainer_debrief.field_trainer - field.field.oc_activity.trainer_debrief.field_what_came_up_for_the_group - field.field.oc_activity.trainer_debrief.field_what_could_be_improved_for - field.field.oc_activity.trainer_debrief.field_what_did_facilitators_do_w @@ -22,78 +21,78 @@ bundle: trainer_debrief mode: default content: field_issues_and_difficulties: - weight: 3 - settings: - rows: 5 - placeholder: '' - third_party_settings: { } type: string_textarea - region: content - field_issues_with_group_dynamics: weight: 4 + region: content settings: rows: 5 placeholder: '' third_party_settings: { } + field_issues_with_group_dynamics: type: string_textarea + weight: 5 region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } field_number_of_participants: - weight: 0 + type: number + weight: 1 + region: content settings: placeholder: '' third_party_settings: { } - type: number - region: content field_photo: - weight: 7 + type: image_image + weight: 8 + region: content settings: progress_indicator: throbber preview_image_style: thumbnail third_party_settings: { } - type: image_image + field_what_came_up_for_the_group: + type: string_textarea + weight: 3 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_what_could_be_improved_for: + type: string_textarea + weight: 7 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_what_did_facilitators_do_w: + type: string_textarea + weight: 2 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_what_real_scenarios_or_inc: + type: string_textarea + weight: 6 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + oc_provider: + type: entity_reference_autocomplete + weight: 0 region: content - field_trainer: - weight: 8 settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' third_party_settings: { } - type: entity_reference_autocomplete - region: content - field_what_came_up_for_the_group: - weight: 2 - settings: - rows: 5 - placeholder: '' - third_party_settings: { } - type: string_textarea - region: content - field_what_could_be_improved_for: - weight: 6 - settings: - rows: 5 - placeholder: '' - third_party_settings: { } - type: string_textarea - region: content - field_what_did_facilitators_do_w: - weight: 1 - settings: - rows: 5 - placeholder: '' - third_party_settings: { } - type: string_textarea - region: content - field_what_real_scenarios_or_inc: - weight: 5 - settings: - rows: 5 - placeholder: '' - third_party_settings: { } - type: string_textarea - region: content status: type: boolean_checkbox weight: 9 @@ -103,5 +102,6 @@ content: third_party_settings: { } hidden: activity_date_time: true + client: true name: true time_taken: true diff --git a/config/core.entity_form_display.oc_case.training.default.yml b/config/core.entity_form_display.oc_case.training.default.yml index 6a37919..2b4acd0 100644 --- a/config/core.entity_form_display.oc_case.training.default.yml +++ b/config/core.entity_form_display.oc_case.training.default.yml @@ -34,52 +34,52 @@ content: placeholder: '' third_party_settings: { } field_date_of_training: + type: datetime_default weight: 4 + region: content settings: { } third_party_settings: { } - type: datetime_default - region: content field_project: + type: entity_reference_autocomplete weight: 1 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' third_party_settings: { } - type: entity_reference_autocomplete - region: content field_social_media: + type: boolean_checkbox weight: 7 + region: content settings: display_label: true third_party_settings: { } - type: boolean_checkbox - region: content field_training_delivery_format: + type: options_select weight: 5 + region: content settings: { } third_party_settings: { } - type: options_select - region: content field_training_status: + type: options_select weight: 3 + region: content settings: { } third_party_settings: { } - type: options_select - region: content field_training_type: + type: options_select weight: 2 + region: content settings: { } third_party_settings: { } - type: options_select - region: content files: type: file_generic weight: 6 + region: content settings: progress_indicator: throbber - region: content third_party_settings: { } notes: type: string_textarea diff --git a/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml b/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml index 5c187dc..11df58d 100644 --- a/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml +++ b/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml @@ -7,7 +7,6 @@ dependencies: - field.field.oc_activity.trainer_debrief.field_issues_with_group_dynamics - field.field.oc_activity.trainer_debrief.field_number_of_participants - field.field.oc_activity.trainer_debrief.field_photo - - field.field.oc_activity.trainer_debrief.field_trainer - field.field.oc_activity.trainer_debrief.field_what_came_up_for_the_group - field.field.oc_activity.trainer_debrief.field_what_could_be_improved_for - field.field.oc_activity.trainer_debrief.field_what_did_facilitators_do_w @@ -22,82 +21,83 @@ bundle: trainer_debrief mode: default content: field_issues_and_difficulties: - weight: 4 + type: basic_string label: above settings: { } third_party_settings: { } - type: basic_string + weight: 4 region: content field_issues_with_group_dynamics: - weight: 5 + type: basic_string label: above settings: { } third_party_settings: { } - type: basic_string + weight: 5 region: content field_number_of_participants: - weight: 1 + type: number_integer label: above settings: thousand_separator: '' prefix_suffix: true third_party_settings: { } - type: number_integer + weight: 1 region: content field_photo: - weight: 8 - label: above - settings: - image_style: '' - image_link: '' - third_party_settings: { } type: image - region: content - field_trainer: - weight: 9 label: above settings: - link: true + image_link: '' + image_style: '' third_party_settings: { } - type: entity_reference_label + weight: 8 region: content field_what_came_up_for_the_group: - weight: 3 + type: basic_string label: above settings: { } third_party_settings: { } - type: basic_string + weight: 3 region: content field_what_could_be_improved_for: - weight: 7 + type: basic_string label: above settings: { } third_party_settings: { } - type: basic_string + weight: 7 region: content field_what_did_facilitators_do_w: - weight: 2 + type: basic_string label: above settings: { } third_party_settings: { } - type: basic_string + weight: 2 region: content field_what_real_scenarios_or_inc: - weight: 6 + type: basic_string label: above settings: { } third_party_settings: { } - type: basic_string + weight: 6 region: content name: - label: hidden type: string - weight: 0 - region: content + label: hidden settings: link_to_entity: false third_party_settings: { } + weight: 0 + region: content + user_id: + type: author + label: above + settings: { } + third_party_settings: { } + weight: 10 + region: content hidden: activity_date_time: true + client: true + oc_provider: true search_api_excerpt: true time_taken: true diff --git a/config/core.entity_view_display.oc_case.training.default.yml b/config/core.entity_view_display.oc_case.training.default.yml index 38ec83e..c87bd20 100644 --- a/config/core.entity_view_display.oc_case.training.default.yml +++ b/config/core.entity_view_display.oc_case.training.default.yml @@ -43,6 +43,11 @@ content: third_party_settings: { } weight: 0 region: content + debrief: + settings: { } + third_party_settings: { } + weight: 10 + region: content debriefs: settings: { } third_party_settings: { } diff --git a/config/entity_extra_field.extra_field.oc_case.training.debriefs.yml b/config/entity_extra_field.extra_field.oc_case.training.debrief.yml similarity index 85% rename from config/entity_extra_field.extra_field.oc_case.training.debriefs.yml rename to config/entity_extra_field.extra_field.oc_case.training.debrief.yml index 1c38d63..33f31c1 100644 --- a/config/entity_extra_field.extra_field.oc_case.training.debriefs.yml +++ b/config/entity_extra_field.extra_field.oc_case.training.debrief.yml @@ -1,20 +1,18 @@ -uuid: 04731977-d193-4dc9-9e24-5f17a8ff5ac2 +uuid: 72f123c9-f0ab-4c83-b87a-f8e02c7d92fc langcode: en status: true dependencies: config: - - field.storage.oc_activity.field_trainer - opencase_entities.oc_activity_type.trainer_debrief - user.role.authenticated module: - - datetime - opencase_cases - opencase_entities - user -id: oc_case.training.debriefs +id: oc_case.training.debrief label: Debrief display_label: true -name: debriefs +name: debrief description: '' base_entity_type_id: oc_case base_bundle_type_id: training diff --git a/config/field.field.oc_activity.trainer_debrief.field_trainer.yml b/config/field.field.oc_activity.trainer_debrief.field_trainer.yml deleted file mode 100644 index f6f53c6..0000000 --- a/config/field.field.oc_activity.trainer_debrief.field_trainer.yml +++ /dev/null @@ -1,28 +0,0 @@ -uuid: e52c7893-2f84-4b78-b2b8-8313bd936852 -langcode: en -status: true -dependencies: - config: - - field.storage.oc_activity.field_trainer - - opencase_entities.oc_activity_type.trainer_debrief - - opencase_entities.oc_actor_type.trainer -id: oc_activity.trainer_debrief.field_trainer -field_name: field_trainer -entity_type: oc_activity -bundle: trainer_debrief -label: Trainer -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:oc_actor' - handler_settings: - target_bundles: - trainer: trainer - sort: - field: _none - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/field.storage.oc_activity.field_trainer.yml b/config/field.storage.oc_activity.field_trainer.yml deleted file mode 100644 index 3090a03..0000000 --- a/config/field.storage.oc_activity.field_trainer.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: c2c14026-cbe7-490e-8504-f560773d7f81 -langcode: en -status: true -dependencies: - module: - - field_permissions - - opencase_entities -third_party_settings: - field_permissions: - permission_type: public -id: oc_activity.field_trainer -field_name: field_trainer -entity_type: oc_activity -type: entity_reference -settings: - target_type: oc_actor -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/views.view.debrief_report.yml b/config/views.view.debrief_report.yml index b9055f3..02e6363 100644 --- a/config/views.view.debrief_report.yml +++ b/config/views.view.debrief_report.yml @@ -3,7 +3,6 @@ langcode: en status: true dependencies: config: - - field.storage.oc_activity.field_trainer - opencase_entities.oc_activity_type.trainer_debrief - system.menu.opencase - user.role.gno_admin_user @@ -19,59 +18,12 @@ base_table: oc_activity_field_data base_field: id display: default: - display_plugin: default id: default display_title: Master + display_plugin: default position: 0 display_options: - access: - 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 + title: 'Debrief Report' fields: created: id: created @@ -80,6 +32,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: oc_activity + entity_field: created + plugin_id: field label: 'Date submitted' exclude: false alter: @@ -137,72 +92,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: oc_activity - entity_field: created - plugin_id: field - field_trainer: - id: field_trainer - table: oc_activity__field_trainer - field: field_trainer - relationship: none - group_type: group - admin_label: '' - label: Trainer - 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 oc_case: id: oc_case table: oc_activity_field_data @@ -210,6 +99,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: oc_activity + entity_field: oc_case + plugin_id: field label: Training exclude: false alter: @@ -265,19 +157,131 @@ display: multi_type: separator separator: ', ' field_api_classes: false + oc_provider: + id: oc_provider + table: oc_activity_field_data + field: oc_provider + relationship: none + group_type: group + admin_label: '' entity_type: oc_activity - entity_field: oc_case + entity_field: oc_provider plugin_id: field + label: Trainer + 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 + pager: + type: mini + 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: type: id: type table: oc_activity_field_data field: type - value: - trainer_debrief: trainer_debrief entity_type: oc_activity entity_field: type plugin_id: bundle + value: + trainer_debrief: trainer_debrief expose: operator_limit_selection: false operator_list: { } @@ -288,6 +292,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: oc_activity + entity_field: created + plugin_id: date operator: between value: min: '' @@ -315,9 +322,9 @@ display: gno_admin_user: '0' follow_up_alerts: '0' newly_accredited_alerts: '0' - placeholder: '' min_placeholder: '' max_placeholder: '' + placeholder: '' is_grouped: false group_info: label: '' @@ -330,27 +337,21 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: oc_activity - entity_field: created - plugin_id: date - sorts: { } - title: 'Debrief Report' + style: + type: table + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - 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: 'None found' - plugin_id: text_custom - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 @@ -360,26 +361,25 @@ display: - url - url.query_args - user.roles - tags: - - 'config:field.storage.oc_activity.field_trainer' + tags: { } page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: + exposed_block: true display_extenders: { } path: debrief-report menu: type: normal title: 'Debrief 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: @@ -388,5 +388,4 @@ display: - url - url.query_args - user.roles - tags: - - 'config:field.storage.oc_activity.field_trainer' + tags: { } diff --git a/config/views.view.debriefs.yml b/config/views.view.debriefs.yml index 5045171..8a651f5 100644 --- a/config/views.view.debriefs.yml +++ b/config/views.view.debriefs.yml @@ -3,7 +3,6 @@ langcode: en status: true dependencies: config: - - field.storage.oc_activity.field_trainer - opencase_entities.oc_activity_type.trainer_debrief - user.role.authenticated module: @@ -28,13 +27,15 @@ display: display_options: title: Debrief fields: - field_trainer: - id: field_trainer - table: oc_activity__field_trainer - field: field_trainer + oc_provider: + id: oc_provider + table: oc_activity_field_data + field: oc_provider relationship: none group_type: group admin_label: '' + entity_type: oc_activity + entity_field: oc_provider plugin_id: field label: Trainer exclude: false @@ -80,7 +81,7 @@ display: click_sort_column: target_id type: entity_reference_label settings: - link: false + link: true group_column: target_id group_columns: { } group_rows: true @@ -540,8 +541,7 @@ display: - 'languages:language_interface' - url - user.roles - tags: - - 'config:field.storage.oc_activity.field_trainer' + tags: { } block_1: id: block_1 display_title: Block @@ -557,5 +557,4 @@ display: - 'languages:language_interface' - url - user.roles - tags: - - 'config:field.storage.oc_activity.field_trainer' + tags: { } diff --git a/config/views.view.trainings.yml b/config/views.view.trainings.yml index a2f3da3..c0a5662 100644 --- a/config/views.view.trainings.yml +++ b/config/views.view.trainings.yml @@ -1110,15 +1110,15 @@ display: options: offset: 0 sorts: - client: - id: client + name: + id: name table: oc_case_field_data - field: client + field: name relationship: none group_type: group admin_label: '' entity_type: oc_case - entity_field: client + entity_field: name plugin_id: standard order: ASC expose: