diff --git a/backend/src/components/fundingAgreements.js b/backend/src/components/fundingAgreements.js index 4e2049dd..bbffc470 100644 --- a/backend/src/components/fundingAgreements.js +++ b/backend/src/components/fundingAgreements.js @@ -13,7 +13,7 @@ async function getFundingAgreements(req, res) { let operation = 'ofm_fundings?$select=ofm_fundingid,ofm_funding_number,ofm_declaration,ofm_start_date,ofm_end_date,_ofm_application_value,_ofm_facility_value,statuscode,statecode' if (req.query?.includeFundingEnvelopes) { operation += - ',ofm_envelope_hr_total_base,ofm_envelope_hr_wages_paidtimeoff,ofm_envelope_hr_benefits,ofm_envelope_hr_employerhealthtax,ofm_envelope_hr_prodevhours,ofm_envelope_hr_prodevexpenses,ofm_envelope_programming,ofm_envelope_administrative,ofm_envelope_operational,ofm_envelope_facility' + ',ofm_envelope_hr_total,ofm_envelope_hr_wages_paidtimeoff,ofm_envelope_hr_benefits,ofm_envelope_hr_employerhealthtax,ofm_envelope_hr_prodevhours,ofm_envelope_hr_prodevexpenses,ofm_envelope_programming,ofm_envelope_administrative,ofm_envelope_operational,ofm_envelope_facility' } if (req.query?.includeEA) { operation += '&$expand=ofm_application($select=_ofm_expense_authority_value;$expand=ofm_expense_authority($select=ofm_first_name,ofm_last_name))' diff --git a/backend/src/util/mapping/Mappings.js b/backend/src/util/mapping/Mappings.js index ba3a3198..fec6e279 100644 --- a/backend/src/util/mapping/Mappings.js +++ b/backend/src/util/mapping/Mappings.js @@ -334,7 +334,7 @@ const FundingAgreementMappings = [ { back: '_ofm_facility_value@OData.Community.Display.V1.FormattedValue', front: 'facilityName' }, // Annual Base Funding - { back: 'ofm_envelope_hr_total_base', front: 'envelopeHRTotal' }, + { back: 'ofm_envelope_hr_total', front: 'envelopeHRTotal' }, { back: 'ofm_envelope_hr_wages_paidtimeoff', front: 'envelopeHRWagePaidTimeOff' }, { back: 'ofm_envelope_hr_benefits', front: 'envelopeHRBenefits' }, { back: 'ofm_envelope_hr_employerhealthtax', front: 'envelopeHREmployerHealthTax' }, diff --git a/frontend/src/components/funding/BaseFundingCard.vue b/frontend/src/components/funding/BaseFundingCard.vue index 0955b515..ee5e0a91 100644 --- a/frontend/src/components/funding/BaseFundingCard.vue +++ b/frontend/src/components/funding/BaseFundingCard.vue @@ -82,7 +82,7 @@ import format from '@/utils/format' export default { - name: 'BaseFundingPaidCard', + name: 'BaseFundingCard', props: { loading: { type: Boolean, diff --git a/frontend/src/services/fundingAgreementService.js b/frontend/src/services/fundingAgreementService.js index 9c7b97e3..1614989b 100644 --- a/frontend/src/services/fundingAgreementService.js +++ b/frontend/src/services/fundingAgreementService.js @@ -90,7 +90,7 @@ export default { ) return response?.data[0] } catch (error) { - console.log(`Failed to get the active funding agreement by facility id and status - ${error}`) + console.log(`Failed to get funding envelopes of the last funding agreement by facility id and status - ${error}`) throw error } }, diff --git a/frontend/src/views/funding/FundingOverviewView.vue b/frontend/src/views/funding/FundingOverviewView.vue index f02e2138..f1935bfd 100644 --- a/frontend/src/views/funding/FundingOverviewView.vue +++ b/frontend/src/views/funding/FundingOverviewView.vue @@ -12,7 +12,7 @@ mdi-history Payment Records - + mdi-call-split Funding Allocation @@ -25,7 +25,7 @@ - +