Skip to content

Commit

Permalink
Merge pull request #557 from bcgov/ccfri-3655-mtfi-remove-fees-question
Browse files Browse the repository at this point in the history 
Ccfri 3655 mtfi remove fees question / get MTFI in working order / general cleanup efforts
  • Loading branch information
@jenbeckett
jenbeckett authored Oct 31, 2024
2 parents 6bee45c + a168a5a commit ec6256a
Show file tree
Hide file tree
Showing 10 changed files with 614 additions and 1,164 deletions.
576 changes: 57 additions & 519 deletions frontend/src/components/mtfi/CurrentFeeVerification.vue
View file

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions frontend/src/components/mtfi/MTFIInfo.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,32 @@
<div class="pa-10 text-h4 text-center">Welcome to CCOF!</div>
</v-row>
<v-row>
<span class="text-h4">Instructions:</span>
<br /><br /><br />
<p class="px-10 text-h6">
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:
<br /><br />
</p>
<v-container>
<span class="text-h4">Instructions:</span>
<br /><br /><br />
<p class="px-10 text-h6">
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:
<br /><br />
</p>

<ul>
<li>A proposed Parent Fee Schedule; and</li>
<li>
if the increase you are requesting is above the Fee Increase Limit for your
<a
href="https://www2.gov.bc.ca/assets/gov/family-and-social-supports/child-care/child-care-operating-funding/ccfri_funding_guidelines_23_24.pdf"
>
Service Delivery Area </a
>, you are required to complete a Request for Information and will be required to submit supporting
documentation..
</li>
</ul>
<ul class="px-10">
<li>A proposed Parent Fee Schedule; and</li>
<li>
if the increase you are requesting is above the Fee Increase Limit for your
<a
href="https://www2.gov.bc.ca/assets/gov/family-and-social-supports/child-care/child-care-operating-funding/ccfri_funding_guidelines_23_24.pdf"
>
Service Delivery Area </a
>, you are required to complete a Request for Information and will be required to submit supporting
documentation..
</li>
</ul>

<p class="px-15 text-h6">* The facilities that are not opted in to CCFRI cannot be selected</p>
<p class="px-15 text-h6">* The facilities that are not opted in to CCFRI cannot be selected</p>
</v-container>
</v-row>
<v-row justify="space-around">
<v-col cols="6" />
Expand All @@ -47,10 +49,10 @@

