Submit Enrolment Reports or monthly ECE reports to receive funding
diff --git a/frontend/src/components/guiComponents/SmallCard.vue b/frontend/src/components/guiComponents/SmallCard.vue
index 2a5c79b7f..6b47ee570 100644
--- a/frontend/src/components/guiComponents/SmallCard.vue
+++ b/frontend/src/components/guiComponents/SmallCard.vue
@@ -6,7 +6,7 @@
:disabled="disable"
width="100%"
>
-
+
@@ -34,12 +34,18 @@ export default {
diff --git a/frontend/src/components/requestChanges/ChangeInformation.vue b/frontend/src/components/requestChanges/ChangeInformation.vue
index 13e077de4..38e1edc20 100644
--- a/frontend/src/components/requestChanges/ChangeInformation.vue
+++ b/frontend/src/components/requestChanges/ChangeInformation.vue
@@ -27,10 +27,10 @@
Additional funding cannot be paid in the month that:
-
- - the Funding Agreement starts
- - the Funding Agreement has already been modified
- - you submitted an enrolment report and received payment
+
+ - The Funding Agreement starts
+ - The Funding Agreement has already been modified
+ - You submitted an enrolment report and received payment
diff --git a/frontend/src/components/requestChanges/ReportChanges.vue b/frontend/src/components/requestChanges/ReportChanges.vue
index 338ceecd0..c83d47f9b 100644
--- a/frontend/src/components/requestChanges/ReportChanges.vue
+++ b/frontend/src/components/requestChanges/ReportChanges.vue
@@ -11,72 +11,64 @@
What changes do you want to make?
-
-
+
+
+
-
-
Add a New facility to an existing organization
-
- This will lead you through the CCOF application process. Please have your facility, CCFRI and ECE-WE
- information ready.
-
-
- You need to attach an updated Community Care And Assisted Living Act licence.
-
-
Add a New facility to an existing organization
+
+
+ This will lead you through the CCOF application process. Please have your facility, CCFRI, and ECE-WE
+ information ready.
+
+
+ You need to attach an updated Community Care And Assisted Living Act licence.
+
-
-
- Add new facility
-
+
+
+ Add new facility
+
-
+
-
-
Report changes to your Licence or service
-
- Please have your Community Care And Assisted Living Act licence (if required) and other
- supporting documents ready.
-
-
Report changes to your Licence or service
+
+
+ Please have your Community Care And Assisted Living Act licence (if required) and other
+ supporting documents ready.
+
-
-
-
- Upload a Change Notification Form
-
-
-
+
+
+
+ Upload a Change Notification Form
+
+
-
+
-
-
Mid-Term Fee Increase
-
- Request a parent fee increase for a facility after you have received approval for the CCFRI.
-
-
You may need to provide details about your expenses.
-
Mid-Term Fee Increase
+
+ Request a parent fee increase for a facility after you have received approval for the CCFRI.
+ You may need to provide details about your expenses.
-
-
- Update parent fees
-
+
+
+ Update parent fees
+
@@ -87,13 +79,6 @@
Change History Archive
Change History
-
@@ -742,4 +727,15 @@ export default {
white-space: nowrap; /* don't break the line */
text-overflow: ellipsis; /* give the beautiful '...' effect */
}
+
+.card-equal-height {
+ /* Set a min-height to ensure consistency */
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+}
+
+.card-text-height {
+ height: 220px;
+}
diff --git a/frontend/src/components/requestChanges/SummaryDeclarationChangeRequest.vue b/frontend/src/components/requestChanges/SummaryDeclarationChangeRequest.vue
index a56b1a98f..6cf95e5a4 100644
--- a/frontend/src/components/requestChanges/SummaryDeclarationChangeRequest.vue
+++ b/frontend/src/components/requestChanges/SummaryDeclarationChangeRequest.vue
@@ -57,91 +57,98 @@
-
-
-
-
- Summary
+
+
+
+
+ Summary
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Facility Name
-
- {{ facility.facilityName ? facility.facilityName : '--' }}
-
-
-
- Facility ID
-
- {{ facility.facilityAccountNumber ? facility.facilityAccountNumber : '--' }}
-
-
-
- Licence Number
-
- {{ facility.licenseNumber ? facility.licenseNumber : '--' }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Facility Name
+
+ {{ facility.facilityName ? facility.facilityName : '--' }}
+
+
+
+ Facility ID
+
+ {{ facility.facilityAccountNumber ? facility.facilityAccountNumber : '--' }}
+
+
+
+ Licence Number
+
+ {{ facility.licenseNumber ? facility.licenseNumber : '--' }}
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
@@ -158,7 +165,7 @@
-
+
I hereby confirm that the information I have provided in this application is complete and accurate. I
@@ -366,7 +373,7 @@ import NavButton from '../../components/util/NavButton.vue';
import MTFISummary from '../../components/summary/changeRequest/MTFISummary.vue';
import RFISummary from '../../components/summary/group/RFISummary.vue';
import ChangeNotificationFormSummary from '../../components/summary/changeRequest/ChangeNotificationFormSummary.vue';
-import { isAnyApplicationUnlocked } from '../../utils/common.js';
+import { deepCloneObject, isAnyApplicationUnlocked } from '../../utils/common.js';
export default {
components: {
@@ -387,6 +394,7 @@ export default {
payload: {},
printableVersion: false,
expand: [],
+ model: {},
};
},
computed: {
@@ -401,7 +409,7 @@ export default {
'isMainLoading',
'isLoadingComplete',
'summaryModel',
- 'model',
+ 'declarationModel',
]),
languageYearLabel() {
return this.getLanguageYearLabel;
@@ -456,10 +464,14 @@ export default {
return '';
},
},
- async beforeMount() {
- const summaryDeclarationStore = useSummaryDeclarationStore();
- summaryDeclarationStore.isMainLoading(true);
+ async created() {
+ //const summaryDeclarationStore = useSummaryDeclarationStore();
+ //summaryDeclarationStore.isMainLoading(true);
+ console.log('calling the load');
await this.loadChangeRequestSummaryDeclaration(this.$route.params?.changeRecGuid);
+
+ this.model = deepCloneObject(this.declarationModel);
+ console.log('model', this.model);
// Determine:
// - which user declaration text version (status a or b) will display
// - which declaration status (a or b) will be saved on submit.
@@ -478,7 +490,11 @@ export default {
}
},
methods: {
- ...mapActions(useSummaryDeclarationStore, ['updateDeclaration', 'loadChangeRequestSummaryDeclaration']),
+ ...mapActions(useSummaryDeclarationStore, [
+ 'updateDeclaration',
+ 'loadChangeRequestSummaryDeclaration',
+ 'setDeclarationModel',
+ ]),
expandAllPanels() {
for (let i = 0; i < this.numberOfPanelsToExpand; i++) {
this.expand.push(i);
@@ -495,8 +511,9 @@ export default {
async submit() {
this.isProcessing = true;
try {
- const summaryDeclarationStore = useSummaryDeclarationStore();
- summaryDeclarationStore.model(this.model);
+ //const summaryDeclarationStore = useSummaryDeclarationStore();
+ //summaryDeclarationStore.model(this.model);
+ this.setDeclarationModel(this.model);
// await this.updateDeclaration({changeRequestId: this.$route.params?.changeRecGuid, reLockPayload: this.relockPayload});
await this.updateDeclaration({ changeRequestId: this.$route.params?.changeRecGuid, reLockPayload: [] });
this.dialog = true;
@@ -531,7 +548,8 @@ export default {
hasChangeRequestType(changeType) {
switch (changeType) {
case 'MTFI':
- return this.summaryModel?.changeRequestTypes?.includes(CHANGE_REQUEST_TYPES.PARENT_FEE_CHANGE);
+ return true;
+ //return this.summaryModel?.changeRequestTypes?.includes(CHANGE_REQUEST_TYPES.PARENT_FEE_CHANGE);
case 'PDF_CHANGE':
return this.summaryModel?.changeRequestTypes?.includes(CHANGE_REQUEST_TYPES.PDF_CHANGE);
default:
@@ -563,4 +581,8 @@ li {
font-size: medium;
color: black;
}
+
+.facility-info {
+ border-top: 5px solid grey !important;
+}
diff --git a/frontend/src/components/summary/changeRequest/MTFISummary.vue b/frontend/src/components/summary/changeRequest/MTFISummary.vue
index a38dad0e4..56957f3a2 100644
--- a/frontend/src/components/summary/changeRequest/MTFISummary.vue
+++ b/frontend/src/components/summary/changeRequest/MTFISummary.vue
@@ -1,5 +1,5 @@
-
+
@@ -13,7 +13,7 @@
-
+
@@ -24,10 +24,10 @@
-
+
Current parent fee frequency: {{ item.feeFrequency }}
- New parent fee frequency: {{ newCcfri?.childCareTypes[index].feeFrequency }}
+ New parent fee frequency: {{ newModel?.childCareTypes[index].feeFrequency }}
@@ -41,229 +41,201 @@
Current parent fees:
-
-
-
-
- Apr {{ item.programYear?.substring(0, 4) }}
-
-
-
-
-
-
- May {{ item.programYear?.substring(0, 4) }}
-
-
-
-
-
-
- Jun {{ item.programYear?.substring(0, 4) }}
-
-
-
-
-
-
- Jul {{ item.programYear?.substring(0, 4) }}
-
-
-
-
-
-
- Aug {{ item.programYear?.substring(0, 4) }}
-
-
-
-
-
-
- Sep {{ item.programYear?.substring(0, 4) }}
-
-
-
+
+ Apr
+
+
+
+
+ May
+
+
+
+
+ Jun
+
+
+
+
+ July
+
+
+
+
+ Aug
+
+
+
+
+ Sep
+
+
New parent fees:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Apr
+
+
+
+
+ May
+
+
+
+
+ Jun
+
+
+
+
+ July
+
+
+
+
+ Aug
+
+
+
+
+ Sep
+
+
@@ -273,229 +245,201 @@
Current parent fees:
-
-
-
-
- Oct {{ item.programYear?.substring(0, 4) }}
-
-
-
-
-
-
- Nov {{ item.programYear?.substring(0, 4) }}
-
-
-
-
-
-
- Dec {{ item.programYear?.substring(0, 4) }}
-
-
-
-
-
-
- Jan 20{{ item.programYear?.slice(-5, -3) }}
-
-
-
-
-
-
- Feb 20{{ item.programYear?.slice(-5, -3) }}
-
-
-
-
-
-
- Mar 20{{ item.programYear?.slice(-5, -3) }}
-
-
-
+
+ Oct
+
+
+
+
+ Nov
+
+
+
+
+ Dec
+
+
+
+
+ Jen
+
+
+
+
+ Feb
+
+
+
+
+ Mar
+
+
New parent fees:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Oct
+
+
+
+
+ Nov
+
+
+
+
+ Dec
+
+
+
+
+ Jan
+
+
+
+
+ Feb
+
+
+
+
+ March
+
+
+
@@ -524,6 +468,7 @@
import { mapState } from 'pinia';
import { PATHS, changeUrlGuid, CHANGE_TYPES } from '../../../utils/constants.js';
import rules from '../../../utils/rules.js';
+import { deepCloneObject } from '../../../utils/common.js';
export default {
props: {
@@ -553,6 +498,7 @@ export default {
formName: 'MTFISummary',
formId: this.facilityId,
},
+ newModel: {},
};
},
computed: {
@@ -566,19 +512,22 @@ export default {
);
},
isNewCcfriValid() {
- return this.newCcfri?.childCareTypes?.length === this.oldCcfri?.childCareTypes?.length;
+ return this.newModel?.childCareTypes?.length === this.oldCcfri?.childCareTypes?.length;
},
},
- watch: {
- isLoadingComplete: {
- handler: function (val) {
- if (val) {
- if (!this.isNewCcfriValid) this.isValidForm = false;
- this.$emit('isSummaryValid', this.formObj, this.isValidForm);
- }
- },
- },
+ created() {
+ this.newModel = deepCloneObject(this.newCcfri);
},
+ // watch: {
+ // isLoadingComplete: {
+ // handler: function (val) {
+ // if (val) {
+ // if (!this.isNewCcfriValid) this.isValidForm = false;
+ // this.$emit('isSummaryValid', this.formObj, this.isValidForm);
+ // }
+ // },
+ // },
+ // },
};
@@ -623,7 +572,6 @@ export default {
justify-items: end;
justify-content: end;
padding: 0px 16px 0px 8px;
- border-right: solid 1px rgba(0, 0, 0, 0.5) !important;
}
.blueText {
diff --git a/frontend/src/store/summaryDeclaration.js b/frontend/src/store/summaryDeclaration.js
index 40b9596e4..4fdd62c80 100644
--- a/frontend/src/store/summaryDeclaration.js
+++ b/frontend/src/store/summaryDeclaration.js
@@ -72,6 +72,8 @@ export const useSummaryDeclarationStore = defineStore('summaryDeclaration', {
},
actions: {
setDeclarationModel(value) {
+ console.log('setting');
+ console.log(value);
this.declarationModel = value;
},
setSummaryModel(value) {
@@ -109,7 +111,9 @@ export const useSummaryDeclarationStore = defineStore('summaryDeclaration', {
async loadChangeRequestDeclaration(changeRequestId) {
checkSession();
try {
+ console.log('loading the dec');
let payload = (await ApiService.apiAxios.get(ApiRoutes.CHANGE_REQUEST + '/' + changeRequestId)).data;
+ console.log(payload);
//clear the old decleration data out so provider can sign again for Dec B
if (payload.unlockDeclaration) {
payload.agreeConsentCertify = null;
@@ -320,8 +324,10 @@ export const useSummaryDeclarationStore = defineStore('summaryDeclaration', {
checkSession();
try {
this.setIsLoadingComplete(false);
- if (!this.summaryModel) this.setIsMainLoading(true);
+ //if (!this.summaryModel) this.setIsMainLoading(true);
+ console.log('I AM LOADING');
let payload = (await ApiService.apiAxios.get(ApiRoutes.CHANGE_REQUEST + '/' + changeRequestId))?.data;
+ console.log(payload);
let changeRequestTypes = [];
payload?.changeActions?.forEach((item) => {
if (!changeRequestTypes.includes(item.changeType)) {
@@ -341,6 +347,8 @@ export const useSummaryDeclarationStore = defineStore('summaryDeclaration', {
};
this.setDeclarationModel(declarationModel);
+ console.log('what is summary model', this.declarationModel);
+
// Load Summary model
let summaryModel = {
...this.summaryModel,
From b3481bd47e84b6fc825cbf7de5666d9e613b457d Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:30:10 -0700
Subject: [PATCH 04/14] more cleanup
---
.../mtfi/CurrentFeeVerification.vue | 3 -
frontend/src/components/mtfi/MTFIInfo.vue | 48 ++--
.../components/mtfi/MtfiSelectFacility.vue | 9 +-
.../SummaryDeclarationChangeRequest.vue | 207 ++++++++----------
.../summary/changeRequest/MTFISummary.vue | 23 +-
frontend/src/store/summaryDeclaration.js | 10 +-
6 files changed, 135 insertions(+), 165 deletions(-)
diff --git a/frontend/src/components/mtfi/CurrentFeeVerification.vue b/frontend/src/components/mtfi/CurrentFeeVerification.vue
index 7f51d2ae3..5138be6ee 100644
--- a/frontend/src/components/mtfi/CurrentFeeVerification.vue
+++ b/frontend/src/components/mtfi/CurrentFeeVerification.vue
@@ -648,7 +648,6 @@ export default {
dialog: false,
currentFacility: undefined,
currentPcfCcfri: undefined,
- isUnlocked: false,
model,
isValidForm: false,
processing: false,
@@ -711,7 +710,6 @@ export default {
},
},
watch: {
- //get facilityID from here and then set it !
'$route.params.urlGuid': {
async handler() {
try {
@@ -897,7 +895,6 @@ export default {
//always check for RFI regardless of new or renewal state
this.rfi3percentCategories = await this.getCcfriOver3percent(this.currentPcfCcfri);
- console.log('rfi3percentCategories length ', this.rfi3percentCategories.length);
if (this.rfi3percentCategories.length > 0) {
if (this.getCurrentFacility.hasRfi) {
//already has RFI. just go to the next page
diff --git a/frontend/src/components/mtfi/MTFIInfo.vue b/frontend/src/components/mtfi/MTFIInfo.vue
index 3adb12535..5d1663f09 100644
--- a/frontend/src/components/mtfi/MTFIInfo.vue
+++ b/frontend/src/components/mtfi/MTFIInfo.vue
@@ -4,30 +4,32 @@
Welcome to CCOF!
- Instructions:
-
-
- Under the Child Care Operating Funding (CCOF) Agreement, section 4.1 f and g, you must submit a request to
- increase parent fees after approval for the Child Care Fee Reduction Initiative (CCFRI). Use this form to submit
- any request to increase your parent fees in the 2023/24 Fiscal Year. To complete this form, you will need the
- following:
-
-
+
+ Instructions:
+
+
+ Under the Child Care Operating Funding (CCOF) Agreement, section 4.1 f and g, you must submit a request to
+ increase parent fees after approval for the Child Care Fee Reduction Initiative (CCFRI). Use this form to
+ submit any request to increase your parent fees in the 2023/24 Fiscal Year. To complete this form, you will
+ need the following:
+
+
-
- - A proposed Parent Fee Schedule; and
- -
- if the increase you are requesting is above the Fee Increase Limit for your
-
- Service Delivery Area , you are required to complete a Request for Information and will be required to submit supporting
- documentation..
-
-
+
+ - A proposed Parent Fee Schedule; and
+ -
+ if the increase you are requesting is above the Fee Increase Limit for your
+
+ Service Delivery Area , you are required to complete a Request for Information and will be required to submit supporting
+ documentation..
+
+
- * The facilities that are not opted in to CCFRI cannot be selected
+ * The facilities that are not opted in to CCFRI cannot be selected
+
@@ -68,11 +70,9 @@ export default {
mixins: [alertMixin],
data() {
return {
- isValidForm: false,
newReq: undefined,
processing: false,
loading: false,
- rules: [(v) => !!v || 'Required.'],
};
},
computed: {
diff --git a/frontend/src/components/mtfi/MtfiSelectFacility.vue b/frontend/src/components/mtfi/MtfiSelectFacility.vue
index 3a6e6208a..a5797e04d 100644
--- a/frontend/src/components/mtfi/MtfiSelectFacility.vue
+++ b/frontend/src/components/mtfi/MtfiSelectFacility.vue
@@ -22,7 +22,7 @@
-
+
-
-
-
-
-
- mdi-alert-octagon
- Incomplete Form
-
-
-
-
-
-
-
You will not be able to submit your application until it is complete.
-
Incomplete sections are marked with a red exclamation point.
-
+
You will not be able to submit your application until it is complete.
+
Incomplete sections are marked with a red exclamation point.
+
-
Summary
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- Facility Name
-
- {{ facility.facilityName ? facility.facilityName : '--' }}
-
-
-
- Facility ID
-
- {{ facility.facilityAccountNumber ? facility.facilityAccountNumber : '--' }}
-
-
-
- Licence Number
-
- {{ facility.licenseNumber ? facility.licenseNumber : '--' }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Facility Name
+
+ {{ facility.facilityName ? facility.facilityName : '--' }}
+
+
+
+ Facility ID
+
+ {{ facility.facilityAccountNumber ? facility.facilityAccountNumber : '--' }}
+
+
+
+ Licence Number
+
+ {{ facility.licenseNumber ? facility.licenseNumber : '--' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
What would you like to do?
-
-
-
-
- Child Care Operating Funding (CCOF)
-
- Apply for Child Care Operating Funding (CCOF) including:
-
-
-
-
-
-
-
+
+
+
+
+
+ Child Care Operating Funding (CCOF)
+
+
Apply for Child Care Operating Funding (CCOF) including:
+
+
+
+
+
+
+ mdi-information
+
+
+
+
+
+
+
+
+ For more information, visit the government website:
+ gov.bc.ca/childcareoperatingfunding
-
-
- mdi-information
-
-
- {{ item.body }}
-
-
-
-
-
- For more information, visit the government website:
- gov.bc.ca/childcareoperatingfunding
-
-
-
-
Start Application
-
Fiscal year runs April 1 to March 31
-
+
+ Start Application
+
+
Fiscal year runs April 1 to March 31
+
-
Status: Incomplete
-
Continue Application
-
Fiscal year runs April 1 to March 31
-
- Cancel Application
-
-
+
Status: Incomplete
+
Continue Application
+
Fiscal year runs April 1 to March 31
+
+ Cancel Application
+
+
-
-
+
+
+
+
+ Update {{ item.ccofProgramYearName?.slice(0, -3) }} PCF
+
+
+
+
+
+ Status of your funding agreement for the current fiscal year: Active
+
+
Status: Submitted
+
+ View Recent Application
+
- Update {{ item.ccofProgramYearName?.slice(0, -3) }} PCF
+ View Recent Application
+
Fiscal year runs April 1 to March 31
+
+ View submission history
+
-
-
- Status of your funding agreement for the current fiscal year: Active
-
-
Status: Submitted
+
+
+
+
+
+
+ Renew my Funding Agreement {{ getRenewYearLabel }}
+
+
+ Current providers must renew their Funding Agreement every year. For more information, visit the
+ government website:
+
+
+ gov.bc.ca/childcareoperatingfunding
+
+
+
+
+ We will contact you if we require further information.
+
+
+
+
+
+
+
+
+
- View Recent Application
+ Renew my Funding Agreement
- View Recent Application
+ Continue Renewal
+
+ Update your PCF
+
+ Renew my Funding Agreement
- Fiscal year runs April 1 to March 31
-
- View submission history
-
-
-
-
-
-
-
-
-
-
-
-
- Cancel Application Warning
-
-
-
-
-
-
-
-
-
- If you cancel your application, any information you entered will be deleted. If you create a new
- application, you will need to re-enter this information.
-
- Are you sure you want to cancel your application and delete your information?
-
- Back
+
+
+
+
+
+
+ Report changes to your licence or service
+
+ You must notify the Child Care Operating Funding program within two business days of any change to your
+ facility licence or the services outlined in Schedule A of your Child Care Operating Funding Agreement.
+
+
+
+
+
+
+ Update change request
-
- Continue
+
+
+
+ Report a change
-
-
-
-
-
-
-
- Renew my Funding Agreement {{ getRenewYearLabel }}
-
-
- Current providers must renew their Funding Agreement every year. For more information, visit the government
- website:
-
-
- gov.bc.ca/childcareoperatingfunding
-
-
-
-
- We will contact you if we require further information.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ Submit Enrolment Reports or monthly ECE reports to receive funding
+
+ If you are expecting a new licence or change to your licence or service details, contact the Child Care
+ Operating Funding program before submitting your next enrolment report or monthly ECE report.
+
+
+
- Renew my Funding Agreement
+ Submit a report
-
- Continue Renewal
-
-
- Update your PCF
-
- Renew my Funding Agreement
-
-
-
-
- Report changes to your licence or service
-
- You must notify the Child Care Operating Funding program within two business days of any change to your
- facility licence or the services outlined in Schedule A of your Child Care Operating Funding Agreement.
-
-
-
-
-
-
- Update change request
-
-
-
-
- Report a change
-
-
-
-
-
-
-
-
- Submit Enrolment Reports or monthly ECE reports to receive funding
-
- If you are expecting a new licence or change to your licence or service details, contact the Child Care
- Operating Funding program before submitting your next enrolment report or monthly ECE report.
-
-
-
-
- Submit a report
-
-
-
+
+
+
+
+
+
+
+
+ Cancel Application Warning
+
+
+
+
+
+
+
+
+
+ If you cancel your application, any information you entered will be deleted. If you create a new
+ application, you will need to re-enter this information.
+
+ Are you sure you want to cancel your application and delete your information?
+
+ Back
+
+ Continue
+
+
+
+
+
Note: For assistance completing your Program Confirmation Form, contact the program at 1-888-338-6622 (Option 2).
@@ -485,11 +470,9 @@ export default {
let isEnabled =
this.userInfo.serverTime > this.getNextProgramYear?.intakeStart &&
this.userInfo.serverTime < this.getNextProgramYear?.intakeEnd;
- console.log('isWithinRenewDate: ', isEnabled);
return isEnabled;
},
isRenewEnabled() {
- console.log('can renew?: ', this.isWithinRenewDate);
//renew disabled because current NEW application is in progress
if (this.applicationType === 'NEW' && this.applicationStatus === 'DRAFT') {
return false;
@@ -621,6 +604,9 @@ export default {
this.applicationStatus === 'DRAFT' && this.applicationType === 'NEW' && this.ccofApplicationStatus === 'NEW'
);
},
+ isCCOFStatusNew() {
+ return this.ccofStatus === this.CCOF_STATUS_NEW;
+ },
},
async created() {
this.CCOF_STATUS_NEW = 'NEW';
@@ -778,20 +764,7 @@ export default {
else if (this.isRFIUnlock(ccfriApplicationId, application)) this.goToRFI(ccfriApplicationId, programYearId);
},
buttonColor(isDisabled) {
- return isDisabled ? '#909090' : '#003366';
- },
- smallCardLayout(card) {
- if (this.ccofStatus === this.CCOF_STATUS_NEW) {
- switch (card) {
- case 'CCOF':
- return 'col-lg-5';
- case 'RENEW':
- return 'col-lg-3';
- default:
- return 'col-lg-2';
- }
- }
- return 'col-lg-3';
+ return isDisabled ? 'disabledButton' : 'blueButton';
},
isFacilityCardUnlock(ccfriApplicationId) {
const programYearId = this.selectedProgramYear?.programYearId
diff --git a/frontend/src/components/guiComponents/SmallCard.vue b/frontend/src/components/guiComponents/SmallCard.vue
index 6b47ee570..2a6668067 100644
--- a/frontend/src/components/guiComponents/SmallCard.vue
+++ b/frontend/src/components/guiComponents/SmallCard.vue
@@ -1,25 +1,22 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/requestChanges/ReportChanges.vue b/frontend/src/components/requestChanges/ReportChanges.vue
index c83d47f9b..e880ae2a8 100644
--- a/frontend/src/components/requestChanges/ReportChanges.vue
+++ b/frontend/src/components/requestChanges/ReportChanges.vue
@@ -13,65 +13,71 @@
What changes do you want to make?
-
-
- Add a New facility to an existing organization
-
-
- This will lead you through the CCOF application process. Please have your facility, CCFRI, and ECE-WE
- information ready.
-
-
- You need to attach an updated Community Care And Assisted Living Act licence.
-
-
-
-
-
- Add new facility
-
-
-
-
+
+
+
+ Add a New facility to an existing organization
+
+
+ This will lead you through the CCOF application process. Please have your facility, CCFRI, and ECE-WE
+ information ready.
+
+
+ You need to attach an updated Community Care And Assisted Living Act licence.
+
+
+
+
+
+ Add new facility
+
+
+
+
+
-
-
- Report changes to your Licence or service
-
-
- Please have your Community Care And Assisted Living Act licence (if required) and other
- supporting documents ready.
-
-
-
-
-
-
- Upload a Change Notification Form
-
-
-
-
+
+
+
+ Report changes to your Licence or service
+
+
+ Please have your Community Care And Assisted Living Act licence (if required) and other
+ supporting documents ready.
+
+
+
+
+
+
+ Upload a Change Notification Form
+
+
+
+
+
-
-
- Mid-Term Fee Increase
-
- Request a parent fee increase for a facility after you have received approval for the CCFRI.
- You may need to provide details about your expenses.
-
-
-
-
- Update parent fees
-
-
-
-
+
+
+
+ Mid-Term Fee Increase
+
+ Request a parent fee increase for a facility after you have received approval for the CCFRI.
+ You may need to provide details about your expenses.
+
+
+
+
+ Update parent fees
+
+
+
+
+
From 3090d88c9cd2f1c4809824df9db29077cced8ca3 Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:38:50 -0700
Subject: [PATCH 06/14] more cleanup
---
.../requestChanges/ReportChanges.vue | 11 --------
frontend/src/store/ccfriApp.js | 27 +------------------
frontend/src/store/navBar.js | 3 +--
3 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/frontend/src/components/requestChanges/ReportChanges.vue b/frontend/src/components/requestChanges/ReportChanges.vue
index bfaf5b219..8898a5483 100644
--- a/frontend/src/components/requestChanges/ReportChanges.vue
+++ b/frontend/src/components/requestChanges/ReportChanges.vue
@@ -738,15 +738,4 @@ export default {
white-space: nowrap; /* don't break the line */
text-overflow: ellipsis; /* give the beautiful '...' effect */
}
-
-.card-equal-height {
- /* Set a min-height to ensure consistency */
- display: flex;
- flex-direction: column;
- justify-content: space-between;
-}
-
-.card-text-height {
- height: 220px;
-}
diff --git a/frontend/src/store/ccfriApp.js b/frontend/src/store/ccfriApp.js
index 29f1de475..ba2e50b53 100644
--- a/frontend/src/store/ccfriApp.js
+++ b/frontend/src/store/ccfriApp.js
@@ -112,7 +112,6 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
ccfriStore: {},
ccfriMedianStore: {},
previousFeeStore: {},
- previousClosureDates: {}, //used for MTFI
}),
getters: {
getCCFRIById: (state) => (ccfriId) => {
@@ -132,7 +131,6 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
},
actions: {
// TODO: Refactor all setters as setThing. You can just set the state directly with Pinia
- //jb-mtfi- I am not sure this is any different than ccfriFacilityModel?
setModel(value) {
this.model = value;
},
@@ -341,14 +339,11 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
if (response?.data) {
this.addCCFRIMedianToStore({ ccfriId: this.ccfriId, ccfriMedian: response.data });
} else {
- console.log('NO median found, sleeping...');
//Sometimes it takes a bit of time for RFI median to come by from dynamics. if no value is found. wait 10 seconds and try again.
await sleep(10 * 1000);
response = await ApiService.apiAxios.get(`${ApiRoutes.APPLICATION_RFI}/${this.ccfriId}/median`);
if (response?.data) {
this.addCCFRIMedianToStore({ ccfriId: this.ccfriId, ccfriMedian: response.data });
- } else {
- console.log(`CCFRI median from backend is blank for CCFRI: ${this.ccfriId}`);
}
}
} catch (e) {
@@ -399,7 +394,6 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
} else {
try {
const response = await ApiService.apiAxios.get(`${ApiRoutes.CCFRI_FEES}/${facilityId}/year/${programYearId}`);
- console.log('feeee response', response);
//if year is 2024/25 or above, change child care cat label to reflect new naming by the buisness.
replaceChildCareLabel(
appStore.getLanguageYearLabel,
@@ -418,17 +412,7 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
}
}
},
- //removed from MTFI - do we need this?
- async getClosureDates(ccfriId) {
- try {
- const response = await ApiService.apiAxios.get(`${ApiRoutes.CCFRI_DATES}/${ccfriId}`);
- this.previousClosureDates = response.data;
- return response.data;
- } catch (e) {
- console.log(`Failed to get existing Facility with error - ${e}`);
- throw e;
- }
- },
+
async decorateWithCareTypes(facilityId) {
const appStore = useAppStore();
const applicationStore = useApplicationStore();
@@ -438,7 +422,6 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
try {
let response = await ApiService.apiAxios.get(`${ApiRoutes.FACILITY}/${facilityId}/licenseCategories`);
- console.log('resp', response);
let careTypes = [];
const currProgramYear = getProgramYear(ccofProgramYearId, programYearList);
const prevProgramYear = getProgramYear(currProgramYear.previousYearId, programYearList);
@@ -447,8 +430,6 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
programYearId: prevProgramYear.programYearId,
});
- console.log(prevCcfriApp, 'in upper try');
-
//Always show the current year fee cards
response.data.forEach((item) => {
let found = this.CCFRIFacilityModel.childCareTypes.find((searchItem) => {
@@ -477,7 +458,6 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
(!prevCcfriApp &&
!isLocked(applicationStore.applicationStatus, navBarStore.navBarList, this.loadedModel.facilityId)))
) {
- console.log('show all the cards');
response.data.forEach((item) => {
let found = this.CCFRIFacilityModel.childCareTypes.find((searchItem) => {
return (
@@ -503,7 +483,6 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
Then check if we have any cards that don't belong (for example user selects NO fees are not correct, then goes back and selects YES)
*/
if (applicationStore.isRenewal && this.CCFRIFacilityModel.existingFeesCorrect == 100000000 && prevCcfriApp) {
- console.log('prevCCFRI IS:', prevCcfriApp);
response.data.forEach((item) => {
//check to see if childcarecat exists in last years CCFRI app.
let pastChildCareTypefound = prevCcfriApp.childCareTypes.find((prevChildCareCat) => {
@@ -524,7 +503,6 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
//if child care type in last years CCFRI fees not found, but license add a card for that child care cat previous years fees
//this ensures we get 24 months of fees for a child care type that is new to the facility.
if (!pastChildCareTypefound && !foundChildCareCat) {
- console.log('NOT FOUND!');
careTypes.push({
programYear: prevProgramYear.name,
programYearId: prevProgramYear.programYearId,
@@ -536,7 +514,6 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
//not an else because (!pastChildCareTypefound && foundChildCareCat) is a possible event
else if (pastChildCareTypefound && foundChildCareCat) {
- console.log('adding delete flag for: ', foundChildCareCat);
//past child care type with fees found AND our users choice marked prev fees as correct... delete the card
foundChildCareCat.deleteMe = true;
}
@@ -553,7 +530,6 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
//Mark the child care type, and call the delete API with the parentFeeGUID
if (!found) {
- console.log('no license for child care type', childCareCat);
childCareCat.deleteMe = true;
}
});
@@ -562,7 +538,6 @@ export const useCcfriAppStore = defineStore('ccfriApp', {
//IF not historical year - find Kindergarten & Out of school care in child cat lookup
//then check if they are in the CCFRI fac model. If so - rename them
- console.log(appStore.getLanguageYearLabel);
//if year is 2024/25 or above, change child care cat label to reflect new naming by the buisness.
replaceChildCareLabel(
appStore.getLanguageYearLabel,
diff --git a/frontend/src/store/navBar.js b/frontend/src/store/navBar.js
index e40f8a4df..435d254ed 100644
--- a/frontend/src/store/navBar.js
+++ b/frontend/src/store/navBar.js
@@ -353,14 +353,13 @@ export const useNavBarStore = defineStore('navBar', {
//only called mtfi
//maybe better for group facilities
decorateNavBar(facilityKey) {
- const navBarList = this.navBarList.map((nav) => {
+ this.navBarList.map((nav) => {
const facility = this.userProfileList.find((el) => el.facilityId === nav[facilityKey]);
if (facility) {
nav.facilityName = facility.facilityName;
nav.facilityId = facility.facilityId;
}
});
- //this.navBarList = navBarList;
},
filterNavBar() {
if (this.changeType === 'nf') {
From c1e7141deb426b34d821c2324f214d11f2c7dd7a Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:42:27 -0700
Subject: [PATCH 07/14] more cleanup
---
frontend/src/store/navBar.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/frontend/src/store/navBar.js b/frontend/src/store/navBar.js
index 435d254ed..42d8de531 100644
--- a/frontend/src/store/navBar.js
+++ b/frontend/src/store/navBar.js
@@ -350,8 +350,7 @@ export const useNavBarStore = defineStore('navBar', {
this.clearNavBarList();
}
},
- //only called mtfi
- //maybe better for group facilities
+
decorateNavBar(facilityKey) {
this.navBarList.map((nav) => {
const facility = this.userProfileList.find((el) => el.facilityId === nav[facilityKey]);
From d4b3b98b6434b188b77667b4446271a12ec5469e Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:51:27 -0700
Subject: [PATCH 08/14] small ui updates
---
.../mtfi/CurrentFeeVerification.vue | 20 +++++++++----------
.../components/mtfi/MtfiSelectFacility.vue | 6 +++---
.../summary/changeRequest/MTFISummary.vue | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/frontend/src/components/mtfi/CurrentFeeVerification.vue b/frontend/src/components/mtfi/CurrentFeeVerification.vue
index 5138be6ee..27bff6b55 100644
--- a/frontend/src/components/mtfi/CurrentFeeVerification.vue
+++ b/frontend/src/components/mtfi/CurrentFeeVerification.vue
@@ -1,10 +1,10 @@
-
+
Child Care Operating Funding Program - Request a Parent Fee Increase
-
+
Child Care Fee Reduction Initiative (CCFRI)
@@ -15,7 +15,7 @@
/>
-
+
New for 2024/25: CCFRI regions align with the BCSSA's grouping of school districts into 6
regional chapters. Use the
@@ -26,7 +26,7 @@
-
+
Our records show this facility's approved parent fees are as follows:
@@ -74,12 +74,12 @@
-
+
mdi-help
@@ -125,7 +125,7 @@
-
April:
+
Apr:
-
June:
+
Jun:
-
July:
+
Jul:
-
Sept:
+
Sep:
-
+
Child Care Operating Funding Program - Request a Parent Fee Increase
-
+
Child Care Fee Reduction Initiative (CCFRI)
-
+
{{ organizationName }}
diff --git a/frontend/src/components/summary/changeRequest/MTFISummary.vue b/frontend/src/components/summary/changeRequest/MTFISummary.vue
index ec3681b10..3d425dbb9 100644
--- a/frontend/src/components/summary/changeRequest/MTFISummary.vue
+++ b/frontend/src/components/summary/changeRequest/MTFISummary.vue
@@ -423,7 +423,7 @@
- March
+ Mar
Date: Wed, 30 Oct 2024 17:18:44 -0700
Subject: [PATCH 09/14] code review updates
---
.../src/components/mtfi/CurrentFeeVerification.vue | 14 +++++++-------
.../summary/changeRequest/MTFISummary.vue | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/frontend/src/components/mtfi/CurrentFeeVerification.vue b/frontend/src/components/mtfi/CurrentFeeVerification.vue
index 27bff6b55..2b3475a0d 100644
--- a/frontend/src/components/mtfi/CurrentFeeVerification.vue
+++ b/frontend/src/components/mtfi/CurrentFeeVerification.vue
@@ -623,13 +623,13 @@ import { useNavBarStore } from '../../store/navBar.js';
import { useOrganizationStore } from '../../store/ccof/organization.js';
import { PATHS, changeUrlGuid, CHANGE_TYPES, ApiRoutes, PROGRAM_YEAR_LANGUAGE_TYPES } from '../../utils/constants.js';
-import alertMixin from '../../mixins/alertMixin.js';
-import globalMixin from '../../mixins/globalMixin.js';
-import NavButton from '../../components/util/NavButton.vue';
-import { deepCloneObject } from '../../utils/common.js';
-import { isEqual } from 'lodash';
-import ApiService from '../../common/apiService.js';
-import FacilityHeader from '../guiComponents/FacilityHeader.vue';
+import alertMixin from '@/mixins/alertMixin.js';
+import globalMixin from '@/mixins/globalMixin.js';
+import NavButton from '@/components/util/NavButton.vue';
+import { deepCloneObject } from '@/utils/common.js';
+import { isEqual, isEmpty } from 'lodash';
+import ApiService from '@/common/apiService.js';
+import FacilityHeader from '@/components/guiComponents/FacilityHeader.vue';
let model = {};
diff --git a/frontend/src/components/summary/changeRequest/MTFISummary.vue b/frontend/src/components/summary/changeRequest/MTFISummary.vue
index 3d425dbb9..45689267c 100644
--- a/frontend/src/components/summary/changeRequest/MTFISummary.vue
+++ b/frontend/src/components/summary/changeRequest/MTFISummary.vue
@@ -84,7 +84,7 @@
- July
+ Jul
- Jen
+ Jan
Date: Wed, 30 Oct 2024 17:28:16 -0700
Subject: [PATCH 10/14] more review updates
---
.../mtfi/CurrentFeeVerification.vue | 21 ++-----------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/frontend/src/components/mtfi/CurrentFeeVerification.vue b/frontend/src/components/mtfi/CurrentFeeVerification.vue
index 2b3475a0d..aea1ae202 100644
--- a/frontend/src/components/mtfi/CurrentFeeVerification.vue
+++ b/frontend/src/components/mtfi/CurrentFeeVerification.vue
@@ -247,7 +247,6 @@