From df22c9f52e61d0ba21098bc5a638dc9d9f5ee8b0 Mon Sep 17 00:00:00 2001 From: naomi Date: Mon, 27 Dec 2021 13:46:37 +0000 Subject: [PATCH] module & config for totals on case fees report --- composer.json | 2 +- composer.lock | 23 +- config/views.view.case_fees_report.yml | 278 +++++++++++++++++-------- 3 files changed, 198 insertions(+), 105 deletions(-) diff --git a/composer.json b/composer.json index 523a86b..2447366 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "drupal/typed_data": "^1.0@alpha", "drupal/views_aggregator": "^1.0@beta", "drupal/views_autosubmit": "^1.4", - "drupal/views_summarize": "^1.1@beta", + "drupal/views_summarize": "1.1.x-dev", "drush/drush": "*" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 98afd5e..2f06fc1 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": "1400f8da4aac9a6063e4f60140db35e9", + "content-hash": "1dcd292bcc51cfadae5247424b1c4533", "packages": [ { "name": "asm89/stack-cors", @@ -4389,29 +4389,26 @@ }, { "name": "drupal/views_summarize", - "version": "1.1.0-beta2", + "version": "dev-1.1.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_summarize.git", - "reference": "1.1.0-beta2" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_summarize-1.1.0-beta2.zip", - "reference": "1.1.0-beta2", - "shasum": "7551972736e95055545ed92cf62e086d282357c7" + "reference": "e03c0444567e618be1042284c51f44b205d46c4b" }, "require": { "drupal/core": "^8 || ^9" }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-1.1.x": "1.1.x-dev" + }, "drupal": { - "version": "1.1.0-beta2", - "datestamp": "1604614255", + "version": "1.1.0-beta2+2-dev", + "datestamp": "1613857786", "security-coverage": { "status": "not-covered", - "message": "Beta releases are not covered by Drupal security advisories." + "message": "Dev releases are not covered by Drupal security advisories." } } }, @@ -11938,7 +11935,7 @@ "drupal/tamper": 15, "drupal/typed_data": 15, "drupal/views_aggregator": 10, - "drupal/views_summarize": 10 + "drupal/views_summarize": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/config/views.view.case_fees_report.yml b/config/views.view.case_fees_report.yml index 808c6c4..3dff384 100644 --- a/config/views.view.case_fees_report.yml +++ b/config/views.view.case_fees_report.yml @@ -18,6 +18,7 @@ dependencies: - options - taxonomy - user + - views_summarize id: case_fees_report label: 'Case Fees Report' module: views @@ -27,59 +28,12 @@ base_table: oc_case_fee_field_data base_field: id display: default: - display_plugin: default id: default display_title: Master + display_plugin: default position: 0 display_options: - access: - type: role - options: - role: - gno_admin_user: gno_admin_user - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: true - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› - style: - type: table - row: - type: fields + title: 'Project Fees Report' fields: field_umbrella_client: id: field_umbrella_client @@ -88,6 +42,7 @@ display: relationship: client group_type: group admin_label: '' + plugin_id: field label: 'Umbrella Client' exclude: false alter: @@ -143,7 +98,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field field_type_of_umbrella_client: id: field_type_of_umbrella_client table: oc_organisation__field_type_of_umbrella_client @@ -151,6 +105,7 @@ display: relationship: field_umbrella_client group_type: group admin_label: '' + plugin_id: field label: 'Umbrella client type' exclude: false alter: @@ -205,7 +160,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field client: id: client table: oc_case_field_data @@ -213,6 +167,9 @@ display: relationship: oc_case group_type: group admin_label: '' + entity_type: oc_case + entity_field: client + plugin_id: field label: Client exclude: false alter: @@ -268,9 +225,6 @@ display: 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 @@ -278,6 +232,7 @@ display: relationship: client group_type: group admin_label: '' + plugin_id: field label: 'Client type' exclude: false alter: @@ -333,7 +288,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field field_client_subtype: id: field_client_subtype table: oc_organisation__field_client_subtype @@ -341,6 +295,7 @@ display: relationship: client group_type: group admin_label: '' + plugin_id: field label: 'Client subtype' exclude: false alter: @@ -396,7 +351,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field oc_case: id: oc_case table: oc_case_fee_field_data @@ -404,6 +358,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: oc_case_fee + entity_field: oc_case + plugin_id: field label: Project exclude: false alter: @@ -459,9 +416,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: oc_case_fee - entity_field: oc_case - plugin_id: field field_contract_signed_date: id: field_contract_signed_date table: oc_case__field_contract_signed_date @@ -469,6 +423,7 @@ display: relationship: oc_case group_type: group admin_label: '' + plugin_id: field label: 'Contract signed date' exclude: false alter: @@ -525,7 +480,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field oc_fee_category: id: oc_fee_category table: oc_case_fee_field_data @@ -533,6 +487,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: oc_case_fee + entity_field: oc_fee_category + plugin_id: field label: 'Fee Category' exclude: false alter: @@ -588,9 +545,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: oc_case_fee - entity_field: oc_fee_category - plugin_id: field amount: id: amount table: oc_case_fee_field_data @@ -598,6 +552,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: oc_case_fee + entity_field: amount + plugin_id: field label: Amount exclude: false alter: @@ -643,9 +600,9 @@ display: type: number_decimal settings: thousand_separator: ',' - prefix_suffix: true decimal_separator: . scale: 2 + prefix_suffix: true group_column: value group_columns: { } group_rows: true @@ -656,23 +613,59 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: oc_case_fee - entity_field: amount - plugin_id: field + pager: + type: mini + options: + offset: 0 + items_per_page: 50 + total_pages: null + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: role + options: + role: + gno_admin_user: gno_admin_user + cache: + type: tag + options: { } + empty: { } + sorts: { } + arguments: { } filters: status: - value: '1' + id: status table: oc_case_fee_field_data field: status - plugin_id: boolean entity_type: oc_case_fee entity_field: status - id: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - group: 1 field_type_of_umbrella_client_value: id: field_type_of_umbrella_client_value table: oc_organisation__field_type_of_umbrella_client @@ -680,6 +673,7 @@ display: relationship: field_umbrella_client group_type: group admin_label: '' + plugin_id: list_field operator: or value: { } group: 1 @@ -717,7 +711,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: list_field field_contract_signed_date_value_1: id: field_contract_signed_date_value_1 table: oc_case__field_contract_signed_date @@ -725,6 +718,7 @@ display: relationship: oc_case group_type: group admin_label: '' + plugin_id: datetime operator: between value: min: '' @@ -752,9 +746,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: '' @@ -767,7 +761,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: datetime field_client_type_target_id: id: field_client_type_target_id table: oc_organisation__field_client_type @@ -775,6 +768,7 @@ display: relationship: client group_type: group admin_label: '' + plugin_id: taxonomy_index_tid operator: or value: { } group: 1 @@ -812,17 +806,118 @@ 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 - sorts: { } - title: 'Project Fees Report' - header: { } - footer: { } - empty: { } + style: + type: tablesummarized + options: + grouping: { } + row_class: '' + default_row_class: true + override: 1 + sticky: 0 + caption: '' + summary: '' + description: '' + columns: + field_umbrella_client: field_umbrella_client + field_type_of_umbrella_client: field_type_of_umbrella_client + client: client + field_client_type: field_client_type + field_client_subtype: field_client_subtype + oc_case: oc_case + field_contract_signed_date: field_contract_signed_date + oc_fee_category: oc_fee_category + amount: amount + info: + field_umbrella_client: + sortable: 0 + default_sort_order: asc + align: '' + separator: '' + empty_column: 0 + responsive: '' + summarize: none + field_type_of_umbrella_client: + sortable: 0 + default_sort_order: asc + align: '' + separator: '' + empty_column: 0 + responsive: '' + summarize: none + client: + sortable: 0 + default_sort_order: asc + align: '' + separator: '' + empty_column: 0 + responsive: '' + summarize: none + field_client_type: + sortable: 0 + default_sort_order: asc + align: '' + separator: '' + empty_column: 0 + responsive: '' + summarize: none + field_client_subtype: + sortable: 0 + default_sort_order: asc + align: '' + separator: '' + empty_column: 0 + responsive: '' + summarize: none + oc_case: + sortable: 0 + default_sort_order: asc + align: '' + separator: '' + empty_column: 0 + responsive: '' + summarize: none + field_contract_signed_date: + sortable: 0 + default_sort_order: asc + align: '' + separator: '' + empty_column: 0 + responsive: '' + summarize: none + oc_fee_category: + sortable: 0 + default_sort_order: asc + align: '' + separator: '' + empty_column: 0 + responsive: '' + summarize: none + amount: + sortable: 0 + default_sort_order: asc + align: '' + separator: '' + empty_column: 0 + responsive: '' + summarize: currency + default: '-1' + empty_table: 0 + summary_only: 0 + 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 @@ -831,10 +926,10 @@ display: relationship: none group_type: group admin_label: Case - required: false entity_type: oc_case_fee entity_field: oc_case plugin_id: standard + required: false client: id: client table: oc_case_field_data @@ -842,10 +937,10 @@ display: relationship: oc_case group_type: group admin_label: Organisation - required: false entity_type: oc_case entity_field: client plugin_id: standard + required: false field_umbrella_client: id: field_umbrella_client table: oc_organisation__field_umbrella_client @@ -853,9 +948,10 @@ display: relationship: client group_type: group admin_label: 'field_umbrella_client: Organisation' - required: false plugin_id: standard - arguments: { } + required: false + header: { } + footer: { } display_extenders: { } cache_metadata: max-age: -1 @@ -873,23 +969,23 @@ display: - 'config:field.storage.oc_organisation.field_type_of_umbrella_client' - 'config:field.storage.oc_organisation.field_umbrella_client' page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: + exposed_block: true display_extenders: { } path: project-fees-report - exposed_block: true menu: type: normal title: 'Project fees report' description: '' - expanded: false - parent: opencase.reporting weight: 0 - context: '0' + expanded: false menu_name: opencase + parent: opencase.reporting + context: '0' cache_metadata: max-age: -1 contexts: