Skip to content

Commit

Permalink
Merge pull request #378 from bcgov/report-changes-Viet
Browse files Browse the repository at this point in the history 
Report changes VIET - update Notification form upload/summary declaration, redesign change history table
  • Loading branch information
@jenbeckett
jenbeckett authored Jul 21, 2023
2 parents e1cd2c1 + d587745 commit 664ecb5
Show file tree
Hide file tree
Showing 7 changed files with 259 additions and 285 deletions.
21 changes: 20 additions & 1 deletion frontend/src/components/LandingPage.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,18 @@
</template>
<template #button>
<!-- TODO: change back this logic for button color - was previously :color='buttonColor(!isCCOFApproved) -->
<v-btn @click="goToReportChange()" :color='buttonColor(isCCOFApproved)' dark>Report a change</v-btn>
<v-row no-gutters>
<v-col v-if="isUpdateChangeRequestDisplayed" class="col-12 mb-3">
<v-btn @click="goToChangeRequestHistory()" :color='buttonColor(false)' dark>
Update change request
</v-btn>
</v-col>
<v-col class="col-12">
<v-btn @click="goToReportChange()" :color='buttonColor(!isCCOFApproved)' dark>
Report a change
</v-btn>
</v-col>
</v-row>
</template>
</SmallCard>