<script>
import { mapActions, mapState } from 'pinia';
import { useApplicationStore } from '../../store/application.js';
import { useOrganizationStore } from '../../store/ccof/organization.js';
import { useNavBarStore } from '../../store/navBar.js';
import { useReportChangesStore } from '../../store/reportChanges.js';
import { useApplicationStore } from '@/store/application.js';
import { useOrganizationStore } from '@/store/ccof/organization.js';
import { useNavBarStore } from '@/store/navBar.js';
import { useReportChangesStore } from '@/store/reportChanges.js';
import {
PATHS,
Expand All @@ -68,11 +70,9 @@ export default {
mixins: [alertMixin],
data() {
return {
isValidForm: false,
newReq: undefined,
processing: false,
loading: false,
rules: [(v) => !!v || 'Required.'],
};
},
computed: {
Expand Down
31 changes: 12 additions & 19 deletions frontend/src/components/mtfi/MtfiSelectFacility.vue
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<template>
<v-container>
<div class="row pt-4 justify-center">
<div class="row pt-4 text-center">
<span class="text-h5">Child Care Operating Funding Program - Request a Parent Fee Increase</span>
</div>
<div class="row pt-4 justify-center">
<div class="row pt-4 text-center">
<span class="text-h5 font-weight-bold">Child Care Fee Reduction Initiative (CCFRI)</span>
</div>
<div class="row pt-4 justify-center">
<div class="row pt-4 text-center">
<span class="text-h6 font-weight-bold blueText">{{ organizationName }}</span>
</div>
<v-row no-gutters class="justify-center align-center pt-12">
Expand All @@ -22,7 +22,7 @@
<v-skeleton-loader max-height="475px" :loading="true" type="image, image, image" />
</div>
<LargeButtonContainer v-else>
<v-form ref="isValidForm" v-model="isValidForm" model-value="false">
<v-form ref="isValidForm" v-model="isValidForm">
<v-card
v-for="(
{ facilityName, facilityAccountNumber, licenseNumber, ccfriOptInStatus, ccfriStatus }, index
Expand Down Expand Up @@ -76,15 +76,15 @@

<script>
import { mapState, mapActions } from 'pinia';
import { useApplicationStore } from '../../store/application.js';
import { useOrganizationStore } from '../../store/ccof/organization.js';
import { useNavBarStore } from '../../store/navBar.js';
import { useReportChangesStore } from '../../store/reportChanges.js';
import { useApplicationStore } from '@/store/application.js';
import { useOrganizationStore } from '@/store/ccof/organization.js';
import { useNavBarStore } from '@/store/navBar.js';
import { useReportChangesStore } from '@/store/reportChanges.js';
import LargeButtonContainer from '../guiComponents/LargeButtonContainer.vue';
import { PATHS, changeUrlGuid, CHANGE_TYPES } from '../../utils/constants.js';
import alertMixin from '../../mixins/alertMixin.js';
import NavButton from '../../components/util/NavButton.vue';
import LargeButtonContainer from '@/components/guiComponents/LargeButtonContainer.vue';
import { PATHS, changeUrlGuid, CHANGE_TYPES } from '@/utils/constants.js';
import alertMixin from '@/mixins/alertMixin.js';
import NavButton from '@/components/util/NavButton.vue';
let ccfriOptInOrOut = {};
let textInput = '';
Expand All @@ -102,17 +102,12 @@ export default {
},
data() {
return {
isUnlocked: false,
originalFacilityList: [],
model,
//textInput,
showOptStatus: '',
isValidForm: false,
processing: false,
loading: true,
ccfriOptInOrOut,
checkbox: [],
rules: [(v) => !!v || 'Required.'],
};
},
computed: {
Expand Down Expand Up @@ -191,8 +186,6 @@ export default {
applicationID: this.applicationId,
changeActionId: this.changeActionId,
optInResponse: 1,
// 'ccfriApplicationId': facility.ccfriApplicationId,
// 'ccfriFacilityId': facility.ccfriFacilityId,
programYearId: this.programYearId,
organizationId: this.organizationId,
});
Expand Down
14 changes: 7 additions & 7 deletions frontend/src/components/requestChanges/ChangeInformation.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
<span><b>Additional funding cannot be paid in the month that:</b></span>
</v-card-title>
<v-card-text class="pt-4">
<ul>
<li>the Funding Agreement starts</li>
<li>the Funding Agreement has already been modified</li>
<li>you submitted an enrolment report and received payment</li>
<ul class="ml-4">
<li>The Funding Agreement starts</li>
<li>The Funding Agreement has already been modified</li>
<li>You submitted an enrolment report and received payment</li>
</ul>
</v-card-text>
</v-card>
Expand Down Expand Up @@ -60,9 +60,9 @@
</template>

<script>
import { PATHS } from '../../utils/constants.js';
import alertMixin from '../../mixins/alertMixin.js';
import NavButton from '../../components/util/NavButton.vue';
import { PATHS } from '@/utils/constants.js';
import alertMixin from '@/mixins/alertMixin.js';
import NavButton from '@/components/util/NavButton.vue';
export default {
name: 'ReportChange',
Expand Down
29 changes: 11 additions & 18 deletions frontend/src/components/requestChanges/ReportChanges.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- <span class="text-h5">What would you like to change?</span> -->
</div>

<v-form ref="isValidForm" v-model="isValidForm" model-value="false">
<v-form ref="isValidForm" v-model="isValidForm">
<v-container>
<p class="text-h6 text-center">What changes do you want to make?</p>
<v-row>
Expand Down Expand Up @@ -90,13 +90,6 @@
<h2 v-if="viewOlderRequestActive">Change History Archive</h2>
<h2 v-else>Change History</h2>
</v-col>
<!-- <v-text-field
v-if="!viewOlderRequestActive"
v-model="search"
label="Search by facility name">
</v-text-field>
NOT SURE IF THIS IS ACTUALLY WHAT THE REQUIREMENTS WANT
-->
</v-row>
<v-row v-if="processing">
<v-col>
Expand Down Expand Up @@ -232,17 +225,17 @@
<script>
import _ from 'lodash';
import { mapState, mapActions } from 'pinia';
import { useAppStore } from '../../store/app.js';
import { useApplicationStore } from '../../store/application.js';
import { useReportChangesStore } from '../../store/reportChanges.js';
import { useOrganizationStore } from '../../store/ccof/organization.js';
import { useNavBarStore } from '../../store/navBar.js';
import { useAppStore } from '@/store/app.js';
import { useApplicationStore } from '@/store/application.js';
import { useReportChangesStore } from '@/store/reportChanges.js';
import { useOrganizationStore } from '@/store/ccof/organization.js';
import { useNavBarStore } from '@/store/navBar.js';
import { PATHS, CHANGE_TYPES, changeUrlGuid, changeUrl } from '../../utils/constants.js';
import alertMixin from '../../mixins/alertMixin.js';
import SmallCard from '../guiComponents/SmallCard.vue';
import NavButton from '../util/NavButton.vue';
import { isFacilityAvailable } from '../../utils/common.js';
import { PATHS, CHANGE_TYPES, changeUrlGuid, changeUrl } from '@/utils/constants.js';
import alertMixin from '@/mixins/alertMixin.js';
import SmallCard from '@/components/guiComponents/SmallCard.vue';
import NavButton from '@/components/util/NavButton.vue';
import { isFacilityAvailable } from '@/utils/common.js';
export default {
name: 'ReportChange',
Expand Down
Loading

0 comments on commit ec6256a

Please sign in to comment.