From 788b441d93e6a0be30c240ea5056d9e280c1c43c Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 7 May 2022 11:11:40 +0100 Subject: [PATCH 01/13] Readded trainings extra field config that had gone missing --- ...field.oc_organisation.client.trainings.yml | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml diff --git a/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml b/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml new file mode 100644 index 0000000..14f3ee7 --- /dev/null +++ b/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml @@ -0,0 +1,46 @@ +uuid: 8a57272e-e5d7-45cf-94f2-9bdb9c734cb9 +langcode: en +status: true +dependencies: + config: + - field.storage.oc_case.field_date_of_training + - field.storage.oc_case.field_trainer + - field.storage.paragraph.field_trainer + - opencase_cases.oc_case_type.training + - system.menu.opencase + module: + - datetime + - entity_reference_revisions + - opencase_cases + - paragraphs + - user +_core: + default_config_hash: Of0WcqhFUX1HB3oQfisZ29RgEzlpmN7kiIRRYU2nzMo +id: oc_organisation.client.trainings +label: Trainings +display_label: true +name: trainings +description: '' +base_entity_type_id: oc_organisation +base_bundle_type_id: client +field_type_id: views +field_type_config: + view_name: trainings + display: block_2 + arguments: '' +field_type_condition: + route: + id: route + negate: false + routes: '' + request_path: + id: request_path + negate: false + pages: '' + current_theme: + id: current_theme + theme: '' + negate: 0 +field_conditions_all_pass: false +display: + type: view From 1dc50858d6582d314fa0d8f6960de16d6bbe452c Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 7 May 2022 10:43:02 +0100 Subject: [PATCH 02/13] =?UTF-8?q?Reports=20=E2=80=A2=20Cannot=20sort=20col?= =?UTF-8?q?umns?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/views.view.case_fees_report.yml | 24 ++++-- config/views.view.client_report.yml | 34 ++++++-- config/views.view.debrief_report.yml | 37 ++++++++ config/views.view.evaluation_report.yml | 109 ++++++++++++++++++++++++ 4 files changed, 190 insertions(+), 14 deletions(-) diff --git a/config/views.view.case_fees_report.yml b/config/views.view.case_fees_report.yml index 16f40a1..f626605 100644 --- a/config/views.view.case_fees_report.yml +++ b/config/views.view.case_fees_report.yml @@ -1233,6 +1233,7 @@ display: client: client field_client_type: field_client_type field_client_subtype: field_client_subtype + field_tags: field_tags oc_case: oc_case field_contract_signed_date: field_contract_signed_date oc_fee_category: oc_fee_category @@ -1240,63 +1241,68 @@ display: default: '-1' info: field_umbrella_client: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_type_of_umbrella_client: - sortable: false + 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_client_type: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_client_subtype: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' + field_tags: + align: '' + separator: '' + empty_column: false + responsive: '' oc_case: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_contract_signed_date: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' oc_fee_category: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' amount: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' diff --git a/config/views.view.client_report.yml b/config/views.view.client_report.yml index f5467c5..4d6930c 100644 --- a/config/views.view.client_report.yml +++ b/config/views.view.client_report.yml @@ -1161,34 +1161,51 @@ display: field_accreditation_date: field_accreditation_date field_client_type: field_client_type field_client_subtype: field_client_subtype + field_client_status: field_client_status + field_client_substatus: field_client_substatus field_tags: field_tags field_umbrella_client: field_umbrella_client field_type_of_umbrella_client: field_type_of_umbrella_client + postal_address: postal_address default: '-1' info: name: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_accreditation_date: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_client_type: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_client_subtype: - sortable: false + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_client_status: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_client_substatus: + sortable: true default_sort_order: asc align: '' separator: '' @@ -1200,7 +1217,7 @@ display: empty_column: false responsive: '' field_umbrella_client: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' @@ -1213,6 +1230,13 @@ display: separator: '' empty_column: false responsive: '' + postal_address: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' override: true sticky: false summary: '' diff --git a/config/views.view.debrief_report.yml b/config/views.view.debrief_report.yml index f99219d..1629998 100644 --- a/config/views.view.debrief_report.yml +++ b/config/views.view.debrief_report.yml @@ -342,6 +342,43 @@ display: group_items: { } style: type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + created: created + oc_case: oc_case + oc_provider: oc_provider + default: '-1' + info: + created: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + oc_case: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + oc_provider: + 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: diff --git a/config/views.view.evaluation_report.yml b/config/views.view.evaluation_report.yml index 836e9bd..939953b 100644 --- a/config/views.view.evaluation_report.yml +++ b/config/views.view.evaluation_report.yml @@ -1436,6 +1436,115 @@ display: 1: AND style: type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + client: client + field_client_type: field_client_type + oc_case: oc_case + created: created + field_age: field_age + field_gender: field_gender + field_before_skills: field_before_skills + field_after_skills: field_after_skills + field_b: field_b + field_after_knowledge: field_after_knowledge + field_before_confidence: field_before_confidence + field_a: field_a + default: '-1' + info: + client: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_client_type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + oc_case: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + created: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_age: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_gender: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_before_skills: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_after_skills: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_b: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_after_knowledge: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_before_confidence: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_a: + 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: From 13b1d17f62b8feb0d30b26d6a3d8f867ad108e62 Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 7 May 2022 11:14:53 +0100 Subject: [PATCH 03/13] And another missing config --- .../field.storage.oc_case.field_trainer.yml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 config/field.storage.oc_case.field_trainer.yml diff --git a/config/field.storage.oc_case.field_trainer.yml b/config/field.storage.oc_case.field_trainer.yml new file mode 100644 index 0000000..ccf0eeb --- /dev/null +++ b/config/field.storage.oc_case.field_trainer.yml @@ -0,0 +1,23 @@ +uuid: 89971a6a-34b5-41aa-869d-a343c2f96e55 +langcode: en +status: true +dependencies: + module: + - entity_reference_revisions + - opencase_cases + - paragraphs +_core: + default_config_hash: Pmyzz5YecwFkTwL_KrDpiCYyP24kjfrahEfTN4OZOc4 +id: oc_case.field_trainer +field_name: field_trainer +entity_type: oc_case +type: entity_reference_revisions +settings: + target_type: paragraph +module: entity_reference_revisions +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false From bbeb1996ea248bd148be6a77e1d1216ac6b316aa Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 7 May 2022 11:21:24 +0100 Subject: [PATCH 04/13] and again --- ...d.field.oc_case.training.field_trainer.yml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 config/field.field.oc_case.training.field_trainer.yml diff --git a/config/field.field.oc_case.training.field_trainer.yml b/config/field.field.oc_case.training.field_trainer.yml new file mode 100644 index 0000000..eee6f4f --- /dev/null +++ b/config/field.field.oc_case.training.field_trainer.yml @@ -0,0 +1,33 @@ +uuid: c722bc26-a033-4f9d-8f04-a65b247e113b +langcode: en +status: true +dependencies: + config: + - field.storage.oc_case.field_trainer + - opencase_cases.oc_case_type.training + - paragraphs.paragraphs_type.trainer + module: + - entity_reference_revisions +_core: + default_config_hash: o2DTDQHJfJCyEoBkkDbvkoaAFv-DRtgFn_nGl4in-0s +id: oc_case.training.field_trainer +field_name: field_trainer +entity_type: oc_case +bundle: training +label: Trainers +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:paragraph' + handler_settings: + target_bundles: + trainer: trainer + negate: 0 + target_bundles_drag_drop: + trainer: + weight: 2 + enabled: true +field_type: entity_reference_revisions From ba228ef6c560dbf3a04b2cfbcb3c9ccd5a9fd6ef Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 7 May 2022 11:36:08 +0100 Subject: [PATCH 05/13] deleted old trainers paragraph field --- ...field.oc_organisation.client.trainings.yml | 21 ++++++++---- ...d.field.oc_case.training.field_trainer.yml | 33 ------------------- .../field.storage.oc_case.field_trainer.yml | 23 ------------- 3 files changed, 14 insertions(+), 63 deletions(-) delete mode 100644 config/field.field.oc_case.training.field_trainer.yml delete mode 100644 config/field.storage.oc_case.field_trainer.yml diff --git a/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml b/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml index 14f3ee7..e0c9110 100644 --- a/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml +++ b/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml @@ -1,24 +1,25 @@ -uuid: 8a57272e-e5d7-45cf-94f2-9bdb9c734cb9 +uuid: 57f257e9-5e60-4342-87b0-2bcfbc50b560 langcode: en status: true dependencies: config: - field.storage.oc_case.field_date_of_training - - field.storage.oc_case.field_trainer - - field.storage.paragraph.field_trainer + - 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 + - user.role.authenticated module: - datetime - - entity_reference_revisions - opencase_cases + - opencase_entities + - options - paragraphs - user -_core: - default_config_hash: Of0WcqhFUX1HB3oQfisZ29RgEzlpmN7kiIRRYU2nzMo id: oc_organisation.client.trainings label: Trainings -display_label: true +display_label: false name: trainings description: '' base_entity_type_id: oc_organisation @@ -29,6 +30,12 @@ field_type_config: display: block_2 arguments: '' field_type_condition: + 'entity_bundle:oc_organisation': + id: 'entity_bundle:oc_organisation' + negate: false + context_mapping: + oc_organisation: entity_extra_field.target_entity + bundles: { } route: id: route negate: false diff --git a/config/field.field.oc_case.training.field_trainer.yml b/config/field.field.oc_case.training.field_trainer.yml deleted file mode 100644 index eee6f4f..0000000 --- a/config/field.field.oc_case.training.field_trainer.yml +++ /dev/null @@ -1,33 +0,0 @@ -uuid: c722bc26-a033-4f9d-8f04-a65b247e113b -langcode: en -status: true -dependencies: - config: - - field.storage.oc_case.field_trainer - - opencase_cases.oc_case_type.training - - paragraphs.paragraphs_type.trainer - module: - - entity_reference_revisions -_core: - default_config_hash: o2DTDQHJfJCyEoBkkDbvkoaAFv-DRtgFn_nGl4in-0s -id: oc_case.training.field_trainer -field_name: field_trainer -entity_type: oc_case -bundle: training -label: Trainers -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:paragraph' - handler_settings: - target_bundles: - trainer: trainer - negate: 0 - target_bundles_drag_drop: - trainer: - weight: 2 - enabled: true -field_type: entity_reference_revisions diff --git a/config/field.storage.oc_case.field_trainer.yml b/config/field.storage.oc_case.field_trainer.yml deleted file mode 100644 index ccf0eeb..0000000 --- a/config/field.storage.oc_case.field_trainer.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 89971a6a-34b5-41aa-869d-a343c2f96e55 -langcode: en -status: true -dependencies: - module: - - entity_reference_revisions - - opencase_cases - - paragraphs -_core: - default_config_hash: Pmyzz5YecwFkTwL_KrDpiCYyP24kjfrahEfTN4OZOc4 -id: oc_case.field_trainer -field_name: field_trainer -entity_type: oc_case -type: entity_reference_revisions -settings: - target_type: paragraph -module: entity_reference_revisions -locked: false -cardinality: -1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false From f7c4a1e8bcee431b76e9d8c7bbec3e3fc15838d9 Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 7 May 2022 13:18:08 +0100 Subject: [PATCH 06/13] =?UTF-8?q?Debrief=20Report=20=E2=80=A2=20Link=20to?= =?UTF-8?q?=20debrief=20itself?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ay.oc_activity.trainer_debrief.default.yml | 33 ++++++----- ...field.oc_organisation.client.trainings.yml | 2 +- config/views.view.debrief_report.yml | 55 ++++++++++++++++++- 3 files changed, 73 insertions(+), 17 deletions(-) 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 39bab7c..c0500a1 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 @@ -15,7 +15,6 @@ dependencies: - opencase_entities.oc_activity_type.trainer_debrief module: - image - - user id: oc_activity.trainer_debrief.default targetEntityType: oc_activity bundle: trainer_debrief @@ -26,21 +25,21 @@ content: label: above settings: { } third_party_settings: { } - weight: 9 + weight: 10 region: content field_issues_and_difficulties: type: basic_string label: above settings: { } third_party_settings: { } - weight: 4 + weight: 5 region: content field_issues_with_group_dynamics: type: basic_string label: above settings: { } third_party_settings: { } - weight: 5 + weight: 6 region: content field_number_of_participants: type: number_integer @@ -49,7 +48,7 @@ content: thousand_separator: '' prefix_suffix: true third_party_settings: { } - weight: 1 + weight: 2 region: content field_photo: type: image @@ -58,35 +57,35 @@ content: image_link: '' image_style: '' third_party_settings: { } - weight: 8 + weight: 9 region: content field_what_came_up_for_the_group: type: basic_string label: above settings: { } third_party_settings: { } - weight: 3 + weight: 4 region: content field_what_could_be_improved_for: type: basic_string label: above settings: { } third_party_settings: { } - weight: 7 + weight: 8 region: content field_what_did_facilitators_do_w: type: basic_string label: above settings: { } third_party_settings: { } - weight: 2 + weight: 3 region: content field_what_real_scenarios_or_inc: type: basic_string label: above settings: { } third_party_settings: { } - weight: 6 + weight: 7 region: content name: type: string @@ -96,16 +95,20 @@ content: third_party_settings: { } weight: 0 region: content - user_id: - type: author + oc_provider: + type: entity_reference_label label: above - settings: { } + settings: + link: true third_party_settings: { } - weight: 10 + weight: 1 region: content hidden: activity_date_time: true client: true - oc_provider: true + description: true + oc_target: true search_api_excerpt: true + status: true time_taken: true + user_id: true diff --git a/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml b/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml index e0c9110..03835da 100644 --- a/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml +++ b/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml @@ -19,7 +19,7 @@ dependencies: - user id: oc_organisation.client.trainings label: Trainings -display_label: false +display_label: true name: trainings description: '' base_entity_type_id: oc_organisation diff --git a/config/views.view.debrief_report.yml b/config/views.view.debrief_report.yml index 1629998..1a9197d 100644 --- a/config/views.view.debrief_report.yml +++ b/config/views.view.debrief_report.yml @@ -170,7 +170,7 @@ display: entity_type: oc_activity entity_field: oc_provider plugin_id: field - label: Trainer + label: 'Submitted by' exclude: false alter: alter_text: false @@ -225,6 +225,59 @@ display: multi_type: separator separator: ', ' field_api_classes: false + view_oc_activity: + id: view_oc_activity + table: oc_activity + field: view_oc_activity + relationship: none + group_type: group + admin_label: '' + entity_type: oc_activity + plugin_id: entity_link + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + text: view + output_url_as_text: false + absolute: false pager: type: mini options: From 67f09c1b5ecaeeedda5a13a62203ec99f3b40415 Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 7 May 2022 13:28:47 +0100 Subject: [PATCH 07/13] =?UTF-8?q?All=20Trainers=20=E2=80=A2=20Hide=20inact?= =?UTF-8?q?ive=20trainers=20from=20'Trainers'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/views.view.all_trainers.yml | 155 ++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 1 deletion(-) diff --git a/config/views.view.all_trainers.yml b/config/views.view.all_trainers.yml index 53aea6a..e2bcaf3 100644 --- a/config/views.view.all_trainers.yml +++ b/config/views.view.all_trainers.yml @@ -228,6 +228,44 @@ display: expose: operator_limit_selection: false operator_list: { } + field_active_value: + id: field_active_value + table: oc_actor__field_active + field: field_active_value + relationship: none + group_type: group + admin_label: '' + plugin_id: boolean + operator: '=' + value: '1' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } style: type: table options: @@ -270,7 +308,18 @@ display: replica: false query_tags: { } relationships: { } - header: { } + header: + 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: false + content: 'This display does not include inactive trainers. Click here to see them' + tokenize: false footer: { } display_extenders: { } cache_metadata: @@ -287,6 +336,20 @@ display: display_plugin: page position: 1 display_options: + defaults: + header: false + header: + 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: false + content: 'This display does not include inactive trainers. Click here to see them' + tokenize: false display_extenders: { } path: opencase/all-trainers menu: @@ -306,3 +369,93 @@ display: - url.query_args - user.roles tags: { } + page_2: + id: page_2 + display_title: Inactive + display_plugin: page + position: 2 + display_options: + title: 'Inactive trainers' + filters: + type: + id: type + table: oc_actor_field_data + field: type + entity_type: oc_actor + entity_field: type + plugin_id: bundle + value: + trainer: trainer + expose: + operator_limit_selection: false + operator_list: { } + field_active_value: + id: field_active_value + table: oc_actor__field_active + field: field_active_value + relationship: none + group_type: group + admin_label: '' + plugin_id: boolean + operator: '=' + value: '0' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + filter_groups: + operator: AND + groups: + 1: AND + defaults: + title: false + filters: false + filter_groups: false + header: false + display_description: '' + header: + 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: false + content: 'Back to active trainer list' + tokenize: false + display_extenders: { } + path: opencase/inactive-trainers + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + - user.roles + tags: { } From 17f2a9bef7d69487393d7852a2f96efc9ce1f12d Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 7 May 2022 13:36:44 +0100 Subject: [PATCH 08/13] =?UTF-8?q?All=20Trainers=20=E2=80=A2=20Hide=20inact?= =?UTF-8?q?ive=20trainers=20from=20'Trainers'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/views.view.debriefs.yml | 148 ++++++++++++++++---------------- config/views.view.trainings.yml | 135 ++++++++++++++++++++++++++++- 2 files changed, 208 insertions(+), 75 deletions(-) diff --git a/config/views.view.debriefs.yml b/config/views.view.debriefs.yml index 8a651f5..c3bd2d2 100644 --- a/config/views.view.debriefs.yml +++ b/config/views.view.debriefs.yml @@ -6,6 +6,7 @@ dependencies: - opencase_entities.oc_activity_type.trainer_debrief - user.role.authenticated module: + - datetime - opencase_cases - opencase_entities - user @@ -27,71 +28,6 @@ display: display_options: title: Debrief fields: - 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 - 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 status: id: status table: oc_activity_field_data @@ -159,17 +95,17 @@ display: multi_type: separator separator: ', ' field_api_classes: false - created: - id: created + activity_date_time: + id: activity_date_time table: oc_activity_field_data - field: created + field: activity_date_time relationship: none group_type: group admin_label: '' entity_type: oc_activity - entity_field: created + entity_field: activity_date_time plugin_id: field - label: Created + label: Date exclude: false alter: alter_text: false @@ -211,11 +147,10 @@ display: empty_zero: false hide_alter_empty: true click_sort_column: value - type: timestamp + type: datetime_default settings: - date_format: short - custom_date_format: '' - timezone: '' + timezone_override: '' + format_type: medium group_column: value group_columns: { } group_rows: true @@ -226,6 +161,71 @@ 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_provider + plugin_id: field + label: 'Submitted by' + 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 view_oc_activity: id: view_oc_activity table: oc_activity diff --git a/config/views.view.trainings.yml b/config/views.view.trainings.yml index f769a11..f7d96f1 100644 --- a/config/views.view.trainings.yml +++ b/config/views.view.trainings.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - field.storage.oc_case.field_date_of_training + - field.storage.oc_case.field_number_of_participants - field.storage.oc_case.field_project - field.storage.oc_case.field_training_status - field.storage.oc_case.field_training_type @@ -15,7 +16,6 @@ dependencies: - opencase_cases - opencase_entities - options - - paragraphs - user _core: default_config_hash: WEXYdHXh9zqan0bEwCzQypvhQhKOI9vpV1OM5DO-Rlk @@ -482,6 +482,70 @@ display: multi_type: separator separator: ', ' field_api_classes: false + field_number_of_participants: + id: field_number_of_participants + table: oc_case__field_number_of_participants + field: field_number_of_participants + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'Number of participants' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: number_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 pager: type: mini options: @@ -665,6 +729,7 @@ display: - user.roles tags: - 'config:field.storage.oc_case.field_date_of_training' + - 'config:field.storage.oc_case.field_number_of_participants' - 'config:field.storage.oc_case.field_project' - 'config:field.storage.oc_case.field_training_status' - 'config:field.storage.oc_case.field_training_type' @@ -1123,6 +1188,70 @@ display: multi_type: separator separator: ', ' field_api_classes: false + field_number_of_participants: + id: field_number_of_participants + table: oc_case__field_number_of_participants + field: field_number_of_participants + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'Number of participants' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: number_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 pager: type: none options: @@ -1283,6 +1412,7 @@ display: - user.roles tags: - 'config:field.storage.oc_case.field_date_of_training' + - 'config:field.storage.oc_case.field_number_of_participants' - 'config:field.storage.oc_case.field_project' - 'config:field.storage.oc_case.field_training_status' - 'config:field.storage.oc_case.field_training_type' @@ -1356,6 +1486,7 @@ display: - user.roles tags: - 'config:field.storage.oc_case.field_date_of_training' + - 'config:field.storage.oc_case.field_number_of_participants' - 'config:field.storage.oc_case.field_project' - 'config:field.storage.oc_case.field_training_status' - 'config:field.storage.oc_case.field_training_type' @@ -1955,6 +2086,7 @@ display: - user.roles tags: - 'config:field.storage.oc_case.field_date_of_training' + - 'config:field.storage.oc_case.field_number_of_participants' - 'config:field.storage.oc_case.field_project' - 'config:field.storage.oc_case.field_training_status' - 'config:field.storage.oc_case.field_training_type' @@ -3134,6 +3266,7 @@ display: - user.roles tags: - 'config:field.storage.oc_case.field_date_of_training' + - 'config:field.storage.oc_case.field_number_of_participants' - 'config:field.storage.oc_case.field_project' - 'config:field.storage.oc_case.field_training_status' - 'config:field.storage.oc_case.field_training_type' From 8cd5b21387cee9195ac311eee4fc1f288395e9b4 Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 7 May 2022 13:39:59 +0100 Subject: [PATCH 09/13] =?UTF-8?q?All=20Trainings=20=E2=80=A2=20Add=20parti?= =?UTF-8?q?cipant=20figures=20to=20columns=20in=20All=20Trainings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/views.view.trainings.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/config/views.view.trainings.yml b/config/views.view.trainings.yml index f7d96f1..8640031 100644 --- a/config/views.view.trainings.yml +++ b/config/views.view.trainings.yml @@ -582,18 +582,7 @@ display: 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 yet.' - tokenize: false + empty: { } sorts: { } arguments: { } filters: @@ -706,7 +695,13 @@ display: id: area_text_custom table: views field: area_text_custom + relationship: none + group_type: group + admin_label: '' plugin_id: text_custom + empty: true + content: '' + tokenize: false footer: area_text_custom: id: area_text_custom @@ -1385,7 +1380,7 @@ display: group_type: group admin_label: '' plugin_id: text_custom - empty: false + empty: true content: '