Expand Down Expand Up @@ -222,6 +233,7 @@ export default {
...mapState('organization', ['organizationProviderType', 'organizationId', 'organizationName', 'organizationAccountNumber']),
...mapState('application', ['applicationType', 'programYearId', 'ccofApplicationStatus', 'unlockBaseFunding',
'unlockDeclaration', 'unlockEcewe', 'unlockLicenseUpload', 'unlockSupportingDocuments', 'applicationStatus']),
...mapState('reportChanges', ['userProfileChangeRequests']),
filteredNavBarList() {
if (isChangeRequest(this)) {
return this.navBarList.filter(el => el.changeRequestId === this.$route.params.changeRecGuid);
Expand Down Expand Up @@ -344,6 +356,10 @@ export default {
isCCOFApproved() {
return (this.applicationType === 'RENEW') || (this.ccofStatus === this.CCOF_STATUS_APPROVED);
},
isUpdateChangeRequestDisplayed() {
let changeRequestStatuses = this.userProfileChangeRequests?.map(changeRequest => changeRequest.status);
return changeRequestStatuses?.includes("WITH_PROVIDER");
}
},
methods: {
...mapMutations('app', ['setIsRenewal']),
Expand All @@ -355,6 +371,9 @@ export default {
goToReportChange(){
this.$router.push(PATHS.ROOT.CHANGE_LANDING);
},
goToChangeRequestHistory() {
this.$router.push(PATHS.ROOT.CHANGE_LANDING + '#change-request-history');
},
continueRenewal() {
this.goToLicenseUpload();
},
Expand Down
57 changes: 16 additions & 41 deletions frontend/src/components/requestChanges/ChangeFileUpload.vue
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
<template>
<v-form ref="form" v-model="isValidForm">
<v-container>
<v-row justify="space-around">
<v-card class="cc-top-level-card" width="1200">
<!-- <v-card-title class="justify-center">
<span class="text-h5">Child Care Operating Funding Program - {{this.formattedProgramYear}} Program Confirmation Form</span>
</v-card-title> -->
<h2 class="text-center">
{{ changeType == 'NOTIFICATION_FORM' ? 'Change Notification Form Upload' : 'Supporting Documents Upload'}}
</h2>
<v-row justify="center" class="text-h5 py-4" style="color:#003466;">
{{this.userInfo.organizationName}}
</v-row>
<v-row class="px-6 text-body-1">
Provide any additional documents you would like the program to review as part of your change notifcation form.
</v-row>
<v-row class="pa-6 pt-2 text-body-2">
The maximum file size is 2MB for each document. Accepted file types are jpg, jpeg, png, pdf, docx, doc, xls, and xlsx.
</v-row>
<v-container class="pa-0">
<v-row no-gutters>
<v-col class="col-12 mb-6">
The maximum file size is 2MB for each document. Accepted file types are jpg, jpeg, png, pdf, docx, doc, xls, and xlsx.
</v-col>
<v-col class="col-12">
<v-data-table v-if="!isLoading"
:headers="headers"
:items="getFilteredDocs"
Expand All @@ -43,25 +31,6 @@
</v-col>
</template>

<!-- <template v-slot:item.facilityName="{ item }">
<v-col flex>
<div v-if="item?.annotationid">
<span> {{ item?.ccof_facility_name }} </span>
</div>
<v-select v-else
v-model="item.selectFacility"
:items="facilityNames"
item-text="facilityName"
placeholder="Select a facility"
return-object
class="drop-down-select"
required
:rules="selectRules"
></v-select>
</v-col>
</template> -->


<template v-slot:item.document="{ item }">
<div v-if="item?.annotationid">
<span> {{ item?.filename }} </span>
Expand Down Expand Up @@ -108,19 +77,21 @@
</v-icon>
</template>
<template slot="no-data">
<div class="text-body-1">{{ this.noDataDefaultText }}</div>
</template>
</v-data-table>
<v-card v-if="isLoading" class="pl-6 pr-6 pt-4">
<v-skeleton-loader :loading="true" type="button"></v-skeleton-loader>
<v-skeleton-loader max-height="375px" :loading="true" type="table-row-divider@3"></v-skeleton-loader>
</v-card>
<v-row v-if="this.changeType == 'NOTIFICATION_FORM' && !this.isFileUploaded"
class="px-6 pt-4 text-body-2 red--text">
class="px-3 pt-4 text-body-1 red--text">
Please upload the Change Notification Form.
</v-row>
</v-card>
</v-col>
</v-row>
</v-container>
</v-form>
</template>
Expand All @@ -141,6 +112,10 @@ export default {
type: String,
required: true
},
noDataDefaultText: {
type: String,
required: false
}
},
data() {
return {
Expand Down
156 changes: 47 additions & 109 deletions frontend/src/components/requestChanges/ChangeNotificationForm.vue
View file
Original file line number Diff line number Diff line change
@@ -1,145 +1,82 @@
<template>
<v-container>
<div class="row pt-4 justify-center text-center">
<span class="text-h5">Child Care Operating Funding Program - {{ formattedProgramYear }}</span>
<div class="row py-8 justify-center text-center">
<span class="text-h4">Change Notification Form</span>
</div>
<br>
<v-form ref="isValidForm" value="false" v-model="isValidForm">
<v-container>
<v-row class="justify-space-around ">
<v-row class="justify-space-around">
<v-col class="col-lg-7 ">
<v-row>
<v-col class="col-lg-12 ">
<p class="px-2 text--primary">
<strong>For all changes other than "Adding a new facility(s) to your Organization, please download the change notification form by clicking on the button below."</strong>
</p>
<v-col class="col-lg-12">
<a href="https://www2.gov.bc.ca/assets/gov/family-and-social-supports/child-care/cf1345_cc_operating_program_funding_agreement_change_notification.pdf" target="_blank">
<v-btn dark class="blueButton mb-10 ml-2" >
Download a Change Notification Form
<v-btn dark class="blueButton mb-10" x-large>
<strong>Download a Change Notification Form</strong>
</v-btn>
</a>
</v-col>
</v-row>
<v-row>
<v-col class="col-lg-12 ">
<p class="px-2 text--primary">
<strong>Please upload the Change Notification Form in the Dropbox below once you have filled out the form.</strong>
<v-row class="mb-12">
<v-col class="col-lg-12">
<p class="text-h5 mb-1">
<strong>Upload the completed Change Notification Form below.</strong>
</p>
<v-skeleton-loader v-show="isLoading" max-height="375px" :loading="true" type="image"></v-skeleton-loader>
<ChangeFileUpload
v-show="!isLoading"
ref="childRef"
:changeType="changeTypeForm"
noDataDefaultText="Upload Change Notification Form (Required)"
@fileChange="updateChangeNotificationFormCompleteStatus($event)"
></ChangeFileUpload>
</v-col>
</v-row>
<v-row>
<v-col class="col-lg-12 ">
<p class="px-2 text--primary">
<strong>Please upload your Community Care License and other supporting documents for your requested changes in the Dropbox below.</strong>
<v-row class="mb-12">
<v-col class="col-lg-12">
<p class="text-h5 mb-1">
<strong>Upload supporting documents for your requested changes.</strong>
</p>
<v-skeleton-loader v-show="isLoading" max-height="375px" :loading="true" type="image"></v-skeleton-loader>
<ChangeFileUpload
v-show="!isLoading"
ref="childRef2"
:changeType="changeTypeSupportingDoc"
noDataDefaultText="Upload supporting documents"
@fileChange="updateSupportingDocumentCompleteStatus(($event))"
></ChangeFileUpload>
</v-col>
</v-row>
</v-col>
<v-col class="col-lg-4 boarder">
<v-row>
<v-col class="col-lg-12 ">
<p class="px-2 text--primary">
<strong>Supporting Documents</strong>
</p>
<br>
<v-row class="pa-6 pt-2 text-body-2">
<v-list-item-title>Legal or organization name change</v-list-item-title>
<v-list>
<ul>
<li>
<v-list-item>Proof of name change document
<br> (e.g. marriage certificate, resumption of surname certificate, BC Corporate Registry "Notice of Name Change")
</v-list-item>
</li>
</ul>
</v-list>

<v-list-item-title>Group organization mailing address change</v-list-item-title>
<v-list>
<ul>
<li>
<v-list-item>CCALA Licence
</v-list-item>
</li>
</ul>
</v-list>

<v-list-item-title>Group facility address change</v-list-item-title>
<v-list>
<ul>
<li>
<v-list-item> <a href="https://www2.gov.bc.ca/assets/gov/family-and-social-supports/child-care/child-care-operating-funding/cf1321_ccof_group_application.pdf" target="_blank"> Group application form </a>
</v-list-item>
</li>
</ul>
</v-list>

<v-list-item-title>Family facility mailing address change</v-list-item-title>
<v-list>
<ul>
<li>
<v-list-item> <a href="https://www2.gov.bc.ca/assets/gov/family-and-social-supports/child-care/child-care-operating-funding/cf1320_ccof_family_application.pdf" target="_blank"> Family application form </a>
</v-list-item>
</li>
</ul>
</v-list>

<v-list-item-title>Family name change</v-list-item-title>
<v-list>
<ul>
<li>
<v-list-item>CCALA Licence
</v-list-item>
</li>
</ul>
</v-list>

<v-list-item-title>License change</v-list-item-title>
<v-list>
<ul>
<li>
<v-list-item>CCALA Licence
</v-list-item>
</li>
</ul>
</v-list>

<v-list-item-title>New facility license</v-list-item-title>
<v-list>
<ul>
<li>
<v-list-item>Family or group CCOF application form
</v-list-item>
</li>
</ul>
</v-list>

<v-list-item-title style="white-space: normal;"> For more information <a href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/running-daycare-preschool/child-care-operating-funding">visit the Child Care Operating Fund website</a></v-list-item-title>
<v-list>
<v-list-item> Greater Victoria area: <a href="tel:+2503656501"> +1 250 365-6501</a>
</v-list-item>
<v-list-item> Outside Greater Victoria (toll free): <a href="tel:+18883386622">1 888 338-6622</a>
</v-list-item>
<v-list-item> Email: <a href="mailto:[email protected]"> [email protected]</a>
</v-list-item>
</v-list>
</v-row>
</v-col>
</v-row>
<v-col class="col-lg-4 col-sm-12 boarder pl-10" >
<p class="text--primary font-weight-bold mb-10">
Supporting Documents
</p>
<p>
The Change Notification Form will specify what supporting documents to upload.
</p>
<p class="mt-10">
These could include:
<ul>
<li class="pb-0 font-italic">
Community Care and Assisted Living Act License
</li>
<li>
Proof of name change document
<br>
(e.g. marriage certificate, resumption of surname certificate, BC Corporate Registry "Notice of Name Change")
</li>
</ul>
</p>
<p class="mt-10">
For more information
<a href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/running-daycare-preschool/child-care-operating-funding" class="text-decoration-underline"> visit the Child Care Operating Funding website</a>
</p>
<p class="mt-10">
Greater Victoria area: 250 356-6501
<br>
Outside Greater Victoria (toll free): 1 888 338-6622 (Option 2)
</p>
</v-col>
</v-row>
</v-container>
Expand Down Expand Up @@ -178,6 +115,7 @@ export default {
async mounted(){
if (this.$route.params?.urlGuid) {
this.isLoading = true;
await this.getChangeRequest(this.$route.params?.changeRecGuid);
await this.loadChangeRequestDocs(this.$route.params.urlGuid);
this.updateChangeNotificationFormCompleteStatus();
}
Expand All @@ -203,7 +141,7 @@ export default {
methods: {
...mapMutations('app', ['setCcfriOptInComplete', 'forceNavBarRefresh']),
...mapMutations('navBar', ['forceNavBarRefresh']),
...mapActions('reportChanges', ['createChangeRequest','loadChangeRequest', 'loadChangeRequestDocs', 'saveUploadedDocuments']),
...mapActions('reportChanges', ['createChangeRequest','loadChangeRequest', 'loadChangeRequestDocs', 'saveUploadedDocuments', 'getChangeRequest']),
...mapMutations('reportChanges', ['setUploadedDocument']),
previous() {
this.$router.push(PATHS.ROOT.CHANGE_LANDING);
Expand Down
Loading

0 comments on commit 664ecb5

Please sign in to comment.