Skip to content

Commit

Permalink
Merge pull request #413 from bcgov/ofmcc-6309-display-supp-mod
Browse files Browse the repository at this point in the history
Ofmcc 6309 Updates to Funding Agreement table
  • Loading branch information
jenbeckett authored Nov 5, 2024
2 parents 0a92727 + 1139845 commit 987b230
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions backend/src/util/mapping/Mappings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/funding/FundingAgreementsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/funding/IrregularFundingView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default {
},
computed: {
downloadFileName() {
return `Approval_Notification_${this.application?.referenceNumber}`
return `Approval_Notification_${this.application?.fundingAgreementNumber}`
},
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/funding/SupplementaryFundingView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default {
},
computed: {
downloadFileName() {
return `Approval_Notification_${this.application?.supplementaryReferenceNumber}`
return `Approval_Notification_${this.application?.fundingAgreementNumber}`
},
},
Expand Down

0 comments on commit 987b230

Please sign in to comment.