From ed6e4146b608f305a0edc8fe1c2b601b52bf15f5 Mon Sep 17 00:00:00 2001 From: Guru Prasath Date: Mon, 16 Sep 2024 23:10:01 +0100 Subject: [PATCH 1/4] emp-512 - CRM 7 - Defect Fix - Disbursements --- .../customDisplay/crm7/crm7Disbursements.njk | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/server/views/components/customDisplay/crm7/crm7Disbursements.njk b/server/views/components/customDisplay/crm7/crm7Disbursements.njk index de1e345a..c19ea0ab 100644 --- a/server/views/components/customDisplay/crm7/crm7Disbursements.njk +++ b/server/views/components/customDisplay/crm7/crm7Disbursements.njk @@ -8,10 +8,11 @@ { text: "Disbursement"}, { text: "Details" }, { text: "Miles" }, - { text: "Net Value" }, + { text: "Net" }, { text: "VAT Rate" }, - { text: "VAT Value" }, - { text: "Total" } + { text: "VAT" }, + { text: "Total" }, + { text: "Official use only" } ], rows: [] } %} @@ -33,18 +34,18 @@ {# Render "Disbursements Total" subsection #} {% set fields = [ - { label: "Total Net", value: data.totals.net | formatCurrency}, - { label: "Total VAT", value: data.totals.vat | formatCurrency}, + { label: "Total Net", value: data.totals.net | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"}, + { label: "Total VAT", value: data.totals.vat | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"}, { label: "Grand Total", value: data.totals.total | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"} ] %} - {{ formSubsection('Disbursements total', fields) }} + {{ formSubsection('Disbursements Total', fields) }} {# Render "Office Use Only" subsection #} {% set fields = [ - { label: "Total Net", value: data.officeUse.net | formatCurrency}, - { label: "Total VAT", value: data.officeUse.vat | formatCurrency}, + { label: "Total Net", value: data.officeUse.net | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"}, + { label: "Total VAT", value: data.officeUse.vat | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"}, { label: "Grand Total", value: data.officeUse.total | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"} ] %} {{ formSubsection('Office Use', fields) }} From 404d118871d956078478add264c681fa95c91d33 Mon Sep 17 00:00:00 2001 From: Guru Prasath Date: Mon, 16 Sep 2024 23:25:54 +0100 Subject: [PATCH 2/4] emp-512 - Adding officialUseOnly details --- .../components/customDisplay/crm7/crm7Disbursements.njk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/views/components/customDisplay/crm7/crm7Disbursements.njk b/server/views/components/customDisplay/crm7/crm7Disbursements.njk index c19ea0ab..000b8a6f 100644 --- a/server/views/components/customDisplay/crm7/crm7Disbursements.njk +++ b/server/views/components/customDisplay/crm7/crm7Disbursements.njk @@ -22,10 +22,11 @@ { text: item.disbursement | safe, attributes: { 'data-header': 'Disbursement' } }, { text: item.details | safe, attributes: { 'data-header': 'Details' } }, { text: item.miles | safe, attributes: { 'data-header': 'Miles' } }, - { text: item.netValue | safe | formatCurrency, attributes: { 'data-header': 'Net Value' } }, + { text: item.netValue | safe | formatCurrency, attributes: { 'data-header': 'Net' } }, { text: item.vatRate | safe, attributes: { 'data-header': 'VAT Rate' } }, - { text: item.vatValue | safe | formatCurrency, attributes: { 'data-header': 'VAT Value' } }, - { text: item.total | safe | formatCurrency, attributes: { 'data-header': 'Total' } } + { text: item.vatValue | safe | formatCurrency, attributes: { 'data-header': 'VAT' } }, + { text: item.total | safe | formatCurrency, attributes: { 'data-header': 'Total' } }, + { text: item.officialUseOnly | safe | formatCurrency, attributes: { 'data-header': 'Official use only' } } ] -%} {% set list = tableData.rows.push(tableRow) %} {% endfor %} From 06460a5ce92cfcdeb4c4a9dbbccace129426ac9a Mon Sep 17 00:00:00 2001 From: Guru Prasath Date: Mon, 16 Sep 2024 23:34:49 +0100 Subject: [PATCH 3/4] EMP-512 and EMP-515 - Fixing CRM7 defect --- .../views/components/customDisplay/crm7/crm7OfficeUseOnly.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/views/components/customDisplay/crm7/crm7OfficeUseOnly.njk b/server/views/components/customDisplay/crm7/crm7OfficeUseOnly.njk index 93ef2a76..9e244295 100644 --- a/server/views/components/customDisplay/crm7/crm7OfficeUseOnly.njk +++ b/server/views/components/customDisplay/crm7/crm7OfficeUseOnly.njk @@ -23,6 +23,6 @@ { label: "Signed Authority", value: data.Authority.signedAuth }, { label: "Decision Date", value: data.Authority.signedAuthDate | formatDate } ] %} - {{ formSubsection('Authority', fieldsAuthority) }} + {{ formSubsection('Authority Signed', fieldsAuthority) }} {% endmacro %} \ No newline at end of file From 0d49c59d587707dc33e73251a877cd943aa95fc2 Mon Sep 17 00:00:00 2001 From: Guru Prasath Date: Tue, 17 Sep 2024 12:43:48 +0100 Subject: [PATCH 4/4] EMP-512 Fixing review comments --- .../customDisplay/crm7/crm7Disbursements.njk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/views/components/customDisplay/crm7/crm7Disbursements.njk b/server/views/components/customDisplay/crm7/crm7Disbursements.njk index 000b8a6f..3bb5d29e 100644 --- a/server/views/components/customDisplay/crm7/crm7Disbursements.njk +++ b/server/views/components/customDisplay/crm7/crm7Disbursements.njk @@ -35,9 +35,9 @@ {# Render "Disbursements Total" subsection #} {% set fields = [ - { label: "Total Net", value: data.totals.net | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"}, - { label: "Total VAT", value: data.totals.vat | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"}, - { label: "Grand Total", value: data.totals.total | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"} + { label: "Total Net", value: data.totals.net | formatCurrency}, + { label: "Total VAT", value: data.totals.vat | formatCurrency}, + { label: "Grand Total", value: data.totals.total | formatCurrency} ] %} {{ formSubsection('Disbursements Total', fields) }} @@ -45,9 +45,9 @@ {# Render "Office Use Only" subsection #} {% set fields = [ - { label: "Total Net", value: data.officeUse.net | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"}, - { label: "Total VAT", value: data.officeUse.vat | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"}, - { label: "Grand Total", value: data.officeUse.total | formatCurrency, class: "govuk-brand-colour govuk-!-font-weight-bold"} + { label: "Total Net", value: data.officeUse.net | formatCurrency}, + { label: "Total VAT", value: data.officeUse.vat | formatCurrency}, + { label: "Grand Total", value: data.officeUse.total | formatCurrency} ] %} {{ formSubsection('Office Use', fields) }}