From 7aa8de89f3d63fd482f845c33dacaecd3c2b39a2 Mon Sep 17 00:00:00 2001 From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com> Date: Wed, 20 Dec 2023 17:52:47 -0800 Subject: [PATCH] fixed unlock not working for ccfri NEW fac CR, Update PCF button, add facility ID on pages --- frontend/src/components/LandingPage.vue | 4 ++-- frontend/src/components/RFI/NMF.vue | 4 +++- frontend/src/components/RFI/RFILanding.vue | 7 +++++-- .../ccfriApplication/group/AddNewFees.vue | 19 ++++++++++++------- .../group/CcfriEceLanding.vue | 3 ++- frontend/src/mixins/facilityMixin.js | 2 +- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/frontend/src/components/LandingPage.vue b/frontend/src/components/LandingPage.vue index df362145f..1ebc5b0fa 100644 --- a/frontend/src/components/LandingPage.vue +++ b/frontend/src/components/LandingPage.vue @@ -110,7 +110,7 @@ - + diff --git a/frontend/src/components/RFI/NMF.vue b/frontend/src/components/RFI/NMF.vue index 3a9efd6f3..e79c74ebc 100644 --- a/frontend/src/components/RFI/NMF.vue +++ b/frontend/src/components/RFI/NMF.vue @@ -192,10 +192,12 @@ export default { computed: { ...mapState('application', ['formattedProgramYear']), ...mapState('nmfApp', ['nmfModel']), + ...mapState('navBar', ['navBarList']), ...mapGetters('navBar', ['nextPath', 'previousPath', 'getNavByCCFRIId']), ...mapGetters('app', [ 'getFundingUrl']), currentFacility(){ - return this.getNavByCCFRIId(this.$route.params.urlGuid); + //return this.getNavByCCFRIId(this.$route.params.urlGuid); + return this.navBarList.find(el => el.ccfriApplicationId == this.$route.params.urlGuid ); }, isReadOnly(){ return (!this.currentFacility.unlockNmf); diff --git a/frontend/src/components/RFI/RFILanding.vue b/frontend/src/components/RFI/RFILanding.vue index a53ff39b6..7ae9e9366 100644 --- a/frontend/src/components/RFI/RFILanding.vue +++ b/frontend/src/components/RFI/RFILanding.vue @@ -10,6 +10,8 @@ + {{isFormComplete}} +

Child Care Operating Funding Program - {{ formattedProgramYear }} Program Confirmation Form

@@ -1597,13 +1599,14 @@ export default { ...mapState('rfiApp', ['rfiModel', 'loadedModel']), ...mapState('app', ['programYearList']), ...mapState('application', ['formattedProgramYear', 'applicationStatus', 'applicationId', 'programYearId']), - ...mapState('navBar',['changeRequestId']), + ...mapState('navBar',['changeRequestId', 'navBarList']), ...mapGetters('supportingDocumentUpload', ['getUploadedDocuments']), ...mapGetters('navBar', ['nextPath', 'previousPath', 'getNavByCCFRIId','isChangeRequest']), ...mapGetters('reportChanges',['changeRequestStatus']), ...mapGetters('app', [ 'getFundingUrl', 'getLanguageYearLabel']), currentFacility() { - return this.getNavByCCFRIId(this.$route.params.urlGuid); + //return this.getNavByCCFRIId(this.$route.params.urlGuid); + return this.navBarList.find(el => el.ccfriApplicationId == this.$route.params.urlGuid ); }, fundingUrl(){ return this.getFundingUrl(this.programYearId); diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue index d09ee7eae..4936fe4e0 100644 --- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue +++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue @@ -7,9 +7,13 @@

- Child Care Fee Reduction Initiative (CCFRI) + Child Care Fee Reduction Initiative (CCFRI) +
+
+
+ {{currentFacility.facilityAccountNumber}}
-

+

Facility Name: {{currentFacility.facilityName}}



Enter the fees you charged a new parent for full-time care at this facility for the months below.

@@ -541,11 +545,12 @@ export default { return PROGRAM_YEAR_LANGUAGE_TYPES; }, currentFacility(){ - if (this.getNavByCCFRIId(this.$route.params.urlGuid)){ - return this.getNavByCCFRIId(this.$route.params.urlGuid); - } - //if viewing historical CR - getNavByCCFRID will not work because fac won't be in userProfile. Load from navBarList instead - else return this.navBarList.find(el => el.ccfriApplicationId == this.$route.params.urlGuid ); + // if (this.getNavByCCFRIId(this.$route.params.urlGuid)){ + // return this.getNavByCCFRIId(this.$route.params.urlGuid); + // } + // //if viewing historical CR - getNavByCCFRID will not work because fac won't be in userProfile. Load from navBarList instead + // else + return this.navBarList.find(el => el.ccfriApplicationId == this.$route.params.urlGuid ); }, fundingUrl(){ return this.getFundingUrl(this.programYearId); diff --git a/frontend/src/components/ccfriApplication/group/CcfriEceLanding.vue b/frontend/src/components/ccfriApplication/group/CcfriEceLanding.vue index 13377085f..247965607 100644 --- a/frontend/src/components/ccfriApplication/group/CcfriEceLanding.vue +++ b/frontend/src/components/ccfriApplication/group/CcfriEceLanding.vue @@ -24,11 +24,12 @@ +

{{ facilityAccountNumber }}

Facility Name: {{ facilityName }}

Licence: {{ licenseNumber }}

diff --git a/frontend/src/mixins/facilityMixin.js b/frontend/src/mixins/facilityMixin.js index 91fd96503..489525747 100644 --- a/frontend/src/mixins/facilityMixin.js +++ b/frontend/src/mixins/facilityMixin.js @@ -38,7 +38,7 @@ export default { isModelEmpty() { return !(Object.values(this.model)?.some(item => item)); }, -}, + }, async beforeRouteLeave(_to, _from, next) { if (!this.isModelEmpty) { await this.save(false);