From c13966464aca28360b6b2792a885848b8bbd5c03 Mon Sep 17 00:00:00 2001 From: naomi Date: Tue, 5 Apr 2022 15:49:40 +0100 Subject: [PATCH 01/14] updated facets and goodnightout_opencase --- composer.lock | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 388e6d8..1457921 100644 --- a/composer.lock +++ b/composer.lock @@ -2982,17 +2982,17 @@ }, { "name": "drupal/facets", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/facets.git", - "reference": "2.0.1" + "reference": "2.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/facets-2.0.1.zip", - "reference": "2.0.1", - "shasum": "ec6e9de9dd1726b6ca173abd79a69d2574db3e89" + "url": "https://ftp.drupal.org/files/projects/facets-2.0.2.zip", + "reference": "2.0.2", + "shasum": "17afc46d3f4e4300e8e69f23b3b01a4935b57104" }, "require": { "drupal/core": "^9.2 || ^10.0" @@ -3001,13 +3001,19 @@ "drupal/search_api": "<1.14" }, "require-dev": { + "drupal/jquery_ui_slider": "~1.1", + "drupal/jquery_ui_touch_punch": "~1.0", "drupal/search_api": "~1.21" }, + "suggest": { + "drupal/jquery_ui_slider": "Required for the 'Facets Range Widget' module to work", + "drupal/jquery_ui_touch_punch": "Required for the 'Facets Range Widget' module to work" + }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.1", - "datestamp": "1642699685", + "version": "2.0.2", + "datestamp": "1649070269", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" From 6a416a43b034d751dd3dccc3b65bfaa00f6e0f51 Mon Sep 17 00:00:00 2001 From: naomi Date: Wed, 6 Apr 2022 09:38:41 +0100 Subject: [PATCH 02/14] updated gno module --- composer.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 1457921..48ce1c4 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": "2d99504839b4fd20e2610e56d1f7d65046e24b9a" + "reference": "2ff157989068445ef3414a7676286d2b96a31c8f" }, "require": { "drupal/admin_toolbar": "*", @@ -86,7 +86,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-03-24T08:07:08+00:00" + "time": "2022-04-03T17:15:41+00:00" }, { "name": "autonomic/opencase", @@ -458,22 +458,22 @@ }, { "name": "consolidation/annotated-command", - "version": "4.5.3", + "version": "4.5.4", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "1941a743e63993288e09d0686a4cb7ed47813213" + "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1941a743e63993288e09d0686a4cb7ed47813213", - "reference": "1941a743e63993288e09d0686a4cb7ed47813213", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/93398c3166d9026ab93219ce23b2092b4d7b7904", + "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904", "shasum": "" }, "require": { "consolidation/output-formatters": "^4.1.1", "php": ">=7.1.3", - "psr/log": "^1|^2", + "psr/log": "^1|^2|^3", "symfony/console": "^4.4.8|^5|^6", "symfony/event-dispatcher": "^4.4.8|^5|^6", "symfony/finder": "^4.4.8|^5|^6" @@ -487,7 +487,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "5.x-dev" + "dev-main": "4.x-dev" } }, "autoload": { @@ -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.3" + "source": "https://github.com/consolidation/annotated-command/tree/4.5.4" }, - "time": "2022-04-02T00:17:53+00:00" + "time": "2022-04-05T17:58:10+00:00" }, { "name": "consolidation/config", From 377e2f9dd6c0013f0e6efbc198b3cc19a9e9fff4 Mon Sep 17 00:00:00 2001 From: naomi Date: Wed, 6 Apr 2022 09:38:41 +0100 Subject: [PATCH 03/14] updated gno module --- composer.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 1457921..dafe929 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": "2d99504839b4fd20e2610e56d1f7d65046e24b9a" + "reference": "d627ab74395f0cf44ff207d18903b2ba71d9b2ed" }, "require": { "drupal/admin_toolbar": "*", @@ -86,7 +86,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-03-24T08:07:08+00:00" + "time": "2022-04-06T08:46:54+00:00" }, { "name": "autonomic/opencase", @@ -458,22 +458,22 @@ }, { "name": "consolidation/annotated-command", - "version": "4.5.3", + "version": "4.5.4", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "1941a743e63993288e09d0686a4cb7ed47813213" + "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1941a743e63993288e09d0686a4cb7ed47813213", - "reference": "1941a743e63993288e09d0686a4cb7ed47813213", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/93398c3166d9026ab93219ce23b2092b4d7b7904", + "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904", "shasum": "" }, "require": { "consolidation/output-formatters": "^4.1.1", "php": ">=7.1.3", - "psr/log": "^1|^2", + "psr/log": "^1|^2|^3", "symfony/console": "^4.4.8|^5|^6", "symfony/event-dispatcher": "^4.4.8|^5|^6", "symfony/finder": "^4.4.8|^5|^6" @@ -487,7 +487,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "5.x-dev" + "dev-main": "4.x-dev" } }, "autoload": { @@ -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.3" + "source": "https://github.com/consolidation/annotated-command/tree/4.5.4" }, - "time": "2022-04-02T00:17:53+00:00" + "time": "2022-04-05T17:58:10+00:00" }, { "name": "consolidation/config", From 721439388e5fc49063c0ed47d2aeab31f350f40d Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 8 Apr 2022 11:21:00 +0100 Subject: [PATCH 04/14] Added script for updating project --- .gitignore | 1 + update_project.sh | 1 + 2 files changed, 2 insertions(+) create mode 100755 update_project.sh diff --git a/.gitignore b/.gitignore index 4cd99c8..63b7e77 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ !composer.json !composer.lock +!update_project.sh !.gitignore !config !config/* diff --git a/update_project.sh b/update_project.sh new file mode 100755 index 0000000..3d066eb --- /dev/null +++ b/update_project.sh @@ -0,0 +1 @@ +git pull && composer install && drush config:import --source=../config From a2aff386da9dcc64ffa147370051e13bd4ef9d8f Mon Sep 17 00:00:00 2001 From: naomi Date: Wed, 20 Apr 2022 14:13:12 +0100 Subject: [PATCH 05/14] =?UTF-8?q?All=20Clients=20+=20All=20Umbrella=20Clie?= =?UTF-8?q?nts=20=E2=80=A2=C2=A0Column=20Sorting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/views.view.all_clients.yml | 21 +++++++++++++++------ config/views.view.all_umbrella_clients.yml | 6 +++--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/config/views.view.all_clients.yml b/config/views.view.all_clients.yml index bf79790..4bf5576 100644 --- a/config/views.view.all_clients.yml +++ b/config/views.view.all_clients.yml @@ -648,38 +648,39 @@ display: field_client_substatus: field_client_substatus field_tags: field_tags status: status + field_accreditation_date: field_accreditation_date default: '-1' info: name: - 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: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_client_substatus: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' @@ -691,7 +692,14 @@ display: empty_column: false responsive: '' status: - sortable: false + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_accreditation_date: + sortable: true default_sort_order: asc align: '' separator: '' @@ -869,6 +877,7 @@ display: contexts: - 'languages:language_content' - 'languages:language_interface' + - url.query_args - user - user.roles tags: diff --git a/config/views.view.all_umbrella_clients.yml b/config/views.view.all_umbrella_clients.yml index 44d61bf..95f049c 100644 --- a/config/views.view.all_umbrella_clients.yml +++ b/config/views.view.all_umbrella_clients.yml @@ -370,14 +370,14 @@ display: default: '-1' info: name: - 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: '' @@ -389,7 +389,7 @@ display: empty_column: false responsive: '' status: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' From b66aafa5e7c69b44d9e2e95750908c8ab09ea543 Mon Sep 17 00:00:00 2001 From: naomi Date: Wed, 20 Apr 2022 14:30:38 +0100 Subject: [PATCH 06/14] =?UTF-8?q?=20=20Global=20=E2=80=A2=C2=A0Dropdowns?= =?UTF-8?q?=20rather=20than=20autocomplete=20for=20all=20entity=20referenc?= =?UTF-8?q?e=20fields?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...display.oc_activity.phone_call.default.yml | 13 ++--------- ...ay.oc_activity.trainer_debrief.default.yml | 8 ++----- ..._form_display.oc_actor.trainer.default.yml | 8 ++----- ...y_form_display.oc_case.project.default.yml | 8 ++----- ..._form_display.oc_case.training.default.yml | 16 ++++--------- ...isplay.oc_case_fee.project_fee.default.yml | 23 +++---------------- ...play.oc_case_provision.trainer.default.yml | 21 ++++------------- ...display.oc_organisation.client.default.yml | 16 ++++--------- ...c_organisation.umbrella_client.default.yml | 8 ++----- 9 files changed, 25 insertions(+), 96 deletions(-) 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 5033f8b..80e7038 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 @@ -11,16 +11,6 @@ targetEntityType: oc_activity bundle: phone_call mode: default content: - client: - type: entity_reference_autocomplete - weight: 2 - region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' - third_party_settings: { } name: type: string_textfield weight: 0 @@ -31,7 +21,7 @@ content: third_party_settings: { } revision_log: type: hide_revision_field_log_widget - weight: 80 + weight: 2 region: content settings: rows: 5 @@ -50,6 +40,7 @@ content: third_party_settings: { } hidden: activity_date_time: true + client: true description: true oc_provider: true oc_target: true 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 bf03939..347754b 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 @@ -94,14 +94,10 @@ content: placeholder: '' third_party_settings: { } oc_provider: - type: entity_reference_autocomplete + type: options_select weight: 0 region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' + settings: { } third_party_settings: { } revision_log: type: hide_revision_field_log_widget diff --git a/config/core.entity_form_display.oc_actor.trainer.default.yml b/config/core.entity_form_display.oc_actor.trainer.default.yml index 77d2ef9..01d94a8 100644 --- a/config/core.entity_form_display.oc_actor.trainer.default.yml +++ b/config/core.entity_form_display.oc_actor.trainer.default.yml @@ -53,14 +53,10 @@ content: default_paragraph_type: _none third_party_settings: { } field_delivery_partners: - type: entity_reference_autocomplete + type: options_select weight: 7 region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' + settings: { } third_party_settings: { } field_emergency_contact: type: entity_reference_paragraphs diff --git a/config/core.entity_form_display.oc_case.project.default.yml b/config/core.entity_form_display.oc_case.project.default.yml index 5fcb965..2ea456c 100644 --- a/config/core.entity_form_display.oc_case.project.default.yml +++ b/config/core.entity_form_display.oc_case.project.default.yml @@ -18,14 +18,10 @@ bundle: project mode: default content: client: - type: entity_reference_autocomplete + type: options_select weight: 0 region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' + settings: { } third_party_settings: { } field_contract_signed_date: type: datetime_default 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 5d69a14..503f6cb 100644 --- a/config/core.entity_form_display.oc_case.training.default.yml +++ b/config/core.entity_form_display.oc_case.training.default.yml @@ -25,14 +25,10 @@ bundle: training mode: default content: client: - type: entity_reference_autocomplete + type: options_select weight: 0 region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' + settings: { } third_party_settings: { } field_date_of_training: type: datetime_default @@ -41,14 +37,10 @@ content: settings: { } third_party_settings: { } field_project: - type: entity_reference_autocomplete + type: options_select weight: 1 region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' + settings: { } third_party_settings: { } field_social_media: type: boolean_checkbox 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 a12b22e..5008a94 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 @@ -5,8 +5,6 @@ dependencies: config: - field.field.oc_case_fee.project_fee.feeds_item - opencase_cases.oc_case_fee_type.project_fee - module: - - hide_revision_field id: oc_case_fee.project_fee.default targetEntityType: oc_case_fee bundle: project_fee @@ -20,30 +18,15 @@ content: placeholder: '' third_party_settings: { } oc_fee_category: - type: entity_reference_autocomplete + type: options_select weight: 0 region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' - third_party_settings: { } - revision_log: - type: hide_revision_field_log_widget - weight: 80 - region: content - settings: - rows: 5 - placeholder: '' - show: false - default: '' - permission_based: false - allow_user_settings: false + settings: { } third_party_settings: { } hidden: feeds_item: true name: true oc_case: true + revision_log: true status: true user_id: true diff --git a/config/core.entity_form_display.oc_case_provision.trainer.default.yml b/config/core.entity_form_display.oc_case_provision.trainer.default.yml index 3b456e0..957f7af 100644 --- a/config/core.entity_form_display.oc_case_provision.trainer.default.yml +++ b/config/core.entity_form_display.oc_case_provision.trainer.default.yml @@ -27,16 +27,6 @@ content: region: content settings: { } third_party_settings: { } - oc_case: - type: entity_reference_autocomplete - weight: 4 - region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' - third_party_settings: { } oc_case_provider_role: type: options_select weight: 1 @@ -44,18 +34,14 @@ content: settings: { } third_party_settings: { } oc_provider: - type: entity_reference_autocomplete + type: options_select weight: 0 region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' + settings: { } third_party_settings: { } revision_log: type: hide_revision_field_log_widget - weight: 80 + weight: 4 region: content settings: rows: 5 @@ -68,5 +54,6 @@ content: hidden: feeds_item: true name: true + oc_case: true status: true user_id: true diff --git a/config/core.entity_form_display.oc_organisation.client.default.yml b/config/core.entity_form_display.oc_organisation.client.default.yml index ade4f13..c294c1a 100644 --- a/config/core.entity_form_display.oc_organisation.client.default.yml +++ b/config/core.entity_form_display.oc_organisation.client.default.yml @@ -95,24 +95,16 @@ content: placeholder: '' third_party_settings: { } field_tags: - type: entity_reference_autocomplete + type: options_select weight: 11 region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' + settings: { } third_party_settings: { } field_umbrella_client: - type: entity_reference_autocomplete + type: options_select weight: 6 region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' + settings: { } third_party_settings: { } name: type: string_textfield diff --git a/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml b/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml index 8a10374..eb86d99 100644 --- a/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml +++ b/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml @@ -18,14 +18,10 @@ bundle: umbrella_client mode: default content: field_tags: - type: entity_reference_autocomplete + type: options_select weight: 2 region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' + settings: { } third_party_settings: { } field_type_of_umbrella_client: type: options_select From 1c79ae093f225782a463ff7bb38596b7cc27ec16 Mon Sep 17 00:00:00 2001 From: naomi Date: Wed, 20 Apr 2022 14:39:43 +0100 Subject: [PATCH 07/14] =?UTF-8?q?Fees=20=E2=80=A2=20Cannot=20edit=20fees,?= =?UTF-8?q?=20although=20edit=20column=20exists?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/user.role.gno_admin_user.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/user.role.gno_admin_user.yml b/config/user.role.gno_admin_user.yml index c797031..daf8e3b 100644 --- a/config/user.role.gno_admin_user.yml +++ b/config/user.role.gno_admin_user.yml @@ -27,9 +27,12 @@ permissions: - 'delete organisation entities' - 'delete trainer entities' - 'edit case entities' + - 'edit case fee entities' - 'edit case provision entities' - 'edit equal opps entities' - 'use opencase' + - 'view all case fee revisions' + - 'view all case provision revisions' - 'view edit delete all actor entities' - 'view published case entities' - 'view published case fee entities' From 651e1e80b9162e9be1a0279bfe6c3e0667e75a74 Mon Sep 17 00:00:00 2001 From: naomi Date: Wed, 20 Apr 2022 14:50:37 +0100 Subject: [PATCH 08/14] =?UTF-8?q?Reports=20=E2=80=A2=20Cannot=20filter=20b?= =?UTF-8?q?y=20Client=20type,=20Client=20subtype,=20Tags?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/views.view.case_fees_report.yml | 168 +++++++++++++++++++++++++ config/views.view.client_report.yml | 102 +++++++++++++++ 2 files changed, 270 insertions(+) diff --git a/config/views.view.case_fees_report.yml b/config/views.view.case_fees_report.yml index 5651393..231562a 100644 --- a/config/views.view.case_fees_report.yml +++ b/config/views.view.case_fees_report.yml @@ -6,10 +6,13 @@ dependencies: - field.storage.oc_case.field_contract_signed_date - field.storage.oc_organisation.field_client_subtype - field.storage.oc_organisation.field_client_type + - field.storage.oc_organisation.field_tags - field.storage.oc_organisation.field_type_of_umbrella_client - field.storage.oc_organisation.field_umbrella_client - system.menu.opencase + - taxonomy.vocabulary.client_subtypes - taxonomy.vocabulary.client_types + - taxonomy.vocabulary.tags - user.role.gno_admin_user module: - datetime @@ -351,6 +354,69 @@ display: multi_type: separator separator: ', ' field_api_classes: false + field_tags: + id: field_tags + table: oc_organisation__field_tags + field: field_tags + relationship: client + group_type: group + admin_label: '' + plugin_id: field + label: 'Client Tags' + 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 oc_case: id: oc_case table: oc_case_fee_field_data @@ -716,6 +782,106 @@ display: hierarchy: false limit: true error_message: true + field_client_subtype_target_id: + id: field_client_subtype_target_id + table: oc_organisation__field_client_subtype + field: field_client_subtype_target_id + relationship: client + group_type: group + admin_label: '' + plugin_id: taxonomy_index_tid + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_client_subtype_target_id_op + label: 'Client subtype' + description: '' + use_operator: false + operator: field_client_subtype_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: field_client_subtype_target_id + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + gno_admin_user: '0' + follow_up_alerts: '0' + newly_accredited_alerts: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: false + vid: client_subtypes + type: select + hierarchy: false + limit: true + error_message: true + field_tags_target_id: + id: field_tags_target_id + table: oc_organisation__field_tags + field: field_tags_target_id + relationship: client + group_type: group + admin_label: '' + plugin_id: taxonomy_index_tid + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_tags_target_id_op + label: 'Client Tags' + description: '' + use_operator: false + operator: field_tags_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: field_tags_target_id + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + gno_admin_user: '0' + follow_up_alerts: '0' + newly_accredited_alerts: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: false + vid: tags + type: select + hierarchy: false + limit: true + error_message: true field_type_of_umbrella_client_value: id: field_type_of_umbrella_client_value table: oc_organisation__field_type_of_umbrella_client @@ -898,6 +1064,7 @@ display: - 'config:field.storage.oc_case.field_contract_signed_date' - 'config:field.storage.oc_organisation.field_client_subtype' - 'config:field.storage.oc_organisation.field_client_type' + - 'config:field.storage.oc_organisation.field_tags' - 'config:field.storage.oc_organisation.field_type_of_umbrella_client' - 'config:field.storage.oc_organisation.field_umbrella_client' attachment_1: @@ -1119,5 +1286,6 @@ display: - 'config:field.storage.oc_case.field_contract_signed_date' - 'config:field.storage.oc_organisation.field_client_subtype' - 'config:field.storage.oc_organisation.field_client_type' + - 'config:field.storage.oc_organisation.field_tags' - 'config:field.storage.oc_organisation.field_type_of_umbrella_client' - 'config:field.storage.oc_organisation.field_umbrella_client' diff --git a/config/views.view.client_report.yml b/config/views.view.client_report.yml index b5fe9eb..e676300 100644 --- a/config/views.view.client_report.yml +++ b/config/views.view.client_report.yml @@ -14,6 +14,8 @@ dependencies: - opencase_entities.oc_organisation_type.client - system.menu.opencase - taxonomy.vocabulary.client_status + - taxonomy.vocabulary.client_subtypes + - taxonomy.vocabulary.client_types - taxonomy.vocabulary.tags - user.role.administrator - user.role.gno_admin_user @@ -1040,6 +1042,106 @@ display: default_group: All default_group_multiple: { } group_items: { } + field_client_subtype_target_id: + id: field_client_subtype_target_id + table: oc_organisation__field_client_subtype + field: field_client_subtype_target_id + relationship: none + group_type: group + admin_label: '' + plugin_id: taxonomy_index_tid + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_client_subtype_target_id_op + label: 'Client subtype' + description: '' + use_operator: false + operator: field_client_subtype_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: field_client_subtype_target_id + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + gno_admin_user: '0' + follow_up_alerts: '0' + newly_accredited_alerts: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: false + vid: client_subtypes + type: select + hierarchy: false + limit: true + error_message: true + field_client_type_target_id: + id: field_client_type_target_id + table: oc_organisation__field_client_type + field: field_client_type_target_id + relationship: none + group_type: group + admin_label: '' + plugin_id: taxonomy_index_tid + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_client_type_target_id_op + label: 'Client type (field_client_type)' + description: '' + use_operator: false + operator: field_client_type_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: field_client_type_target_id + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + gno_admin_user: '0' + follow_up_alerts: '0' + newly_accredited_alerts: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: false + vid: client_types + type: select + hierarchy: false + limit: true + error_message: true filter_groups: operator: AND groups: From 3f072cefc23169fed8af108b0d74760f0b226111 Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 21 Apr 2022 11:37:01 +0100 Subject: [PATCH 09/14] =?UTF-8?q?Administration=20=E2=80=A2=20Capacity=20f?= =?UTF-8?q?or=20us=20to=20have=20access=20to=20certain=20variables=20via?= =?UTF-8?q?=20Administration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core.menu.static_menu_link_overrides.yml | 54 ++++ ...d.oc_case_provision.trainer.field_rate.yml | 4 +- ...case_provision.trainer.field_rate_type.yml | 2 +- config/user.role.gno_admin_user.yml | 27 ++ config/views.view.actors.yml | 240 ++++++++++++++++++ config/views.view.organisations.yml | 227 +++++++++++++++++ 6 files changed, 552 insertions(+), 2 deletions(-) create mode 100644 config/views.view.actors.yml create mode 100644 config/views.view.organisations.yml diff --git a/config/core.menu.static_menu_link_overrides.yml b/config/core.menu.static_menu_link_overrides.yml index 0f8f128..eede2d8 100644 --- a/config/core.menu.static_menu_link_overrides.yml +++ b/config/core.menu.static_menu_link_overrides.yml @@ -23,5 +23,59 @@ definitions: parent: '' expanded: false enabled: true + 'opencase__manage_taxonomy_links:client_status': + enabled: false + menu_name: opencase + parent: opencase.opencase_admin_menu + expanded: false + weight: 0 + 'opencase__manage_taxonomy_links:clie': + enabled: false + menu_name: opencase + parent: opencase.opencase_admin_menu + weight: 0 + expanded: false + 'opencase__manage_taxonomy_links:client_subtypes': + enabled: false + menu_name: opencase + parent: opencase.opencase_admin_menu + weight: 0 + expanded: false + 'opencase__manage_taxonomy_links:client_types': + enabled: false + menu_name: opencase + parent: opencase.opencase_admin_menu + weight: 0 + expanded: false + 'opencase__see_all_organisations_links:client': + enabled: false + menu_name: opencase + parent: opencase.see_all + expanded: false + weight: 0 + 'opencase__see_all_organisations_links:partner_organisation': + enabled: false + menu_name: opencase + parent: opencase.see_all + weight: 0 + expanded: false + 'opencase__see_all_people_links:trainer': + enabled: false + menu_name: opencase + parent: opencase.see_all + weight: 0 + expanded: false + 'opencase__see_all_organisations_links:umbrella_client': + enabled: false + menu_name: opencase + parent: opencase.see_all + weight: 0 + expanded: false + 'opencase__manage_taxonomy_links:oc_case_provider_role': + enabled: false + menu_name: opencase + parent: opencase.opencase_admin_menu + expanded: false + weight: 0 _core: default_config_hash: o4bYR9ZupWb3AsOIizTUG4g-nu1mdJqA59UB7QT-ifQ diff --git a/config/field.field.oc_case_provision.trainer.field_rate.yml b/config/field.field.oc_case_provision.trainer.field_rate.yml index fd5842b..184d87e 100644 --- a/config/field.field.oc_case_provision.trainer.field_rate.yml +++ b/config/field.field.oc_case_provision.trainer.field_rate.yml @@ -13,7 +13,9 @@ label: Rate description: '' required: false translatable: false -default_value: { } +default_value: + - + value: !!float 120 default_value_callback: '' settings: min: null diff --git a/config/field.field.oc_case_provision.trainer.field_rate_type.yml b/config/field.field.oc_case_provision.trainer.field_rate_type.yml index 5bfef0f..bc8277f 100644 --- a/config/field.field.oc_case_provision.trainer.field_rate_type.yml +++ b/config/field.field.oc_case_provision.trainer.field_rate_type.yml @@ -17,7 +17,7 @@ required: false translatable: false default_value: - - value: custom + value: standard default_value_callback: '' settings: { } field_type: list_string diff --git a/config/user.role.gno_admin_user.yml b/config/user.role.gno_admin_user.yml index daf8e3b..514aa1c 100644 --- a/config/user.role.gno_admin_user.yml +++ b/config/user.role.gno_admin_user.yml @@ -2,10 +2,19 @@ uuid: 1b23a802-601d-4d00-8818-392b5e496f9d langcode: en status: true dependencies: + config: + - taxonomy.vocabulary.clie + - taxonomy.vocabulary.client_status + - taxonomy.vocabulary.client_subtypes + - taxonomy.vocabulary.client_types + - taxonomy.vocabulary.oc_case_provider_role + - taxonomy.vocabulary.oc_fee_category + - taxonomy.vocabulary.tags module: - opencase - opencase_cases - opencase_entities + - taxonomy id: gno_admin_user label: 'GNO Additional Admin Permissions' weight: 4 @@ -15,7 +24,15 @@ permissions: - 'add case fee entities' - 'add case provision entities' - 'add equal opps entities' + - 'administer taxonomy' - 'administer users' + - 'create terms in clie' + - 'create terms in client_status' + - 'create terms in client_subtypes' + - 'create terms in client_types' + - 'create terms in oc_case_provider_role' + - 'create terms in oc_fee_category' + - 'create terms in tags' - 'delete activity entities' - 'delete all trainer revisions' - 'delete bank account entities' @@ -25,11 +42,21 @@ permissions: - 'delete equal opps entities' - 'delete event entities' - 'delete organisation entities' + - 'delete terms in client_subtypes' + - 'delete terms in client_types' + - 'delete terms in oc_case_provider_role' + - 'delete terms in oc_fee_category' + - 'delete terms in tags' - 'delete trainer entities' - 'edit case entities' - 'edit case fee entities' - 'edit case provision entities' - 'edit equal opps entities' + - 'edit terms in client_subtypes' + - 'edit terms in client_types' + - 'edit terms in oc_case_provider_role' + - 'edit terms in oc_fee_category' + - 'edit terms in tags' - 'use opencase' - 'view all case fee revisions' - 'view all case provision revisions' diff --git a/config/views.view.actors.yml b/config/views.view.actors.yml new file mode 100644 index 0000000..c2c859f --- /dev/null +++ b/config/views.view.actors.yml @@ -0,0 +1,240 @@ +uuid: 3c5bb2b8-402b-4876-a243-b05c20976cb3 +langcode: en +status: true +dependencies: + config: + - user.role.authenticated + module: + - opencase_entities + - user +id: actors +label: Actors +module: views +description: '' +tag: '' +base_table: oc_actor_field_data +base_field: id +display: + default: + id: default + display_title: Default + display_plugin: default + position: 0 + display_options: + fields: + name: + id: name + table: oc_actor_field_data + field: name + relationship: none + group_type: group + admin_label: '' + entity_type: oc_actor + entity_field: name + plugin_id: field + label: Name + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + pager: + type: mini + options: + offset: 0 + items_per_page: 10 + 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: false + 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: + authenticated: authenticated + cache: + type: tag + options: { } + empty: { } + sorts: { } + arguments: + type: + id: type + table: oc_actor_field_data + field: type + relationship: none + group_type: group + admin_label: '' + entity_type: oc_actor + entity_field: type + plugin_id: string + default_action: default + exception: + value: all + title_enable: false + title: All + title_enable: true + title: '{{ arguments.type }} ' + default_argument_type: raw + default_argument_options: + index: 1 + 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: { } + glossary: false + limit: 0 + case: none + path_case: none + transform_dash: false + break_phrase: false + filters: { } + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + name: name + default: '-1' + info: + name: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: false + caption: '' + description: '' + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + header: { } + footer: { } + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.roles + tags: { } + page_1: + id: page_1 + display_title: Actors + display_plugin: page + position: 1 + display_options: + display_description: '' + display_extenders: { } + path: opencase/actors/%type + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.roles + tags: { } diff --git a/config/views.view.organisations.yml b/config/views.view.organisations.yml new file mode 100644 index 0000000..0997dd1 --- /dev/null +++ b/config/views.view.organisations.yml @@ -0,0 +1,227 @@ +uuid: a0a32301-1ab4-46e5-8fc0-e0060e36d3e8 +langcode: en +status: true +dependencies: + config: + - user.role.authenticated + module: + - opencase_entities + - user +id: organisations +label: organisations +module: views +description: '' +tag: '' +base_table: oc_organisation_field_data +base_field: id +display: + default: + id: default + display_title: Default + display_plugin: default + position: 0 + display_options: + title: organisations + fields: + name: + id: name + table: oc_organisation_field_data + field: name + relationship: none + group_type: group + admin_label: '' + entity_type: null + entity_field: name + plugin_id: field + label: Name + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + pager: + type: mini + options: + offset: 0 + items_per_page: 10 + 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: false + 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: + authenticated: authenticated + cache: + type: tag + options: { } + empty: { } + sorts: { } + arguments: + type: + id: type + table: oc_organisation_field_data + field: type + relationship: none + group_type: group + admin_label: '' + entity_type: oc_organisation + entity_field: type + plugin_id: string + default_action: default + exception: + value: all + title_enable: false + title: All + title_enable: true + title: '{{ arguments.type }}' + default_argument_type: raw + default_argument_options: + index: 1 + 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: { } + glossary: false + limit: 0 + case: none + path_case: none + transform_dash: false + break_phrase: false + filters: + status: + id: status + table: oc_organisation_field_data + field: status + entity_type: oc_organisation + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + 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: { } + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.roles + tags: { } + page_1: + id: page_1 + display_title: Page + display_plugin: page + position: 1 + display_options: + display_extenders: { } + path: organisations/%type + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.roles + tags: { } From 498dcc5bcf0ad495d97c953374d46e426e0a76ff Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 21 Apr 2022 12:39:58 +0100 Subject: [PATCH 10/14] swapped old total fee field on project view for new one --- ...y_form_display.oc_case.project.default.yml | 4 ++-- ...y_view_display.oc_case.project.default.yml | 5 ++-- config/core.entity_view_mode.projects.yml | 18 ++++++++++++++ ....field.oc_case.project.field_total_fee.yml | 23 ------------------ .../field.storage.oc_case.field_total_fee.yml | 24 ------------------- config/views.view.projects.yml | 18 +++++++------- 6 files changed, 31 insertions(+), 61 deletions(-) create mode 100644 config/core.entity_view_mode.projects.yml delete mode 100644 config/field.field.oc_case.project.field_total_fee.yml delete mode 100644 config/field.storage.oc_case.field_total_fee.yml diff --git a/config/core.entity_form_display.oc_case.project.default.yml b/config/core.entity_form_display.oc_case.project.default.yml index 2ea456c..d9ca8c9 100644 --- a/config/core.entity_form_display.oc_case.project.default.yml +++ b/config/core.entity_form_display.oc_case.project.default.yml @@ -6,7 +6,6 @@ dependencies: - field.field.oc_case.project.feeds_item - field.field.oc_case.project.field_contract_signed_date - field.field.oc_case.project.field_fee - - field.field.oc_case.project.field_total_fee - opencase_cases.oc_case_type.project module: - datetime @@ -58,7 +57,8 @@ content: hidden: feeds_item: true field_fee: true - field_total_fee: true + name: true notes: true oc_target: true + total_fee: true user_id: true diff --git a/config/core.entity_view_display.oc_case.project.default.yml b/config/core.entity_view_display.oc_case.project.default.yml index f16b2e7..492278b 100644 --- a/config/core.entity_view_display.oc_case.project.default.yml +++ b/config/core.entity_view_display.oc_case.project.default.yml @@ -6,7 +6,6 @@ dependencies: - field.field.oc_case.project.feeds_item - field.field.oc_case.project.field_contract_signed_date - field.field.oc_case.project.field_fee - - field.field.oc_case.project.field_total_fee - opencase_cases.oc_case_type.project module: - datetime @@ -85,6 +84,8 @@ hidden: created: true feeds_item: true field_fee: true - field_total_fee: true + name: true notes: true + oc_target: true search_api_excerpt: true + status: true diff --git a/config/core.entity_view_mode.projects.yml b/config/core.entity_view_mode.projects.yml new file mode 100644 index 0000000..e47d274 --- /dev/null +++ b/config/core.entity_view_mode.projects.yml @@ -0,0 +1,18 @@ +uuid: d6279582-2817-4fc5-8da1-7aef408ac19f +langcode: en +status: true +dependencies: + config: + - field.storage.oc_case.field_contract_signed_date + - opencase_cases.oc_case_type.project + - system.menu.opencase + - user.role.administrator + - user.role.gno_admin_user + module: + - datetime + - opencase_cases + - user +id: projects +label: Projects +targetEntityType: null +cache: true diff --git a/config/field.field.oc_case.project.field_total_fee.yml b/config/field.field.oc_case.project.field_total_fee.yml deleted file mode 100644 index f5c2781..0000000 --- a/config/field.field.oc_case.project.field_total_fee.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 244c5c44-44f0-40b8-8dc3-5a0b2119d536 -langcode: en -status: true -dependencies: - config: - - field.storage.oc_case.field_total_fee - - opencase_cases.oc_case_type.project -id: oc_case.project.field_total_fee -field_name: field_total_fee -entity_type: oc_case -bundle: project -label: 'Total fee' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - min: null - max: null - prefix: £ - suffix: '' -field_type: decimal diff --git a/config/field.storage.oc_case.field_total_fee.yml b/config/field.storage.oc_case.field_total_fee.yml deleted file mode 100644 index e99e561..0000000 --- a/config/field.storage.oc_case.field_total_fee.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 4bb28508-5949-4bf5-9b70-97c68ab50473 -langcode: en -status: true -dependencies: - module: - - field_permissions - - opencase_cases -third_party_settings: - field_permissions: - permission_type: public -id: oc_case.field_total_fee -field_name: field_total_fee -entity_type: oc_case -type: decimal -settings: - precision: 10 - scale: 2 -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/views.view.projects.yml b/config/views.view.projects.yml index 3824a0c..8b0a1c9 100644 --- a/config/views.view.projects.yml +++ b/config/views.view.projects.yml @@ -1,10 +1,9 @@ uuid: d6279582-2817-4fc5-8da1-7aef408ac19f langcode: en -status: true +status: false dependencies: config: - field.storage.oc_case.field_contract_signed_date - - field.storage.oc_case.field_total_fee - opencase_cases.oc_case_type.project - system.menu.opencase - user.role.administrator @@ -223,15 +222,17 @@ display: multi_type: separator separator: ', ' field_api_classes: false - field_total_fee: - id: field_total_fee - table: oc_case__field_total_fee - field: field_total_fee + total_fee: + id: total_fee + table: oc_case_field_data + field: total_fee relationship: none group_type: group admin_label: '' + entity_type: oc_case + entity_field: total_fee plugin_id: field - label: 'Total fee' + label: 'Total Fee' exclude: false alter: alter_text: false @@ -367,7 +368,6 @@ display: - user.roles tags: - 'config:field.storage.oc_case.field_contract_signed_date' - - 'config:field.storage.oc_case.field_total_fee' block_1: id: block_1 display_title: Block @@ -636,7 +636,6 @@ display: - user.roles tags: - 'config:field.storage.oc_case.field_contract_signed_date' - - 'config:field.storage.oc_case.field_total_fee' entity_reference_1: id: entity_reference_1 display_title: 'Entity Reference' @@ -812,4 +811,3 @@ display: - user.roles tags: - 'config:field.storage.oc_case.field_contract_signed_date' - - 'config:field.storage.oc_case.field_total_fee' From c1a79f6747aa8a2c3d89fc6f29dd1db2b6d20dd9 Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 21 Apr 2022 13:16:39 +0100 Subject: [PATCH 11/14] removed old "trainers" field which was a paragraph --- ..._form_display.oc_case.training.default.yml | 33 +++++++------ ..._view_display.oc_case.training.default.yml | 5 +- ...field.oc_organisation.client.trainings.yml | 46 ------------------- ...d.field.oc_case.training.field_trainer.yml | 33 ------------- .../field.storage.oc_case.field_trainer.yml | 23 ---------- config/views.view.projects.yml | 2 +- 6 files changed, 24 insertions(+), 118 deletions(-) delete mode 100644 config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml 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/core.entity_form_display.oc_case.training.default.yml b/config/core.entity_form_display.oc_case.training.default.yml index 503f6cb..6711551 100644 --- a/config/core.entity_form_display.oc_case.training.default.yml +++ b/config/core.entity_form_display.oc_case.training.default.yml @@ -8,7 +8,6 @@ dependencies: - field.field.oc_case.training.field_number_of_participants - field.field.oc_case.training.field_project - field.field.oc_case.training.field_social_media - - field.field.oc_case.training.field_trainer - field.field.oc_case.training.field_training_delivery_format - field.field.oc_case.training.field_training_status - field.field.oc_case.training.field_training_type @@ -26,57 +25,65 @@ mode: default content: client: type: options_select - weight: 0 + weight: 1 region: content settings: { } third_party_settings: { } field_date_of_training: type: datetime_default - weight: 4 + weight: 5 region: content settings: { } third_party_settings: { } field_project: type: options_select - weight: 1 + weight: 2 region: content settings: { } third_party_settings: { } field_social_media: type: boolean_checkbox - weight: 7 + weight: 8 region: content settings: display_label: true third_party_settings: { } field_training_delivery_format: type: options_select - weight: 5 + weight: 6 region: content settings: { } third_party_settings: { } field_training_status: type: options_select - weight: 3 + weight: 4 region: content settings: { } third_party_settings: { } field_training_type: type: options_select - weight: 2 + weight: 3 region: content settings: { } third_party_settings: { } files: type: file_generic - weight: 6 + weight: 7 region: content settings: progress_indicator: throbber third_party_settings: { } + name: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } notes: type: string_textarea - weight: 9 + weight: 10 region: content settings: rows: 5 @@ -84,7 +91,7 @@ content: third_party_settings: { } revision_log: type: hide_revision_field_log_widget - weight: 80 + weight: 11 region: content settings: rows: 5 @@ -96,7 +103,7 @@ content: third_party_settings: { } status: type: boolean_checkbox - weight: 8 + weight: 9 region: content settings: display_label: true @@ -104,6 +111,6 @@ content: hidden: feeds_item: true field_number_of_participants: true - field_trainer: true oc_target: true + total_fee: true user_id: 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 c87bd20..9fdba1f 100644 --- a/config/core.entity_view_display.oc_case.training.default.yml +++ b/config/core.entity_view_display.oc_case.training.default.yml @@ -8,7 +8,6 @@ dependencies: - field.field.oc_case.training.field_number_of_participants - field.field.oc_case.training.field_project - field.field.oc_case.training.field_social_media - - field.field.oc_case.training.field_trainer - field.field.oc_case.training.field_training_delivery_format - field.field.oc_case.training.field_training_status - field.field.oc_case.training.field_training_type @@ -174,6 +173,8 @@ hidden: changed: true created: true feeds_item: true - field_trainer: true + name: true + oc_target: true search_api_excerpt: true + status: true total_fee: 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 deleted file mode 100644 index 496667c..0000000 --- a/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml +++ /dev/null @@ -1,46 +0,0 @@ -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 - routes: '' - negate: false - request_path: - id: request_path - pages: '' - negate: false - current_theme: - id: current_theme - theme: '' - negate: 0 -field_conditions_all_pass: false -display: - type: view 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 6e941b6..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: - negate: 0 - target_bundles: - trainer: trainer - target_bundles_drag_drop: - trainer: - enabled: true - weight: 2 -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 diff --git a/config/views.view.projects.yml b/config/views.view.projects.yml index 8b0a1c9..2ab5bab 100644 --- a/config/views.view.projects.yml +++ b/config/views.view.projects.yml @@ -1,6 +1,6 @@ uuid: d6279582-2817-4fc5-8da1-7aef408ac19f langcode: en -status: false +status: true dependencies: config: - field.storage.oc_case.field_contract_signed_date From 917161c3e6c2de32e446330ab5f23b4cfe1abe2c Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 21 Apr 2022 13:48:35 +0100 Subject: [PATCH 12/14] Added csv download option to reports. --- composer.json | 1 + composer.lock | 205 ++- config/core.extension.yml | 2 + config/views.view.case_fees_report.yml | 53 + config/views.view.case_provision_report.yml | 48 + config/views.view.client_report.yml | 55 + config/views.view.debrief_report.yml | 31 + config/views.view.evaluation_report.yml | 1705 ++++++++++--------- 8 files changed, 1272 insertions(+), 828 deletions(-) diff --git a/composer.json b/composer.json index ea469f5..a6127a6 100644 --- a/composer.json +++ b/composer.json @@ -52,6 +52,7 @@ "drupal/typed_data": "^1.0@alpha", "drupal/views_aggregator": "^2.0", "drupal/views_autosubmit": "^1.4", + "drupal/views_data_export": "^1.1", "drupal/views_summarize": "1.1.x-dev", "drush/drush": "*" }, diff --git a/composer.lock b/composer.lock index dafe929..377f6b4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cae722cdc05e4e2525a003694a33aa1d", + "content-hash": "fc650255701de3f228f8fcc1979b9880", "packages": [ { "name": "asm89/stack-cors", @@ -2557,6 +2557,56 @@ }, "time": "2022-03-21T21:21:58+00:00" }, + { + "name": "drupal/csv_serialization", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/csv_serialization.git", + "reference": "8.x-2.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/csv_serialization-8.x-2.0.zip", + "reference": "8.x-2.0", + "shasum": "3531383a6926a4ed761be56553997c2a937449ac" + }, + "require": { + "drupal/core": "^8 || ^9", + "league/csv": "^9.1" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0", + "drupal/coder": "^8.3" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-2.0", + "datestamp": "1612801962", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Matthew Grasmick", + "homepage": "https://www.drupal.org/user/455714" + } + ], + "description": "Provides CSV as a serialization format.", + "homepage": "https://www.drupal.org/project/csv_serialization", + "support": { + "source": "http://cgit.drupalcode.org/csv_serialization", + "issues": "https://www.drupal.org/project/issues/csv_serialization" + } + }, { "name": "drupal/ctools", "version": "3.7.0", @@ -4406,6 +4456,75 @@ "issues": "https://www.drupal.org/project/issues/views_autosubmit" } }, + { + "name": "drupal/views_data_export", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/views_data_export.git", + "reference": "8.x-1.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/views_data_export-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "8ee9d441e69b5861ab12286246522d52613f4e61" + }, + "require": { + "drupal/core": "^8.8 || ^9", + "drupal/csv_serialization": "~1.4 || ~2.0" + }, + "require-dev": { + "drupal/search_api": "~1.12", + "drupal/xls_serialization": "~1.0" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.1", + "datestamp": "1642805106", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Steven Jones", + "homepage": "https://www.drupal.org/user/99644" + }, + { + "name": "amoebanath", + "homepage": "https://www.drupal.org/user/2810799" + }, + { + "name": "james.williams", + "homepage": "https://www.drupal.org/user/592268" + }, + { + "name": "jamsilver", + "homepage": "https://www.drupal.org/user/476732" + }, + { + "name": "jhedstrom", + "homepage": "https://www.drupal.org/user/208732" + }, + { + "name": "nerdstein", + "homepage": "https://www.drupal.org/user/1557710" + } + ], + "description": "Plugin to export views data into various file formats.", + "homepage": "https://www.drupal.org/project/views_data_export", + "support": { + "source": "https://git.drupalcode.org/project/views_data_export" + } + }, { "name": "drupal/views_summarize", "version": "dev-1.1.x", @@ -5426,6 +5545,90 @@ ], "time": "2021-11-16T10:29:06+00:00" }, + { + "name": "league/csv", + "version": "9.8.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/csv.git", + "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/9d2e0265c5d90f5dd601bc65ff717e05cec19b47", + "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "ext-curl": "*", + "ext-dom": "*", + "friendsofphp/php-cs-fixer": "^v3.4.0", + "phpstan/phpstan": "^1.3.0", + "phpstan/phpstan-phpunit": "^1.0.0", + "phpstan/phpstan-strict-rules": "^1.1.0", + "phpunit/phpunit": "^9.5.11" + }, + "suggest": { + "ext-dom": "Required to use the XMLConverter and or the HTMLConverter classes", + "ext-iconv": "Needed to ease transcoding CSV using iconv stream filters" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.x-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "League\\Csv\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ignace Nyamagana Butera", + "email": "nyamsprod@gmail.com", + "homepage": "https://github.com/nyamsprod/", + "role": "Developer" + } + ], + "description": "CSV data manipulation made easy in PHP", + "homepage": "https://csv.thephpleague.com", + "keywords": [ + "convert", + "csv", + "export", + "filter", + "import", + "read", + "transform", + "write" + ], + "support": { + "docs": "https://csv.thephpleague.com", + "issues": "https://github.com/thephpleague/csv/issues", + "rss": "https://github.com/thephpleague/csv/releases.atom", + "source": "https://github.com/thephpleague/csv" + }, + "funding": [ + { + "url": "https://github.com/sponsors/nyamsprod", + "type": "github" + } + ], + "time": "2022-01-04T00:13:07+00:00" + }, { "name": "masterminds/html5", "version": "2.7.5", diff --git a/config/core.extension.yml b/config/core.extension.yml index a1439c6..c16d127 100644 --- a/config/core.extension.yml +++ b/config/core.extension.yml @@ -14,6 +14,7 @@ module: contact: 0 content_as_config: 0 contextual: 0 + csv_serialization: 0 ctools: 0 date_popup: 0 datetime: 0 @@ -78,6 +79,7 @@ module: user: 0 views_aggregator: 0 views_autosubmit: 0 + views_data_export: 0 views_summarize: 0 views_ui: 0 hide_revision_field: 1 diff --git a/config/views.view.case_fees_report.yml b/config/views.view.case_fees_report.yml index 231562a..16f40a1 100644 --- a/config/views.view.case_fees_report.yml +++ b/config/views.view.case_fees_report.yml @@ -15,12 +15,16 @@ dependencies: - taxonomy.vocabulary.tags - user.role.gno_admin_user module: + - csv_serialization - datetime - opencase_cases - opencase_entities - options + - rest + - serialization - taxonomy - user + - views_data_export - views_summarize id: case_fees_report label: 'Case Fees Report' @@ -1162,6 +1166,55 @@ display: - user - user.roles tags: { } + data_export_1: + id: data_export_1 + display_title: 'Data export' + display_plugin: data_export + position: 3 + display_options: + style: + type: data_export + options: + formats: + csv: csv + csv_settings: + delimiter: ',' + enclosure: '"' + escape_char: \ + strip_tags: true + trim: true + encoding: utf8 + utf8_bom: '0' + use_serializer_encode_only: false + display_extenders: { } + path: case_fees_report/download + auth: + - cookie + displays: + page_1: page_1 + default: '0' + filename: '[view:label]-[date:short] ' + automatic_download: false + store_in_public_file_directory: null + custom_redirect_path: false + redirect_to_display: none + include_query_params: false + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - request_format + - url + - user + - user.roles + tags: + - 'config:field.storage.oc_case.field_contract_signed_date' + - 'config:field.storage.oc_organisation.field_client_subtype' + - 'config:field.storage.oc_organisation.field_client_type' + - 'config:field.storage.oc_organisation.field_tags' + - 'config:field.storage.oc_organisation.field_type_of_umbrella_client' + - 'config:field.storage.oc_organisation.field_umbrella_client' page_1: id: page_1 display_title: Page diff --git a/config/views.view.case_provision_report.yml b/config/views.view.case_provision_report.yml index d5baa60..134a2dc 100644 --- a/config/views.view.case_provision_report.yml +++ b/config/views.view.case_provision_report.yml @@ -8,10 +8,14 @@ dependencies: - system.menu.opencase - user.role.gno_admin_user module: + - csv_serialization - opencase_cases - opencase_entities - options + - rest + - serialization - user + - views_data_export id: case_provision_report label: 'Case provision report' module: views @@ -693,6 +697,50 @@ display: tags: - 'config:field.storage.oc_case_provision.field_rate' - 'config:field.storage.oc_case_provision.field_rate_type' + data_export_1: + id: data_export_1 + display_title: 'Data export' + display_plugin: data_export + position: 2 + display_options: + style: + type: data_export + options: + formats: + csv: csv + csv_settings: + delimiter: ',' + enclosure: '"' + escape_char: \ + strip_tags: true + trim: true + encoding: utf8 + utf8_bom: '0' + use_serializer_encode_only: false + display_extenders: { } + path: case_provision_report/download + auth: + - cookie + displays: + page_1: page_1 + default: '0' + filename: 'Trainer-report-[date:short] ' + automatic_download: false + store_in_public_file_directory: null + custom_redirect_path: false + redirect_to_display: none + include_query_params: false + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - request_format + - url + - user.roles + tags: + - 'config:field.storage.oc_case_provision.field_rate' + - 'config:field.storage.oc_case_provision.field_rate_type' page_1: id: page_1 display_title: Page diff --git a/config/views.view.client_report.yml b/config/views.view.client_report.yml index e676300..dc32d46 100644 --- a/config/views.view.client_report.yml +++ b/config/views.view.client_report.yml @@ -21,11 +21,15 @@ dependencies: - user.role.gno_admin_user module: - better_exposed_filters + - csv_serialization - datetime - opencase_entities - options + - rest + - serialization - taxonomy - user + - views_data_export id: client_report label: 'Client Report' module: views @@ -1256,6 +1260,57 @@ display: - 'config:field.storage.oc_organisation.field_tags' - 'config:field.storage.oc_organisation.field_type_of_umbrella_client' - 'config:field.storage.oc_organisation.field_umbrella_client' + data_export_1: + id: data_export_1 + display_title: 'Data export' + display_plugin: data_export + position: 2 + display_options: + style: + type: data_export + options: + formats: + csv: csv + csv_settings: + delimiter: ',' + enclosure: '"' + escape_char: \ + strip_tags: true + trim: true + encoding: utf8 + utf8_bom: '0' + use_serializer_encode_only: false + display_extenders: { } + path: client-report/download + auth: + - cookie + displays: + page_1: page_1 + default: '0' + filename: '[view:label]-[date:short]' + automatic_download: false + store_in_public_file_directory: null + custom_redirect_path: false + redirect_to_display: none + include_query_params: false + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - request_format + - url + - user + - user.roles + tags: + - 'config:field.storage.oc_organisation.field_accreditation_date' + - 'config:field.storage.oc_organisation.field_client_status' + - 'config:field.storage.oc_organisation.field_client_substatus' + - 'config:field.storage.oc_organisation.field_client_subtype' + - 'config:field.storage.oc_organisation.field_client_type' + - 'config:field.storage.oc_organisation.field_tags' + - 'config:field.storage.oc_organisation.field_type_of_umbrella_client' + - 'config:field.storage.oc_organisation.field_umbrella_client' page_1: id: page_1 display_title: Page diff --git a/config/views.view.debrief_report.yml b/config/views.view.debrief_report.yml index 02e6363..f99219d 100644 --- a/config/views.view.debrief_report.yml +++ b/config/views.view.debrief_report.yml @@ -8,7 +8,10 @@ dependencies: - user.role.gno_admin_user module: - opencase_entities + - rest + - serialization - user + - views_data_export id: debrief_report label: 'Debrief Report' module: views @@ -362,6 +365,34 @@ display: - url.query_args - user.roles tags: { } + data_export_1: + id: data_export_1 + display_title: 'Data export' + display_plugin: data_export + position: 2 + display_options: + display_extenders: { } + path: debrief-report/download + auth: + - cookie + displays: + page_1: page_1 + default: '0' + filename: '[view:label]-[date:short]' + automatic_download: false + store_in_public_file_directory: null + custom_redirect_path: false + redirect_to_display: none + include_query_params: false + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - request_format + - url + - user.roles + tags: { } page_1: id: page_1 display_title: Page diff --git a/config/views.view.evaluation_report.yml b/config/views.view.evaluation_report.yml index ec39949..836e9bd 100644 --- a/config/views.view.evaluation_report.yml +++ b/config/views.view.evaluation_report.yml @@ -18,12 +18,16 @@ dependencies: - user.role.gno_admin_user module: - better_exposed_filters + - csv_serialization - datetime - opencase_cases - opencase_entities - options + - rest + - serialization - taxonomy - user + - views_data_export id: evaluation_report label: 'Evaluation report' module: views @@ -33,27 +37,787 @@ 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 + title: 'Evaluation report' + fields: + client: + id: client + table: oc_case_field_data + field: client + relationship: oc_case + group_type: group + admin_label: '' + entity_type: oc_case + entity_field: client + plugin_id: field + label: Client + 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 + field_client_type: + id: field_client_type + table: oc_organisation__field_client_type + field: field_client_type + relationship: client + group_type: group + admin_label: '' + plugin_id: field + label: 'Client type' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: false + 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 + oc_case: + id: oc_case + table: oc_activity_field_data + field: oc_case + relationship: none + group_type: group + admin_label: '' + entity_type: oc_activity + entity_field: oc_case + plugin_id: field + label: Training + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: 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 + created: + id: created + table: oc_activity_field_data + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: oc_activity + entity_field: created + plugin_id: field + label: 'Date submitted' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: timestamp + settings: + date_format: short + custom_date_format: '' + timezone: '' + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_age: + id: field_age + table: oc_activity__field_age + field: field_age + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: Age + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_gender: + id: field_gender + table: oc_activity__field_gender + field: field_gender + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: Gender + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_before_skills: + id: field_before_skills + table: oc_activity__field_before_skills + field: field_before_skills + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'Before skills' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_after_skills: + id: field_after_skills + table: oc_activity__field_after_skills + field: field_after_skills + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'After skills' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_b: + id: field_b + table: oc_activity__field_b + field: field_b + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'Before knowledge' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_after_knowledge: + id: field_after_knowledge + table: oc_activity__field_after_knowledge + field: field_after_knowledge + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'After knowledge' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_before_confidence: + id: field_before_confidence + table: oc_activity__field_before_confidence + field: field_before_confidence + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'Before confidence' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_a: + id: field_a + table: oc_activity__field_a + field: field_a + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'After confidence' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + pager: + type: mini 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: { } + 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: bef options: @@ -181,799 +945,31 @@ display: advanced: collapsible: false is_secondary: false - pager: - type: mini + access: + type: role options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› - style: - type: table - row: - type: fields - fields: - client: - id: client - table: oc_case_field_data - field: client - relationship: oc_case - group_type: group - admin_label: '' - label: Client - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: target_id - type: entity_reference_label - settings: - link: true - group_column: target_id - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - entity_type: oc_case - entity_field: client - plugin_id: field - field_client_type: - id: field_client_type - table: oc_organisation__field_client_type - field: field_client_type - relationship: client - group_type: group - admin_label: '' - label: 'Client type' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: target_id - type: entity_reference_label - settings: - link: false - 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 - field: oc_case - relationship: none - group_type: group - admin_label: '' - label: Training - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: target_id - type: entity_reference_label - settings: - link: true - group_column: target_id - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - entity_type: oc_activity - entity_field: oc_case - plugin_id: field - created: - id: created - table: oc_activity_field_data - field: created - relationship: none - group_type: group - admin_label: '' - label: 'Date submitted' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: timestamp - settings: - date_format: short - custom_date_format: '' - timezone: '' - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - entity_type: oc_activity - entity_field: created - plugin_id: field - field_age: - id: field_age - table: oc_activity__field_age - field: field_age - relationship: none - group_type: group - admin_label: '' - label: Age - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: list_default - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - plugin_id: field - field_gender: - id: field_gender - table: oc_activity__field_gender - field: field_gender - relationship: none - group_type: group - admin_label: '' - label: Gender - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: list_default - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - plugin_id: field - field_before_skills: - id: field_before_skills - table: oc_activity__field_before_skills - field: field_before_skills - relationship: none - group_type: group - admin_label: '' - label: 'Before skills' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: list_default - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - plugin_id: field - field_after_skills: - id: field_after_skills - table: oc_activity__field_after_skills - field: field_after_skills - relationship: none - group_type: group - admin_label: '' - label: 'After skills' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: list_default - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - plugin_id: field - field_b: - id: field_b - table: oc_activity__field_b - field: field_b - relationship: none - group_type: group - admin_label: '' - label: 'Before knowledge' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: list_default - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - plugin_id: field - field_after_knowledge: - id: field_after_knowledge - table: oc_activity__field_after_knowledge - field: field_after_knowledge - relationship: none - group_type: group - admin_label: '' - label: 'After knowledge' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: list_default - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - plugin_id: field - field_before_confidence: - id: field_before_confidence - table: oc_activity__field_before_confidence - field: field_before_confidence - relationship: none - group_type: group - admin_label: '' - label: 'Before confidence' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: list_default - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - plugin_id: field - field_a: - id: field_a - table: oc_activity__field_a - field: field_a - relationship: none - group_type: group - admin_label: '' - label: 'After confidence' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: list_default - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - plugin_id: field + role: + gno_admin_user: gno_admin_user + cache: + type: tag + options: { } + empty: { } + sorts: { } + arguments: { } filters: type: id: type table: oc_activity_field_data field: type - value: - evaluation: evaluation entity_type: oc_activity entity_field: type plugin_id: bundle + value: + evaluation: evaluation + group: 1 expose: operator_limit_selection: false operator_list: { } - group: 1 field_age_value: id: field_age_value table: oc_activity__field_age @@ -981,6 +977,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: list_field operator: or value: { } group: 1 @@ -1018,7 +1015,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: list_field field_gender_value: id: field_gender_value table: oc_activity__field_gender @@ -1026,6 +1022,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: list_field operator: or value: { } group: 1 @@ -1063,7 +1060,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: list_field field_before_confidence_value: id: field_before_confidence_value table: oc_activity__field_before_confidence @@ -1071,6 +1067,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: list_field operator: or value: { } group: 1 @@ -1108,7 +1105,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: list_field field_a_value: id: field_a_value table: oc_activity__field_a @@ -1116,6 +1112,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: list_field operator: or value: { } group: 1 @@ -1153,7 +1150,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: list_field field_b_value: id: field_b_value table: oc_activity__field_b @@ -1161,6 +1157,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: list_field operator: or value: { } group: 1 @@ -1198,7 +1195,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: list_field field_after_knowledge_value: id: field_after_knowledge_value table: oc_activity__field_after_knowledge @@ -1206,6 +1202,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: list_field operator: or value: { } group: 1 @@ -1243,7 +1240,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: list_field field_before_skills_value: id: field_before_skills_value table: oc_activity__field_before_skills @@ -1251,6 +1247,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: list_field operator: or value: { } group: 1 @@ -1288,7 +1285,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: list_field field_after_skills_value: id: field_after_skills_value table: oc_activity__field_after_skills @@ -1296,6 +1292,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: list_field operator: or value: { } group: 1 @@ -1333,7 +1330,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: list_field field_client_type_target_id: id: field_client_type_target_id table: oc_organisation__field_client_type @@ -1341,6 +1337,7 @@ display: relationship: client group_type: group admin_label: '' + plugin_id: taxonomy_index_tid operator: or value: { } group: 1 @@ -1378,12 +1375,11 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - type: select - limit: true vid: client_types + type: select hierarchy: false + limit: true error_message: true - plugin_id: taxonomy_index_tid field_accreditation_date_value: id: field_accreditation_date_value table: oc_organisation__field_accreditation_date @@ -1391,6 +1387,7 @@ display: relationship: client group_type: group admin_label: '' + plugin_id: datetime operator: between value: min: '' @@ -1418,9 +1415,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: '' @@ -1433,12 +1430,22 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: datetime - sorts: { } - title: 'Evaluation report' - header: { } - footer: { } - empty: { } + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } relationships: oc_case: id: oc_case @@ -1447,10 +1454,10 @@ display: relationship: none group_type: group admin_label: Case - required: false entity_type: oc_activity entity_field: oc_case plugin_id: standard + required: false client: id: client table: oc_case_field_data @@ -1458,16 +1465,13 @@ display: relationship: oc_case group_type: group admin_label: Organisation - required: false entity_type: oc_case entity_field: client plugin_id: standard - arguments: { } + required: false + header: { } + footer: { } display_extenders: { } - filter_groups: - operator: AND - groups: - 1: AND cache_metadata: max-age: -1 contexts: @@ -1487,24 +1491,71 @@ display: - 'config:field.storage.oc_activity.field_before_skills' - 'config:field.storage.oc_activity.field_gender' - 'config:field.storage.oc_organisation.field_client_type' + data_export_1: + id: data_export_1 + display_title: 'Data export' + display_plugin: data_export + position: 2 + display_options: + style: + type: data_export + options: + formats: + csv: csv + csv_settings: + delimiter: ',' + enclosure: '"' + escape_char: \ + strip_tags: true + trim: true + encoding: utf8 + utf8_bom: '0' + use_serializer_encode_only: false + display_extenders: { } + path: evaluation-report/download + filename: '[view:label]-[date:short] ' + automatic_download: false + store_in_public_file_directory: null + custom_redirect_path: false + redirect_to_display: none + include_query_params: false + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - request_format + - url + - user + - user.roles + tags: + - 'config:field.storage.oc_activity.field_a' + - 'config:field.storage.oc_activity.field_after_knowledge' + - 'config:field.storage.oc_activity.field_after_skills' + - 'config:field.storage.oc_activity.field_age' + - 'config:field.storage.oc_activity.field_b' + - 'config:field.storage.oc_activity.field_before_confidence' + - 'config:field.storage.oc_activity.field_before_skills' + - 'config:field.storage.oc_activity.field_gender' + - 'config:field.storage.oc_organisation.field_client_type' page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: + exposed_block: true display_extenders: { } path: evaluation-report menu: type: normal title: 'Evaluation 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: From 7b6d60ceee53f70835813dddd99d1f661d8760df Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 22 Apr 2022 09:34:48 +0100 Subject: [PATCH 13/14] made event attendees a multiselect instead of autocomplete --- ...m_display.oc_event.train_the_trainer.default.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/config/core.entity_form_display.oc_event.train_the_trainer.default.yml b/config/core.entity_form_display.oc_event.train_the_trainer.default.yml index 583a407..8d70078 100644 --- a/config/core.entity_form_display.oc_event.train_the_trainer.default.yml +++ b/config/core.entity_form_display.oc_event.train_the_trainer.default.yml @@ -4,13 +4,17 @@ status: true dependencies: config: - opencase_entities.oc_event_type.train_the_trainer - module: - - datetime id: oc_event.train_the_trainer.default targetEntityType: oc_event bundle: train_the_trainer mode: default content: + attendees: + type: options_select + weight: 2 + region: content + settings: { } + third_party_settings: { } name: type: string_textfield weight: 0 @@ -26,4 +30,7 @@ content: settings: display_label: true third_party_settings: { } -hidden: { } +hidden: + activity_date_time: true + description: true + user_id: true From 0deb98d2d03d4e149b62a003a45a127ccd7049da Mon Sep 17 00:00:00 2001 From: naomi Date: Mon, 25 Apr 2022 12:42:47 +0100 Subject: [PATCH 14/14] updated drupal core --- composer.lock | 72 +++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/composer.lock b/composer.lock index 377f6b4..4016881 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": "d627ab74395f0cf44ff207d18903b2ba71d9b2ed" + "reference": "05f569b529c0fca04240514ee3a6cfefd0c49033" }, "require": { "drupal/admin_toolbar": "*", @@ -86,7 +86,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-04-06T08:46:54+00:00" + "time": "2022-04-22T15:42:17+00:00" }, { "name": "autonomic/opencase", @@ -94,7 +94,7 @@ "source": { "type": "git", "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git", - "reference": "34b7a1c7c9a56926bd47e0b024b443033e397d1c" + "reference": "5af08013021a173f0f29cff029fbfbbfec649ba2" }, "require": { "composer/installers": "*", @@ -111,7 +111,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-04-03T18:27:43+00:00" + "time": "2022-04-22T15:26:09+00:00" }, { "name": "bjeavons/zxcvbn-php", @@ -2125,16 +2125,16 @@ }, { "name": "drupal/core", - "version": "9.3.9", + "version": "9.3.12", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774" + "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/86b0c4496e20ae7f945e9a7f0404fafe191ab774", - "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774", + "url": "https://api.github.com/repos/drupal/core/zipball/ed6af33093f66a9c5048d02f9f2c326ad0e7e90c", + "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c", "shasum": "" }, "require": { @@ -2376,13 +2376,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.3.9" + "source": "https://github.com/drupal/core/tree/9.3.12" }, - "time": "2022-03-21T21:21:58+00:00" + "time": "2022-04-20T14:25:27+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "9.3.9", + "version": "9.3.12", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2426,13 +2426,13 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.9" + "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.12" }, "time": "2022-02-24T17:40:56+00:00" }, { "name": "drupal/core-project-message", - "version": "9.3.9", + "version": "9.3.12", "source": { "type": "git", "url": "https://github.com/drupal/core-project-message.git", @@ -2467,22 +2467,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-project-message/tree/9.3.9" + "source": "https://github.com/drupal/core-project-message/tree/9.3.12" }, "time": "2022-02-24T17:40:56+00:00" }, { "name": "drupal/core-recommended", - "version": "9.3.9", + "version": "9.3.12", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411" + "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/3ce3f2b6145de56178e006fb2ef94089d32cf411", - "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/a8fa50016c1aa1eb7f4e54f590e6343d286c418f", + "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f", "shasum": "" }, "require": { @@ -2491,7 +2491,7 @@ "doctrine/annotations": "1.13.2", "doctrine/lexer": "1.2.1", "doctrine/reflection": "1.2.2", - "drupal/core": "9.3.9", + "drupal/core": "9.3.12", "egulias/email-validator": "3.1.2", "guzzlehttp/guzzle": "6.5.5", "guzzlehttp/promises": "1.5.1", @@ -2553,9 +2553,9 @@ ], "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/9.3.9" + "source": "https://github.com/drupal/core-recommended/tree/9.3.12" }, - "time": "2022-03-21T21:21:58+00:00" + "time": "2022-04-20T14:25:27+00:00" }, { "name": "drupal/csv_serialization", @@ -3573,20 +3573,20 @@ }, { "name": "drupal/paragraphs", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/paragraphs.git", - "reference": "8.x-1.13" + "reference": "8.x-1.14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.13.zip", - "reference": "8.x-1.13", - "shasum": "5e06df68411b17a5d8adaa292ddf70840d00876f" + "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.14.zip", + "reference": "8.x-1.14", + "shasum": "caa1a945dcfd058c4937c4907743eed970ce14cc" }, "require": { - "drupal/core": "^8.8 || ^9", + "drupal/core": "^9.2", "drupal/entity_reference_revisions": "~1.3" }, "require-dev": { @@ -3608,8 +3608,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.13", - "datestamp": "1646121716", + "version": "8.x-1.14", + "datestamp": "1650520869", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4572,22 +4572,22 @@ }, { "name": "drush/drush", - "version": "11.0.7", + "version": "11.0.9", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "6991a3b8f6827d0bab13005402730fc50d130a50" + "reference": "88b2293ded84f67aad96ad6dbd64cacd84bcd6fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/6991a3b8f6827d0bab13005402730fc50d130a50", - "reference": "6991a3b8f6827d0bab13005402730fc50d130a50", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/88b2293ded84f67aad96ad6dbd64cacd84bcd6fe", + "reference": "88b2293ded84f67aad96ad6dbd64cacd84bcd6fe", "shasum": "" }, "require": { "chi-teck/drupal-code-generator": "^2.4", "composer/semver": "^1.4 || ^3", - "consolidation/annotated-command": "^4.5", + "consolidation/annotated-command": "^4.5.3", "consolidation/config": "^2", "consolidation/filter-via-dot-access-data": "^2", "consolidation/robo": "^3.0.9", @@ -4706,7 +4706,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.7" + "source": "https://github.com/drush-ops/drush/tree/11.0.9" }, "funding": [ { @@ -4714,7 +4714,7 @@ "type": "github" } ], - "time": "2022-03-09T19:32:53+00:00" + "time": "2022-04-16T12:01:55+00:00" }, { "name": "egulias/email-validator",