Without date

' tokenize: false footer: From c9d82ad069eeec55811265faf4a0e1bb174eeb3c Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 7 May 2022 16:10:52 +0100 Subject: [PATCH 10/13] fixed bug where trainings view was referencing old paragraph fields --- ...isplay.oc_case_fee.project_fee.default.yml | 1 + ..._field.oc_case.project.billing_details.yml | 10 +- ...field.extra_field.oc_case.project.fees.yml | 10 +- ....extra_field.oc_case.project.trainings.yml | 21 ++-- config/views.view.trainings.yml | 107 +++--------------- 5 files changed, 35 insertions(+), 114 deletions(-) diff --git a/config/core.entity_form_display.oc_case_fee.project_fee.default.yml b/config/core.entity_form_display.oc_case_fee.project_fee.default.yml index 5008a94..178d4c1 100644 --- a/config/core.entity_form_display.oc_case_fee.project_fee.default.yml +++ b/config/core.entity_form_display.oc_case_fee.project_fee.default.yml @@ -24,6 +24,7 @@ content: settings: { } third_party_settings: { } hidden: + description: true feeds_item: true name: true oc_case: true diff --git a/config/entity_extra_field.extra_field.oc_case.project.billing_details.yml b/config/entity_extra_field.extra_field.oc_case.project.billing_details.yml index e2763d3..eee6584 100644 --- a/config/entity_extra_field.extra_field.oc_case.project.billing_details.yml +++ b/config/entity_extra_field.extra_field.oc_case.project.billing_details.yml @@ -24,19 +24,19 @@ field_type_config: field_type_condition: 'entity_bundle:oc_case': id: 'entity_bundle:oc_case' - bundles: - project: project + negate: false context_mapping: oc_case: entity_extra_field.target_entity - negate: false + bundles: + project: project route: id: route - routes: '' negate: false + routes: '' request_path: id: request_path - pages: '' negate: false + pages: '' current_theme: id: current_theme theme: '' diff --git a/config/entity_extra_field.extra_field.oc_case.project.fees.yml b/config/entity_extra_field.extra_field.oc_case.project.fees.yml index be9d1f8..bce5f84 100644 --- a/config/entity_extra_field.extra_field.oc_case.project.fees.yml +++ b/config/entity_extra_field.extra_field.oc_case.project.fees.yml @@ -22,19 +22,19 @@ field_type_config: field_type_condition: 'entity_bundle:oc_case': id: 'entity_bundle:oc_case' - bundles: - project: project + negate: false context_mapping: oc_case: entity_extra_field.target_entity - negate: false + bundles: + project: project route: id: route - routes: '' negate: false + routes: '' request_path: id: request_path - pages: '' negate: false + pages: '' current_theme: id: current_theme theme: '' diff --git a/config/entity_extra_field.extra_field.oc_case.project.trainings.yml b/config/entity_extra_field.extra_field.oc_case.project.trainings.yml index f994b3e..9ce708b 100644 --- a/config/entity_extra_field.extra_field.oc_case.project.trainings.yml +++ b/config/entity_extra_field.extra_field.oc_case.project.trainings.yml @@ -1,20 +1,21 @@ -uuid: 724b0e99-12c3-4028-a805-df614711c22f +uuid: 4cf9ed31-fa62-41b4-a7a3-2750e7769e00 langcode: en status: true dependencies: config: - field.storage.oc_case.field_date_of_training + - field.storage.oc_case.field_number_of_participants - 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 + - user.role.authenticated module: - datetime - opencase_cases - opencase_entities - options - - paragraphs - user id: oc_case.project.trainings label: Trainings @@ -31,23 +32,23 @@ field_type_config: field_type_condition: 'entity_bundle:oc_case': id: 'entity_bundle:oc_case' - bundles: - project: project + negate: false context_mapping: oc_case: entity_extra_field.target_entity - negate: false + bundles: + project: project route: id: route - routes: '' negate: false + routes: '' + request_path: + id: request_path + negate: false + pages: '' current_theme: id: current_theme theme: '' negate: 0 - request_path: - id: request_path - pages: '' - negate: false field_conditions_all_pass: false display: type: view diff --git a/config/views.view.trainings.yml b/config/views.view.trainings.yml index 8640031..45f871c 100644 --- a/config/views.view.trainings.yml +++ b/config/views.view.trainings.yml @@ -582,7 +582,18 @@ display: cache: type: tag options: { } - empty: { } + 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 yet.' + tokenize: false sorts: { } arguments: { } filters: @@ -679,16 +690,7 @@ display: distinct: false replica: false query_tags: { } - relationships: - field_trainer: - id: field_trainer - table: oc_case__field_trainer - field: field_trainer - relationship: none - group_type: group - admin_label: 'field_trainer: Paragraph' - plugin_id: standard - required: false + relationships: { } group_by: false header: area_text_custom: @@ -1411,80 +1413,6 @@ display: - '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: - id: block_1 - display_title: 'By trainer' - display_plugin: block - position: 1 - display_options: - sorts: { } - arguments: - field_trainer_target_id: - id: field_trainer_target_id - table: paragraph__field_trainer - field: field_trainer_target_id - relationship: field_trainer - group_type: group - admin_label: '' - plugin_id: numeric - 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 - override: false - items_per_page: 25 - 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 - filters: { } - filter_groups: - operator: AND - groups: - 1: AND - defaults: - relationships: true - fields: true - sorts: false - arguments: false - filters: false - filter_groups: false - footer: false - display_description: '' - footer: { } - display_extenders: { } - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.roles - tags: - - 'config:field.storage.oc_case.field_date_of_training' - - 'config:field.storage.oc_case.field_number_of_participants' - - '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: id: block_2 display_title: 'By client' @@ -2047,15 +1975,6 @@ display: arguments: false footer: false relationships: - field_trainer: - id: field_trainer - table: oc_case__field_trainer - field: field_trainer - relationship: none - group_type: group - admin_label: 'field_trainer: Paragraph' - plugin_id: standard - required: false client: id: client table: oc_case_field_data From 5a32ef2614f7c159d95fe2dd4af1339b739cd3ec Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 7 May 2022 16:21:43 +0100 Subject: [PATCH 11/13] Showing notes on phone call in full --- ...display.oc_activity.phone_call.default.yml | 25 +++++------ ...isplay.oc_case_fee.project_fee.default.yml | 9 +++- ...display.oc_activity.phone_call.default.yml | 12 ++++- ...isplay.oc_case_fee.project_fee.default.yml | 45 +++++++++++++++++++ config/views.view.activities_without_case.yml | 2 +- 5 files changed, 75 insertions(+), 18 deletions(-) create mode 100644 config/core.entity_view_display.oc_case_fee.project_fee.default.yml diff --git a/config/core.entity_form_display.oc_activity.phone_call.default.yml b/config/core.entity_form_display.oc_activity.phone_call.default.yml index 80e7038..543c580 100644 --- a/config/core.entity_form_display.oc_activity.phone_call.default.yml +++ b/config/core.entity_form_display.oc_activity.phone_call.default.yml @@ -4,13 +4,19 @@ status: true dependencies: config: - opencase_entities.oc_activity_type.phone_call - module: - - hide_revision_field id: oc_activity.phone_call.default targetEntityType: oc_activity bundle: phone_call mode: default content: + description: + type: string_textarea + weight: 2 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } name: type: string_textfield weight: 0 @@ -19,18 +25,6 @@ content: size: 60 placeholder: '' third_party_settings: { } - revision_log: - type: hide_revision_field_log_widget - weight: 2 - region: content - settings: - rows: 5 - placeholder: '' - show: false - default: '' - permission_based: false - allow_user_settings: false - third_party_settings: { } time_taken: type: number weight: 1 @@ -41,7 +35,8 @@ content: hidden: activity_date_time: true client: true - description: true oc_provider: true oc_target: true + revision_log: true status: true + user_id: true diff --git a/config/core.entity_form_display.oc_case_fee.project_fee.default.yml b/config/core.entity_form_display.oc_case_fee.project_fee.default.yml index 178d4c1..c5e7662 100644 --- a/config/core.entity_form_display.oc_case_fee.project_fee.default.yml +++ b/config/core.entity_form_display.oc_case_fee.project_fee.default.yml @@ -17,6 +17,14 @@ content: settings: placeholder: '' third_party_settings: { } + description: + type: string_textarea + weight: 2 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } oc_fee_category: type: options_select weight: 0 @@ -24,7 +32,6 @@ content: settings: { } third_party_settings: { } hidden: - description: true feeds_item: true name: true oc_case: true diff --git a/config/core.entity_view_display.oc_activity.phone_call.default.yml b/config/core.entity_view_display.oc_activity.phone_call.default.yml index ac28d6c..c2455b0 100644 --- a/config/core.entity_view_display.oc_activity.phone_call.default.yml +++ b/config/core.entity_view_display.oc_activity.phone_call.default.yml @@ -19,6 +19,13 @@ content: third_party_settings: { } weight: 0 region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 3 + region: content name: type: string label: hidden @@ -43,8 +50,11 @@ content: label: above settings: { } third_party_settings: { } - weight: 3 + weight: 4 region: content hidden: activity_date_time: true + oc_provider: true + oc_target: true search_api_excerpt: true + status: true diff --git a/config/core.entity_view_display.oc_case_fee.project_fee.default.yml b/config/core.entity_view_display.oc_case_fee.project_fee.default.yml new file mode 100644 index 0000000..9ab2932 --- /dev/null +++ b/config/core.entity_view_display.oc_case_fee.project_fee.default.yml @@ -0,0 +1,45 @@ +uuid: efaca5b6-aed7-4957-a728-fb0eea27d8ef +langcode: en +status: true +dependencies: + config: + - field.field.oc_case_fee.project_fee.feeds_item + - opencase_cases.oc_case_fee_type.project_fee +id: oc_case_fee.project_fee.default +targetEntityType: oc_case_fee +bundle: project_fee +mode: default +content: + amount: + type: number_decimal + label: above + settings: + thousand_separator: '' + decimal_separator: . + scale: 2 + prefix_suffix: true + third_party_settings: { } + weight: 1 + region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 2 + region: content + oc_fee_category: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 0 + region: content +hidden: + feeds_item: true + name: true + oc_case: true + search_api_excerpt: true + status: true + user_id: true diff --git a/config/views.view.activities_without_case.yml b/config/views.view.activities_without_case.yml index 62c2cda..aa40e3b 100644 --- a/config/views.view.activities_without_case.yml +++ b/config/views.view.activities_without_case.yml @@ -259,7 +259,7 @@ display: more_link_text: '' more_link_path: '' strip_tags: false - trim: true + trim: false preserve_tags: '' html: false element_type: '' From 2a8936e1063c19273f32f0fd33ae2a3a36b51995 Mon Sep 17 00:00:00 2001 From: naomi Date: Sun, 8 May 2022 18:39:40 +0100 Subject: [PATCH 12/13] Addded number of cases to trainer display and all trainers view --- composer.lock | 74 ++++++++++--------- ..._view_display.oc_actor.trainer.default.yml | 11 +++ config/views.view.all_trainers.yml | 66 +++++++++++++++++ 3 files changed, 115 insertions(+), 36 deletions(-) diff --git a/composer.lock b/composer.lock index 2b32f47..a5ea647 100644 --- a/composer.lock +++ b/composer.lock @@ -94,7 +94,7 @@ "source": { "type": "git", "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git", - "reference": "5af08013021a173f0f29cff029fbfbbfec649ba2" + "reference": "f9846f2d86225e1e2b51d331484338504e8eb2ab" }, "require": { "composer/installers": "*", @@ -111,7 +111,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-04-22T15:26:09+00:00" + "time": "2022-05-02T17:20:35+00:00" }, { "name": "bjeavons/zxcvbn-php", @@ -458,16 +458,16 @@ }, { "name": "consolidation/annotated-command", - "version": "4.5.4", + "version": "4.5.5", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904" + "reference": "67cea8e8e7656b74da651ea6f49321853996c0fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/93398c3166d9026ab93219ce23b2092b4d7b7904", - "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/67cea8e8e7656b74da651ea6f49321853996c0fd", + "reference": "67cea8e8e7656b74da651ea6f49321853996c0fd", "shasum": "" }, "require": { @@ -508,9 +508,9 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.5.4" + "source": "https://github.com/consolidation/annotated-command/tree/4.5.5" }, - "time": "2022-04-05T17:58:10+00:00" + "time": "2022-04-26T16:18:25+00:00" }, { "name": "consolidation/config", @@ -3357,6 +3357,10 @@ "name": "RobLoach", "homepage": "https://www.drupal.org/user/61114" }, + { + "name": "bnjmnm", + "homepage": "https://www.drupal.org/user/2369194" + }, { "name": "jjeff", "homepage": "https://www.drupal.org/user/17190" @@ -6357,16 +6361,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.2", + "version": "v0.11.4", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "7f7da640d68b9c9fec819caae7c744a213df6514" + "reference": "05c544b339b112226ad14803e1e5b09a61957454" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7f7da640d68b9c9fec819caae7c744a213df6514", - "reference": "7f7da640d68b9c9fec819caae7c744a213df6514", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/05c544b339b112226ad14803e1e5b09a61957454", + "reference": "05c544b339b112226ad14803e1e5b09a61957454", "shasum": "" }, "require": { @@ -6381,15 +6385,13 @@ "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.2", - "hoa/console": "3.17.05.02" + "bamarni/composer-bin-plugin": "^1.2" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", "ext-pdo-sqlite": "The doc command requires SQLite to work.", "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.", - "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit." + "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history." }, "bin": [ "bin/psysh" @@ -6429,9 +6431,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.2" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.4" }, - "time": "2022-02-28T15:28:54+00:00" + "time": "2022-05-06T12:49:14+00:00" }, { "name": "ralouphie/getallheaders", @@ -7201,16 +7203,16 @@ }, { "name": "symfony/finder", - "version": "v4.4.37", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "b17d76d7ed179f017aad646e858c90a2771af15d" + "reference": "40790bdf293b462798882ef6da72bb49a4a6633a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/b17d76d7ed179f017aad646e858c90a2771af15d", - "reference": "b17d76d7ed179f017aad646e858c90a2771af15d", + "url": "https://api.github.com/repos/symfony/finder/zipball/40790bdf293b462798882ef6da72bb49a4a6633a", + "reference": "40790bdf293b462798882ef6da72bb49a4a6633a", "shasum": "" }, "require": { @@ -7243,7 +7245,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v4.4.37" + "source": "https://github.com/symfony/finder/tree/v4.4.41" }, "funding": [ { @@ -7259,7 +7261,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-04-14T15:36:10+00:00" }, { "name": "symfony/http-client-contracts", @@ -8741,16 +8743,16 @@ }, { "name": "symfony/string", - "version": "v5.4.3", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10" + "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10", - "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10", + "url": "https://api.github.com/repos/symfony/string/zipball/3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", + "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", "shasum": "" }, "require": { @@ -8807,7 +8809,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.3" + "source": "https://github.com/symfony/string/tree/v5.4.8" }, "funding": [ { @@ -8823,7 +8825,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-04-19T10:40:37+00:00" }, { "name": "symfony/translation", @@ -11924,16 +11926,16 @@ }, { "name": "symfony/config", - "version": "v4.4.37", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e" + "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/e8c2d2c951ddedecb6d28954d336cb7d2e852d0e", - "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e", + "url": "https://api.github.com/repos/symfony/config/zipball/9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7", + "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7", "shasum": "" }, "require": { @@ -11982,7 +11984,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v4.4.37" + "source": "https://github.com/symfony/config/tree/v4.4.41" }, "funding": [ { @@ -11998,7 +12000,7 @@ "type": "tidelift" } ], - "time": "2022-01-03T09:46:22+00:00" + "time": "2022-04-12T15:19:55+00:00" }, { "name": "symfony/css-selector", diff --git a/config/core.entity_view_display.oc_actor.trainer.default.yml b/config/core.entity_view_display.oc_actor.trainer.default.yml index c6d1a63..df33949 100644 --- a/config/core.entity_view_display.oc_actor.trainer.default.yml +++ b/config/core.entity_view_display.oc_actor.trainer.default.yml @@ -138,9 +138,20 @@ content: third_party_settings: { } weight: 9 region: content + total_cases: + type: number_integer + label: above + settings: + thousand_separator: '' + prefix_suffix: true + third_party_settings: { } + weight: 14 + region: content hidden: feeds_item: true full_name: true middle_names: true phone2: true search_api_excerpt: true + status: true + user_id: true diff --git a/config/views.view.all_trainers.yml b/config/views.view.all_trainers.yml index e2bcaf3..327a961 100644 --- a/config/views.view.all_trainers.yml +++ b/config/views.view.all_trainers.yml @@ -160,6 +160,72 @@ display: multi_type: separator separator: ', ' field_api_classes: false + total_cases: + id: total_cases + table: oc_actor_field_data + field: total_cases + relationship: none + group_type: group + admin_label: '' + entity_type: oc_actor + entity_field: total_cases + plugin_id: field + label: 'Number of Cases' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: number_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 pager: type: mini options: From ab732b0eda09941b360bf650554711adb3edf22a Mon Sep 17 00:00:00 2001 From: naomi Date: Mon, 9 May 2022 17:16:50 +0100 Subject: [PATCH 13/13] Revert "Addded number of cases to trainer display and all trainers view" This reverts commit 2a8936e1063c19273f32f0fd33ae2a3a36b51995. --- composer.lock | 74 +++++++++---------- ..._view_display.oc_actor.trainer.default.yml | 11 --- config/views.view.all_trainers.yml | 66 ----------------- 3 files changed, 36 insertions(+), 115 deletions(-) diff --git a/composer.lock b/composer.lock index a5ea647..2b32f47 100644 --- a/composer.lock +++ b/composer.lock @@ -94,7 +94,7 @@ "source": { "type": "git", "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git", - "reference": "f9846f2d86225e1e2b51d331484338504e8eb2ab" + "reference": "5af08013021a173f0f29cff029fbfbbfec649ba2" }, "require": { "composer/installers": "*", @@ -111,7 +111,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-05-02T17:20:35+00:00" + "time": "2022-04-22T15:26:09+00:00" }, { "name": "bjeavons/zxcvbn-php", @@ -458,16 +458,16 @@ }, { "name": "consolidation/annotated-command", - "version": "4.5.5", + "version": "4.5.4", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "67cea8e8e7656b74da651ea6f49321853996c0fd" + "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/67cea8e8e7656b74da651ea6f49321853996c0fd", - "reference": "67cea8e8e7656b74da651ea6f49321853996c0fd", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/93398c3166d9026ab93219ce23b2092b4d7b7904", + "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904", "shasum": "" }, "require": { @@ -508,9 +508,9 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.5.5" + "source": "https://github.com/consolidation/annotated-command/tree/4.5.4" }, - "time": "2022-04-26T16:18:25+00:00" + "time": "2022-04-05T17:58:10+00:00" }, { "name": "consolidation/config", @@ -3357,10 +3357,6 @@ "name": "RobLoach", "homepage": "https://www.drupal.org/user/61114" }, - { - "name": "bnjmnm", - "homepage": "https://www.drupal.org/user/2369194" - }, { "name": "jjeff", "homepage": "https://www.drupal.org/user/17190" @@ -6361,16 +6357,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.4", + "version": "v0.11.2", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "05c544b339b112226ad14803e1e5b09a61957454" + "reference": "7f7da640d68b9c9fec819caae7c744a213df6514" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/05c544b339b112226ad14803e1e5b09a61957454", - "reference": "05c544b339b112226ad14803e1e5b09a61957454", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7f7da640d68b9c9fec819caae7c744a213df6514", + "reference": "7f7da640d68b9c9fec819caae7c744a213df6514", "shasum": "" }, "require": { @@ -6385,13 +6381,15 @@ "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.2" + "bamarni/composer-bin-plugin": "^1.2", + "hoa/console": "3.17.05.02" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", "ext-pdo-sqlite": "The doc command requires SQLite to work.", "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history." + "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.", + "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit." }, "bin": [ "bin/psysh" @@ -6431,9 +6429,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.4" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.2" }, - "time": "2022-05-06T12:49:14+00:00" + "time": "2022-02-28T15:28:54+00:00" }, { "name": "ralouphie/getallheaders", @@ -7203,16 +7201,16 @@ }, { "name": "symfony/finder", - "version": "v4.4.41", + "version": "v4.4.37", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "40790bdf293b462798882ef6da72bb49a4a6633a" + "reference": "b17d76d7ed179f017aad646e858c90a2771af15d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/40790bdf293b462798882ef6da72bb49a4a6633a", - "reference": "40790bdf293b462798882ef6da72bb49a4a6633a", + "url": "https://api.github.com/repos/symfony/finder/zipball/b17d76d7ed179f017aad646e858c90a2771af15d", + "reference": "b17d76d7ed179f017aad646e858c90a2771af15d", "shasum": "" }, "require": { @@ -7245,7 +7243,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v4.4.41" + "source": "https://github.com/symfony/finder/tree/v4.4.37" }, "funding": [ { @@ -7261,7 +7259,7 @@ "type": "tidelift" } ], - "time": "2022-04-14T15:36:10+00:00" + "time": "2022-01-02T09:41:36+00:00" }, { "name": "symfony/http-client-contracts", @@ -8743,16 +8741,16 @@ }, { "name": "symfony/string", - "version": "v5.4.8", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8" + "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", - "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", + "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10", + "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10", "shasum": "" }, "require": { @@ -8809,7 +8807,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.8" + "source": "https://github.com/symfony/string/tree/v5.4.3" }, "funding": [ { @@ -8825,7 +8823,7 @@ "type": "tidelift" } ], - "time": "2022-04-19T10:40:37+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/translation", @@ -11926,16 +11924,16 @@ }, { "name": "symfony/config", - "version": "v4.4.41", + "version": "v4.4.37", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7" + "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7", - "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7", + "url": "https://api.github.com/repos/symfony/config/zipball/e8c2d2c951ddedecb6d28954d336cb7d2e852d0e", + "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e", "shasum": "" }, "require": { @@ -11984,7 +11982,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v4.4.41" + "source": "https://github.com/symfony/config/tree/v4.4.37" }, "funding": [ { @@ -12000,7 +11998,7 @@ "type": "tidelift" } ], - "time": "2022-04-12T15:19:55+00:00" + "time": "2022-01-03T09:46:22+00:00" }, { "name": "symfony/css-selector", diff --git a/config/core.entity_view_display.oc_actor.trainer.default.yml b/config/core.entity_view_display.oc_actor.trainer.default.yml index df33949..c6d1a63 100644 --- a/config/core.entity_view_display.oc_actor.trainer.default.yml +++ b/config/core.entity_view_display.oc_actor.trainer.default.yml @@ -138,20 +138,9 @@ content: third_party_settings: { } weight: 9 region: content - total_cases: - type: number_integer - label: above - settings: - thousand_separator: '' - prefix_suffix: true - third_party_settings: { } - weight: 14 - region: content hidden: feeds_item: true full_name: true middle_names: true phone2: true search_api_excerpt: true - status: true - user_id: true diff --git a/config/views.view.all_trainers.yml b/config/views.view.all_trainers.yml index 327a961..e2bcaf3 100644 --- a/config/views.view.all_trainers.yml +++ b/config/views.view.all_trainers.yml @@ -160,72 +160,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - total_cases: - id: total_cases - table: oc_actor_field_data - field: total_cases - relationship: none - group_type: group - admin_label: '' - entity_type: oc_actor - entity_field: total_cases - plugin_id: field - label: 'Number of Cases' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: number_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 pager: type: mini options: