From 1e4f7a68c47c3d8709e6c47b4f166a31c8b1b626 Mon Sep 17 00:00:00 2001 From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:55:04 -0700 Subject: [PATCH 1/9] language updates for ccof application --- .../ccfriApplication/group/AddNewFees.vue | 2 +- .../ccofApplication/family/FamilyFunding.vue | 20 +++++++++---------- .../family/FamilyOrganization.vue | 17 ++++++++++------ .../group/OrganizationInformation.vue | 3 ++- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue index 26c56616..6a8a9ab5 100644 --- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue +++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue @@ -103,7 +103,7 @@ -
+
diff --git a/frontend/src/components/ccofApplication/family/FamilyFunding.vue b/frontend/src/components/ccofApplication/family/FamilyFunding.vue index 647ade8f..5715c458 100644 --- a/frontend/src/components/ccofApplication/family/FamilyFunding.vue +++ b/frontend/src/components/ccofApplication/family/FamilyFunding.vue @@ -30,7 +30,7 @@ + v-model.number="model.maxWeeksPerYear" @input="convertBlankNumberToNull(model,'maxWeeksPerYear')" label="Maximum number of weeks per year you provide child care" /> @@ -95,22 +95,22 @@ - + - + @@ -138,7 +138,7 @@ - + @@ -186,11 +186,11 @@ + v-model.number="model.extendedChildCareSchoolAge4OrLess" @input="convertBlankNumberToNull(model,'extendedChildCareSchoolAge4OrLess')" :rules="rules.notRequired" label="Family Child Care (School Age / School Age Care on School Grounds)" /> + v-model.number="model.multiAgeCare4OrLess" @input="convertBlankNumberToNull(model,'multiAgeCare4OrLess')" :rules="rules.notRequired" label="Multi-Age Child Care" /> @@ -205,11 +205,11 @@ + v-model.number="model.extendedChildCareSchoolAge4OrMore" @input="convertBlankNumberToNull(model,'extendedChildCareSchoolAge4OrMore')" :rules="rules.notRequired" label="Family Child Care (School Age/ School Age Care on School Grounds)" /> + v-model.number="model.multiAgeCare4more" @input="convertBlankNumberToNull(model,'multiAgeCare4more')" :rules="rules.notRequired" label="Multi-Age Child Care" /> diff --git a/frontend/src/components/ccofApplication/family/FamilyOrganization.vue b/frontend/src/components/ccofApplication/family/FamilyOrganization.vue index cce57a1b..15e8086e 100644 --- a/frontend/src/components/ccofApplication/family/FamilyOrganization.vue +++ b/frontend/src/components/ccofApplication/family/FamilyOrganization.vue @@ -12,6 +12,14 @@ + + + + + + Organization Mailing Address @@ -86,15 +94,12 @@ - + Type of Organization + - - - + diff --git a/frontend/src/components/ccofApplication/group/OrganizationInformation.vue b/frontend/src/components/ccofApplication/group/OrganizationInformation.vue index 412c1c74..f99c55db 100644 --- a/frontend/src/components/ccofApplication/group/OrganizationInformation.vue +++ b/frontend/src/components/ccofApplication/group/OrganizationInformation.vue @@ -104,8 +104,9 @@ + Type of Organization + label=""> From d517c8d13061d709f88a8a79054c06e64446d210 Mon Sep 17 00:00:00 2001 From: roblo-cgi Date: Mon, 16 Oct 2023 17:14:42 -0700 Subject: [PATCH 2/9] fixed bug around getting back previous approved fees --- frontend/src/store/modules/ccfriApp.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/frontend/src/store/modules/ccfriApp.js b/frontend/src/store/modules/ccfriApp.js index 35c3275c..e856c4d8 100644 --- a/frontend/src/store/modules/ccfriApp.js +++ b/frontend/src/store/modules/ccfriApp.js @@ -34,9 +34,9 @@ function getProgramYear(selectedGuid, programYearList){ } function getPreviousCareType(currentRFI, careType, previousProgramYearId, getters, rootState) { - - if (currentRFI.prevYearFeesCorrect || (rootState.navBar.changeType == 'mtfi') && currentRFI.previousCcfriId ) { - let previousRFI = getters.getPreviousApprovedFeesByFacilityId(currentRFI.facilityId); + //TODO: review this. + if ((currentRFI.prevYearFeesCorrect && currentRFI.previousCcfriId) || (rootState.navBar.changeType == 'mtfi') ) { + let previousRFI = getters.getPreviousApprovedFeesByFacilityId({facilityId: currentRFI.facilityId, previousProgramYearId: previousProgramYearId}); return previousRFI.childCareTypes.find(item =>{ return (item.childCareCategoryId == careType.childCareCategoryId && item.programYearId == previousProgramYearId); }); } //MTFI can be done on a new PCF or renewal - so it may not have previous CCFRI. If no previous CCFRI, base median off current year. @@ -101,8 +101,8 @@ export default { getCCFRIMedianById: (state) => (ccfriId) => { return state.ccfriMedianStore[ccfriId]; }, - getPreviousApprovedFeesByFacilityId: (state) => (facilityId) => { - return state.previousFeeStore[facilityId]; + getPreviousApprovedFeesByFacilityId: (state) => ({facilityId: facilityId, previousProgramYearId: programYearId}) => { + return state.previousFeeStore[`${facilityId}-${programYearId}`]; }, }, mutations: { @@ -116,9 +116,9 @@ export default { state.ccfriStore[ccfriId] = CCFRIFacilityModel; } }, - addPreviousApprovedParentFees: (state, {facilityId, parentFeeModel} ) => { + addPreviousApprovedParentFees: (state, {facilityId, programYearId, parentFeeModel} ) => { if (facilityId) { - state.previousFeeStore[facilityId] = parentFeeModel; + state.previousFeeStore[`${facilityId}-${programYearId}`] = parentFeeModel; } }, removeCCFRIFromStore:(state, ccfriId ) => { @@ -313,13 +313,13 @@ export default { } }, async getPreviousApprovedFees({commit, state}, {facilityId, programYearId}) { - const prevFees = state.previousFeeStore[facilityId]; + const prevFees = state.previousFeeStore[`${facilityId}-${programYearId}`]; if (prevFees) { return prevFees; } else { try { const response = await ApiService.apiAxios.get(`${ApiRoutes.CCFRI_FEES}/${facilityId}/year/${programYearId}`); - commit('addPreviousApprovedParentFees', {facilityId: facilityId, parentFeeModel: response.data}); + commit('addPreviousApprovedParentFees', {facilityId: facilityId, programYearId: programYearId, parentFeeModel: response.data}); return response.data; } catch(e) { console.log(`Failed to get existing Facility with error - ${e}`); @@ -337,7 +337,6 @@ export default { let careTypes = []; const currProgramYear = getProgramYear(ccofProgramYearId, programYearList); const prevProgramYear = getProgramYear(currProgramYear.previousYearId, programYearList); - const prevCcfriApp = await dispatch('getPreviousApprovedFees', {facilityId: facilityId, programYearId: prevProgramYear.programYearId}); console.log(prevCcfriApp, 'in upper try'); From bee36a154c122515f9193e3cd667f226dc5f50df Mon Sep 17 00:00:00 2001 From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com> Date: Tue, 17 Oct 2023 10:52:41 -0700 Subject: [PATCH 3/9] this should fix rfi i think --- frontend/src/store/modules/ccfriApp.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/src/store/modules/ccfriApp.js b/frontend/src/store/modules/ccfriApp.js index e856c4d8..323dd9b1 100644 --- a/frontend/src/store/modules/ccfriApp.js +++ b/frontend/src/store/modules/ccfriApp.js @@ -35,17 +35,20 @@ function getProgramYear(selectedGuid, programYearList){ function getPreviousCareType(currentRFI, careType, previousProgramYearId, getters, rootState) { //TODO: review this. - if ((currentRFI.prevYearFeesCorrect && currentRFI.previousCcfriId) || (rootState.navBar.changeType == 'mtfi') ) { + console.log('CURRENTRFI', currentRFI); + // Lookup previous years approved parent fees + if ((currentRFI.existingFeesCorrect == 100000000 && currentRFI.previousCcfriId) || (rootState.navBar.changeType == 'mtfi' && rootState.app.isRenewal ) ) { + console.log('if'); let previousRFI = getters.getPreviousApprovedFeesByFacilityId({facilityId: currentRFI.facilityId, previousProgramYearId: previousProgramYearId}); return previousRFI.childCareTypes.find(item =>{ return (item.childCareCategoryId == careType.childCareCategoryId && item.programYearId == previousProgramYearId); }); } //MTFI can be done on a new PCF or renewal - so it may not have previous CCFRI. If no previous CCFRI, base median off current year. - else if (rootState.navBar.changeType == 'mtfi' && !rootState.app.isRenewal ) { + //keep as elif because PCF RFI may call this but not satisfy the above if statement + else if(rootState.navBar.changeType == 'mtfi' && !rootState.app.isRenewal ){ + console.log('elif'); return currentRFI.childCareTypes.find(item => { return (item.childCareCategoryId == careType.childCareCategoryId && item.programYearId == rootState.application.programYearId); }); } - else { - return currentRFI.childCareTypes.find(item => { return (item.childCareCategoryId == careType.childCareCategoryId && item.programYearId == previousProgramYearId); }); - } + //else - this will return undefined and RFI will be not be triggered } function isOver3Percent(currentFees, previousFees, percentValue) { From f9173c8cc7d6829f58bee550526accf3cec54c21 Mon Sep 17 00:00:00 2001 From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com> Date: Tue, 17 Oct 2023 11:04:26 -0700 Subject: [PATCH 4/9] RFI fixed for ccfri 2926 and 19784 --- .../components/ccfriApplication/group/AddNewFees.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue index 26c56616..717819fb 100644 --- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue +++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue @@ -460,7 +460,7 @@ export default { ...mapState('navBar', ['navBarList','changeRequestId']), ...mapState('ccfriApp', ['CCFRIFacilityModel', 'ccfriChildCareTypes', 'loadedModel', 'ccfriId']), ...mapGetters('ccfriApp', ['getClosureDateLength']), - ...mapGetters('navBar', ['nextPath', 'previousPath', 'isChangeRequest', 'getNavByCCFRIId','isChangeRequest']), + ...mapGetters('navBar', ['nextPath', 'previousPath', 'getNavByCCFRIId','isChangeRequest']), ...mapState('reportChanges',['userProfileChangeRequests']), ...mapGetters('reportChanges',['changeRequestStatus']), @@ -565,9 +565,9 @@ export default { }, async next() { - this.rfi3percentCategories = await this.getCcfriOver3percent(); - console.log('rfi3percentCategories length ', this.rfi3percentCategories.length); - if (this.isRenewal) { + //do not call RFI fee caluclation on NEW PCF or CR NEW FAC + if (this.isRenewal && !this.isChangeRequest) { + console.log('calculating RFI'); this.rfi3percentCategories = await this.getCcfriOver3percent(); if (this.rfi3percentCategories.length > 0) { if (this.currentFacility.hasRfi) { @@ -584,7 +584,8 @@ export default { this.$router.push(this.nextPath); } } else { - //Not renewal. + console.log("RFI calulation not needed."); + //Not renewal or CR this.$router.push(this.nextPath); } }, From dbacbf0861e81f57a8c28faa097e04afc163468a Mon Sep 17 00:00:00 2001 From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com> Date: Tue, 17 Oct 2023 11:22:02 -0700 Subject: [PATCH 5/9] ccfri 2933 email change --- .../components/requestChanges/FamilyChangeDialogueContent.vue | 2 +- .../components/requestChanges/GroupChangeDialogueContent.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/requestChanges/FamilyChangeDialogueContent.vue b/frontend/src/components/requestChanges/FamilyChangeDialogueContent.vue index 67bfbfa1..3ddf1249 100644 --- a/frontend/src/components/requestChanges/FamilyChangeDialogueContent.vue +++ b/frontend/src/components/requestChanges/FamilyChangeDialogueContent.vue @@ -31,7 +31,7 @@ -

Email: cccda@gov.bc.ca

+

Email: ccdda@gov.bc.ca

Mailing address:

Child Care Operating Funding
PO Box 9965 Stn Prov Govt
diff --git a/frontend/src/components/requestChanges/GroupChangeDialogueContent.vue b/frontend/src/components/requestChanges/GroupChangeDialogueContent.vue index 3a0dbfa2..52c7ee02 100644 --- a/frontend/src/components/requestChanges/GroupChangeDialogueContent.vue +++ b/frontend/src/components/requestChanges/GroupChangeDialogueContent.vue @@ -33,7 +33,7 @@ -

Email: cccda@gov.bc.ca

+

Email: ccdda@gov.bc.ca

Mailing address:

Child Care Operating Funding
PO Box 9965 Stn Prov Govt
From 8493d68d89817718f2f2b99e7f534ca620fdb7d5 Mon Sep 17 00:00:00 2001 From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com> Date: Tue, 17 Oct 2023 11:27:02 -0700 Subject: [PATCH 6/9] ccfri 2927 word fix on MTFI page --- frontend/src/components/mtfi/CurrentFeeVerification.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/mtfi/CurrentFeeVerification.vue b/frontend/src/components/mtfi/CurrentFeeVerification.vue index b2308e1b..6be958b2 100644 --- a/frontend/src/components/mtfi/CurrentFeeVerification.vue +++ b/frontend/src/components/mtfi/CurrentFeeVerification.vue @@ -19,7 +19,7 @@

- Our records show this facility's approved parent fees for are as follows: + Our records show this facility's approved parent fees are as follows:
From 71cc9c14cd9dd01fe998d9105a221e09ed0cf368 Mon Sep 17 00:00:00 2001 From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:12:12 -0700 Subject: [PATCH 7/9] removed some logs --- frontend/src/store/modules/ccfriApp.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/store/modules/ccfriApp.js b/frontend/src/store/modules/ccfriApp.js index 323dd9b1..1675ab80 100644 --- a/frontend/src/store/modules/ccfriApp.js +++ b/frontend/src/store/modules/ccfriApp.js @@ -35,17 +35,17 @@ function getProgramYear(selectedGuid, programYearList){ function getPreviousCareType(currentRFI, careType, previousProgramYearId, getters, rootState) { //TODO: review this. - console.log('CURRENTRFI', currentRFI); + //console.log('CURRENTRFI', currentRFI); // Lookup previous years approved parent fees if ((currentRFI.existingFeesCorrect == 100000000 && currentRFI.previousCcfriId) || (rootState.navBar.changeType == 'mtfi' && rootState.app.isRenewal ) ) { - console.log('if'); + //console.log('if'); let previousRFI = getters.getPreviousApprovedFeesByFacilityId({facilityId: currentRFI.facilityId, previousProgramYearId: previousProgramYearId}); return previousRFI.childCareTypes.find(item =>{ return (item.childCareCategoryId == careType.childCareCategoryId && item.programYearId == previousProgramYearId); }); } //MTFI can be done on a new PCF or renewal - so it may not have previous CCFRI. If no previous CCFRI, base median off current year. //keep as elif because PCF RFI may call this but not satisfy the above if statement else if(rootState.navBar.changeType == 'mtfi' && !rootState.app.isRenewal ){ - console.log('elif'); + //console.log('elif'); return currentRFI.childCareTypes.find(item => { return (item.childCareCategoryId == careType.childCareCategoryId && item.programYearId == rootState.application.programYearId); }); } //else - this will return undefined and RFI will be not be triggered @@ -210,7 +210,7 @@ export default { try { let res = await ApiService.apiAxios.patch('/api/application/parentfee/', payload); - console.log('the res is:' , res); + //console.log('the res is:' , res); return res; } catch (error) { console.log(error); From 79b172f236e77e42085ca52a4f2f1a163cce75ea Mon Sep 17 00:00:00 2001 From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:16:08 -0700 Subject: [PATCH 8/9] last one --- frontend/src/store/modules/ccfriApp.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/src/store/modules/ccfriApp.js b/frontend/src/store/modules/ccfriApp.js index 1675ab80..7c457f13 100644 --- a/frontend/src/store/modules/ccfriApp.js +++ b/frontend/src/store/modules/ccfriApp.js @@ -34,18 +34,15 @@ function getProgramYear(selectedGuid, programYearList){ } function getPreviousCareType(currentRFI, careType, previousProgramYearId, getters, rootState) { - //TODO: review this. //console.log('CURRENTRFI', currentRFI); - // Lookup previous years approved parent fees + // Lookup previous years approved parent fees for most RFI scenarios if ((currentRFI.existingFeesCorrect == 100000000 && currentRFI.previousCcfriId) || (rootState.navBar.changeType == 'mtfi' && rootState.app.isRenewal ) ) { - //console.log('if'); let previousRFI = getters.getPreviousApprovedFeesByFacilityId({facilityId: currentRFI.facilityId, previousProgramYearId: previousProgramYearId}); return previousRFI.childCareTypes.find(item =>{ return (item.childCareCategoryId == careType.childCareCategoryId && item.programYearId == previousProgramYearId); }); } //MTFI can be done on a new PCF or renewal - so it may not have previous CCFRI. If no previous CCFRI, base median off current year. //keep as elif because PCF RFI may call this but not satisfy the above if statement else if(rootState.navBar.changeType == 'mtfi' && !rootState.app.isRenewal ){ - //console.log('elif'); return currentRFI.childCareTypes.find(item => { return (item.childCareCategoryId == careType.childCareCategoryId && item.programYearId == rootState.application.programYearId); }); } //else - this will return undefined and RFI will be not be triggered From 85f593f66d466a3e656203ff4a9b63ac65e1d627 Mon Sep 17 00:00:00 2001 From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:21:35 -0700 Subject: [PATCH 9/9] fixed 1 code smell --- frontend/src/store/modules/ccfriApp.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/store/modules/ccfriApp.js b/frontend/src/store/modules/ccfriApp.js index 7c457f13..964d3358 100644 --- a/frontend/src/store/modules/ccfriApp.js +++ b/frontend/src/store/modules/ccfriApp.js @@ -207,7 +207,6 @@ export default { try { let res = await ApiService.apiAxios.patch('/api/application/parentfee/', payload); - //console.log('the res is:' , res); return res; } catch (error) { console.log(error);