From 48bd9c5577049c6f9305d41df2987950da58c602 Mon Sep 17 00:00:00 2001 From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:09:37 -0800 Subject: [PATCH 1/2] updated supp and irregular approval funding on the funding table --- backend/src/util/mapping/Mappings.js | 2 ++ frontend/src/components/funding/FundingAgreementsTab.vue | 4 ++-- frontend/src/views/funding/IrregularFundingView.vue | 2 +- frontend/src/views/funding/SupplementaryFundingView.vue | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/src/util/mapping/Mappings.js b/backend/src/util/mapping/Mappings.js index 95b130c4..5bdda9b6 100644 --- a/backend/src/util/mapping/Mappings.js +++ b/backend/src/util/mapping/Mappings.js @@ -400,6 +400,7 @@ const SupplementaryApplicationMappings = [ { back: 'ofm_end_date', front: 'endDate' }, { back: 'ofm_renewal_term', front: 'renewalTerm' }, { back: 'ofm_retroactive_date', front: 'retroactiveDate' }, + { back: 'ofm_funding_number', front: 'fundingAgreementNumber' }, ] const RoleMappings = [ @@ -492,6 +493,7 @@ const IrregularExpenseMappings = [ { back: 'ofm_end_date', front: 'endDate' }, { back: 'ofm_expenseid', front: 'irregularExpenseId' }, { back: '_ofm_application_value', front: 'applicationId' }, + { back: 'ofm_funding_number', front: 'fundingAgreementNumber' }, ] module.exports = { diff --git a/frontend/src/components/funding/FundingAgreementsTab.vue b/frontend/src/components/funding/FundingAgreementsTab.vue index 563f308a..4887dec0 100644 --- a/frontend/src/components/funding/FundingAgreementsTab.vue +++ b/frontend/src/components/funding/FundingAgreementsTab.vue @@ -104,7 +104,7 @@ export default { this.fundingAgreements.push({ startDate: app.startDate, endDate: app.endDate, - fundingAgreementNumber: app.supplementaryReferenceNumber, + fundingAgreementNumber: app.fundingAgreementNumber, fundingAgreementType: app.supplementaryTypeDescription, expenseAuthority: BLANK_FIELD, facilityName: applications?.find((el) => app?.applicationId === el?.applicationId)?.facilityName, @@ -154,7 +154,7 @@ export default { this.fundingAgreements.push({ startDate: app.startDate, endDate: app.endDate, - fundingAgreementNumber: app.referenceNumber, + fundingAgreementNumber: app.fundingAgreementNumber, fundingAgreementType: APPLICATION_TYPES.IRREGULAR_EXPENSE, expenseAuthority: BLANK_FIELD, facilityName: activeFA.facilityName, diff --git a/frontend/src/views/funding/IrregularFundingView.vue b/frontend/src/views/funding/IrregularFundingView.vue index 2bb6521f..e3d151b1 100644 --- a/frontend/src/views/funding/IrregularFundingView.vue +++ b/frontend/src/views/funding/IrregularFundingView.vue @@ -39,7 +39,7 @@ export default { }, computed: { downloadFileName() { - return `Approval_Notification_${this.application?.referenceNumber}` + return `Approval_Notification_${this.application?.fundingAgreementNumber}` }, }, diff --git a/frontend/src/views/funding/SupplementaryFundingView.vue b/frontend/src/views/funding/SupplementaryFundingView.vue index 73c21098..2c3f557f 100644 --- a/frontend/src/views/funding/SupplementaryFundingView.vue +++ b/frontend/src/views/funding/SupplementaryFundingView.vue @@ -39,7 +39,7 @@ export default { }, computed: { downloadFileName() { - return `Approval_Notification_${this.application?.supplementaryReferenceNumber}` + return `Approval_Notification_${this.application?.fundingAgreementNumber}` }, }, From 1139845a1c7fb7b3950eba04cd336502e282b819 Mon Sep 17 00:00:00 2001 From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:12:31 -0800 Subject: [PATCH 2/2] fixed indentation --- backend/src/util/mapping/Mappings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/util/mapping/Mappings.js b/backend/src/util/mapping/Mappings.js index 5bdda9b6..66549ddd 100644 --- a/backend/src/util/mapping/Mappings.js +++ b/backend/src/util/mapping/Mappings.js @@ -493,7 +493,7 @@ const IrregularExpenseMappings = [ { back: 'ofm_end_date', front: 'endDate' }, { back: 'ofm_expenseid', front: 'irregularExpenseId' }, { back: '_ofm_application_value', front: 'applicationId' }, - { back: 'ofm_funding_number', front: 'fundingAgreementNumber' }, + { back: 'ofm_funding_number', front: 'fundingAgreementNumber' }, ] module.exports = {