Skip to content

Commit 43cca4c

Browse files
Ccfri 3660 improve report change (#618) and CCFRI 4426 add text box to MTFI
* Info page removed, subtitle banner changed for MTFI, wording updates, update BCSSEA links to be dynamic * align mtfi UI so it matches between pages, moved bcssa link to common.js * centered text on AFS page * centered some more text * small fix so licence number is displayed on AFS MTFI page * CCFRI-4426-add-text-box-mtfi * Comments from Wes * added text field to MTFI summary (#619) --------- Co-authored-by: Panika-cgi <[email protected]>
1 parent f2505ca commit 43cca4c

File tree

14 files changed

+672
-688
lines changed

14 files changed

+672
-688
lines changed

frontend/public/styles/common.css

+4
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@ h5.text-h6,
163163
p.text-h6,
164164
span.text-h6,
165165
div.text-body-1,
166+
p,
167+
ul,
168+
li,
169+
ol,
166170
div.text-body-2 {
167171
font-family: "BCSans", Verdana, Arial, sans-serif;
168172
}

frontend/src/components/LandingPage.vue

+6-5
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
<SmallCard :disable="!isReportChangeButtonEnabled">
183183
<template #content>
184184
<p class="text-h6">Request a change</p>
185-
<p>Submit a request to change your Organization, licence, service details, or Parent Fee information.</p>
185+
<p>Submit a request to change your Organization, licence, service detail, or parent fee information.</p>
186186
</template>
187187
<template #button>
188188
<v-row no-gutters>
@@ -192,7 +192,11 @@
192192
</v-btn>
193193
</v-col>
194194
<v-col class="col-12">
195-
<v-btn :class="buttonColor(!isReportChangeButtonEnabled)" theme="dark" @click="goToReportChange()">
195+
<v-btn
196+
:class="buttonColor(!isReportChangeButtonEnabled)"
197+
theme="dark"
198+
@click="goToChangeRequestHistory()"
199+
>
196200
Request a change
197201
</v-btn>
198202
</v-col>
@@ -618,9 +622,6 @@ export default {
618622
this.setIsRenewal(true);
619623
this.$router.push(pcfUrl(PATHS.RENEW_CONFIRM, this.getNextProgramYear?.programYearId));
620624
},
621-
goToReportChange() {
622-
this.$router.push(PATHS.ROOT.CHANGE_INFO);
623-
},
624625
goToChangeRequestHistory() {
625626
this.$router.push(PATHS.ROOT.CHANGE_LANDING + '#change-request-history');
626627
},

frontend/src/components/ccfriApplication/AFS/ApprovableFeeSchedule.vue

+13-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
:license-number="currentFacility?.licenseNumber"
2929
class="mb-10"
3030
/>
31-
<div class="mt-8">
31+
<div class="mt-8 text-center">
3232
<div class="mb-4">
3333
Thank you for working with us while we completed the assessment of your application for the Child Care Fee
3434
Reduction Initiative (CCFRI). This schedule is to inform you of the approvable parent fees for your
@@ -161,9 +161,19 @@ export default {
161161
'applicationUploadedDocuments',
162162
]),
163163
...mapState(useCcfriAppStore, ['approvableFeeSchedules']),
164-
...mapState(useNavBarStore, ['navBarList', 'nextPath', 'previousPath', 'isChangeRequest']),
164+
...mapState(useNavBarStore, [
165+
'navBarList',
166+
'nextPath',
167+
'previousPath',
168+
'isChangeRequest',
169+
'getNavByCCFRIId',
170+
'userProfileList',
171+
]),
165172
currentFacility() {
166-
return this.navBarList?.find((el) => el.ccfriApplicationId === this.$route.params.urlGuid);
173+
//navBarList populates from the Change Action entity for MTFI. This entity does not store licenseNumber, so find it in userProfileList so it can be displayed
174+
const fac = this.getNavByCCFRIId(this.$route.params.urlGuid);
175+
fac.licenseNumber = this.userProfileList.find((el) => el.facilityId === fac.facilityId)?.licenseNumber;
176+
return fac;
167177
},
168178
filteredUploadedDocuments() {
169179
if (this.isChangeRequest) {

frontend/src/components/ccfriApplication/group/AddNewFees.vue

+7-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
:license-number="currentFacility?.licenseNumber"
1414
class="mb-10"
1515
/>
16-
<p>
16+
<p class="text-center">
1717
Enter the fees you would charge a new parent for full-time care at this facility for the months below.
1818
<br /><br />
1919
If you have more than one fee for the same category, <strong> enter the highest fee. </strong><br /><br />
2020
<strong>Enter the fee before CCFRI is applied. </strong> <br /><br />
2121
<span v-if="languageYearLabel != programYearTypes.HISTORICAL">
2222
CCFRI regions align with the BCSSA's grouping of school districts into 6 regional chapters. Use the
23-
<a href="https://bcmcf.ca1.qualtrics.com/jfe/form/SV_eVcEWJC8HTelRCS" target="_blank">BCSSA region lookup</a>
23+
<a :href="BCSSALink" target="_blank">BCSSA region lookup</a>
2424
to find your region.</span
2525
>
2626
<br /><br />
@@ -542,6 +542,8 @@ import AppDateInput from '@/components/guiComponents/AppDateInput.vue';
542542
import AppAlertBanner from '@/components/guiComponents/AppAlertBanner.vue';
543543
import rules from '@/utils/rules.js';
544544
545+
import { getBCSSALink } from '@/utils/common.js';
546+
545547
import {
546548
PATHS,
547549
pcfUrlGuid,
@@ -640,6 +642,9 @@ export default {
640642
languageYearLabel() {
641643
return this.getLanguageYearLabel;
642644
},
645+
BCSSALink() {
646+
return getBCSSALink(this.getLanguageYearLabel);
647+
},
643648
programYearTypes() {
644649
return PROGRAM_YEAR_LANGUAGE_TYPES;
645650
},

0 commit comments

Comments
 (0)