Skip to content

Commit 839b875

Browse files
pcatkinspcatkins
authored
Merge pull request #1365 from bcgov/merge-release-master
Merge release/master into master
2 parents bca70c6 + e342a9c commit 839b875

18 files changed

+288
-261
lines changed

‎src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ApplicationRequirements.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</template>
1818

1919
<!-- Labor Mobility -->
20-
<template v-if="applicationStore.isDraftApplicationLaborMobility">
20+
<template v-else-if="applicationStore.isDraftApplicationLaborMobility">
2121
<ECEAssistantLaborMobilityRequirements v-if="applicationStore.isDraftCertificateTypeEceAssistant" />
2222
<ECEOneYearLaborMobilityRequirements v-if="applicationStore.isDraftCertificateTypeOneYear" />
2323
<ECEFiveYearLaborMobilityRequirements
@@ -146,6 +146,9 @@ export default defineComponent({
146146
});
147147
}
148148
this.router.push({ name: "declaration" });
149+
} else if (this.applicationStore.isDraftApplicationRenewal) {
150+
//for renewal applications we do not need to perform any additional checks. The certification types should be correctly set in the draft application store.
151+
this.router.push({ name: "declaration" });
149152
} else {
150153
let currentTypes = this.applicationStore.draftApplication.certificationTypes || [];
151154

‎src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/Breadcrumb.vue‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ export default defineComponent({
370370
case "manageApplication":
371371
return [...this.baseItems, { title: "Application", disabled: true, href: `/manage-application/${params.applicationId}` }];
372372
373-
374373
case "icra-eligibility-requirements":
375374
return [
376375
...this.baseItems,

‎src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ECEFiveYearRegistrantRequirements.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</v-row>
5252
<v-row>
5353
<v-col cols="12">
54-
<SpecializedCertificationOptions ref="SpecializedCertificationOptions" :pre-selected="['Ite', 'Sne']" />
54+
<SpecializedCertificationOptions ref="SpecializedCertificationOptions" />
5555
</v-col>
5656
</v-row>
5757
</template>

‎src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ECEFiveYearRenewalRequirements.vue‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<v-col cols="12">
1515
<ECEHeader title="Character reference" />
1616
<div class="d-flex flex-column ga-3 my-6">
17-
<p>You will need to provide a character reference. You'll enter their name and email. We'll contact them later after you submit your application.</p>
17+
<p>You will need to provide a character reference. You'll enter their name and email. We'll contact them later
18+
after you submit your application.</p>
1819
<p>The reference must be someone who:</p>
1920
<ul class="ml-10">
2021
<li>Can speak to your character</li>
@@ -30,14 +31,16 @@
3031
<ECEHeader title="Work experience" />
3132
<div v-if="!expired" class="d-flex flex-column ga-3 my-6">
3233
<p>
33-
You need to have completed 400 hours of work experience and be able to provide references to verify the hours. If you worked at multiple locations, you
34+
You need to have completed 400 hours of work experience and be able to provide references to verify the hours.
35+
If you worked at multiple locations, you
3436
can provide multiple references.
3537
</p>
3638
<p>The hours must:</p>
3739
<ul class="ml-10">
3840
<li>Be related to the field of early childhood education</li>
3941
<li>
40-
Have been completed within the term of your current certificate (between {{ formattedLatestCertificationEffectiveDate }} and
42+
Have been completed within the term of your current certificate (between {{
43+
formattedLatestCertificationEffectiveDate }} and
4144
{{ formattedLatestCertificationExpiryDate }})
4245
</li>
4346
</ul>
@@ -50,7 +53,8 @@
5053
</div>
5154
<div v-if="expired && !expiredMoreThan5Years" class="d-flex flex-column ga-3 my-6">
5255
<p>
53-
You need to have completed 400 hours of work experience and be able to provide references to verify the hours. If you worked at multiple locations, you
56+
You need to have completed 400 hours of work experience and be able to provide references to verify the hours.
57+
If you worked at multiple locations, you
5458
can provide multiple references.
5559
</p>
5660
<p>The hours must:</p>
@@ -66,7 +70,8 @@
6670
</ul>
6771
</div>
6872
<div v-if="expired && expiredMoreThan5Years" class="d-flex flex-column ga-3 my-6">
69-
<p>You need to have completed 500 hours of work experience and be able to provide references to verify the hours.</p>
73+
<p>You need to have completed 500 hours of work experience and be able to provide references to verify the hours.
74+
</p>
7075
<p>Important information about calculating hours:</p>
7176
<ul class="ml-10">
7277
<li>Only include hours you worked once you began your early childhood education training program</li>
@@ -86,24 +91,19 @@
8691
<v-col cols="12">
8792
<ECEHeader title="Professional development" />
8893
<div class="d-flex flex-column ga-3 my-6">
89-
<p>You must have completed at least 40 hours of professional development.</p>
90-
<p>The course or workshop must:</p>
94+
<p>To meet the professional development requirement, you need to have completed 40 hours of training.</p>
95+
<h3>What courses or workshops are eligible?</h3>
96+
<p>Each course or workshop must:</p>
9197
<ul class="ml-10">
92-
<li>Be relevant to the field of early childhood education</li>
98+
<li>Be related to early childhood education</li>
9399
<li v-if="!expired">
94-
Have been completed within the term of your current certificate (between {{ formattedLatestCertificationEffectiveDate }} and
95-
{{ formattedLatestCertificationExpiryDate }})
100+
Have been completed within the dates of your current certificate:
101+
<strong>{{ formattedLatestCertificationEffectiveDate }}</strong>
102+
to
103+
<strong>{{ formattedLatestCertificationExpiryDate }}</strong>
96104
</li>
97105
<li v-else>Have been completed within the last 5 years</li>
98106
</ul>
99-
<p>You'll need to provide the following information about each course or workshop:</p>
100-
<ul class="ml-10">
101-
<li>Name of the course or workshop</li>
102-
<li>Name of the place where you took it</li>
103-
<li>Dates when you started and completed it</li>
104-
<li>How many hours it was</li>
105-
<li>Contact information for the facilitator/instructor or a document to show you've completed the course</li>
106-
</ul>
107107
</div>
108108
</v-col>
109109
</template>

‎src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ECEFiveYearRequirements.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</v-row>
8383
<v-row>
8484
<v-col cols="12">
85-
<SpecializedCertificationOptions :pre-selected="['Ite', 'Sne']" />
85+
<SpecializedCertificationOptions />
8686
</v-col>
8787
</v-row>
8888
</template>

‎src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ECEIteRegistrantRequirements.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<v-row>
99
<v-col cols="12">
1010
<ECEHeader title="Education for Infant and Toddler Educator (ITE)"></ECEHeader>
11-
<p>You must have completed an infant and toddler educator training program.</p>
11+
<p>You must have completed an infant and toddler educator program.</p>
1212
<br />
1313
<p>The program must be either:</p>
1414
<br />

‎src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ECEOneYearRenewalRequirements.vue‎

Lines changed: 54 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
<template>
2-
<v-col
3-
v-if="
4-
certificationStore.certificateStatus(applicationStore.draftApplication.fromCertificate) == 'Active' ||
5-
(certificationStore.certificateStatus(applicationStore.draftApplication.fromCertificate) == 'Expired' &&
6-
!certificationStore.expiredMoreThan5Years(applicationStore.draftApplication.fromCertificate))
7-
"
8-
cols="12"
9-
>
2+
<v-col v-if="
3+
certificationStore.certificateStatus(applicationStore.draftApplication.fromCertificate) == 'Active' ||
4+
(certificationStore.certificateStatus(applicationStore.draftApplication.fromCertificate) == 'Expired' &&
5+
!certificationStore.expiredMoreThan5Years(applicationStore.draftApplication.fromCertificate))
6+
" cols="12">
107
<Alert title="Do you have 500 hours of supervised work experience?">
118
You should
12-
<a
13-
class="cursor-pointer text-decoration-underline"
14-
@click="
15-
applicationStore.draftApplication.certificationTypes = ['FiveYears'];
16-
applicationStore.draftApplication.applicationType = 'New';
17-
"
18-
>
9+
<a class="cursor-pointer text-decoration-underline" @click="
10+
applicationStore.draftApplication.certificationTypes = ['FiveYears'];
11+
applicationStore.draftApplication.applicationType = 'New';
12+
">
1913
apply for ECE Five Year certification
2014
</a>
2115
if you have completed 500 hours of work experience.
@@ -33,26 +27,26 @@
3327
<ul class="ml-10">
3428
<li>You can only renew this certificate once</li>
3529
<li>You cannot renew an ECE One Year Certificate if it has been expired for more than 5 years</li>
36-
<li>After you renew you’ll only be able to apply for an ECE Five Year certificate or an ECE Assistant certificate</li>
30+
<li>After you renew you’ll only be able to apply for an ECE Five Year certificate or an ECE Assistant
31+
certificate</li>
3732
</ul>
3833
</div>
3934
</v-col>
4035
<v-col cols="12">
4136
<ECEHeader title="Reason why you're renewing your ECE One Year certification" />
4237
<div class="d-flex flex-column ga-3 my-6">
4338
<p>
44-
You will need to provide a reason for why you were unable to complete the required 500 hours of supervised work experience during the term of your ECE
45-
One Year Certificate and/or why you were unable to provide a reference from the certified ECE who supervised the hours.
39+
You will need to provide a reason for why you were unable to complete the required 500 hours of supervised work
40+
experience during the term of your ECE
41+
One Year Certificate and/or why you were unable to provide a reference from the certified ECE who supervised the
42+
hours.
4643
</p>
4744
<p>
4845
If you've completed 500 hours, you should apply for
49-
<a
50-
class="cursor-pointer text-decoration-underline"
51-
@click="
52-
applicationStore.draftApplication.certificationTypes = ['FiveYears'];
53-
applicationStore.draftApplication.applicationType = 'New';
54-
"
55-
>
46+
<a class="cursor-pointer text-decoration-underline" @click="
47+
applicationStore.draftApplication.certificationTypes = ['FiveYears'];
48+
applicationStore.draftApplication.applicationType = 'New';
49+
">
5650
ECE Five Year certification
5751
</a>
5852
instead.
@@ -62,7 +56,8 @@
6256
<v-col cols="12">
6357
<ECEHeader title="Character reference" />
6458
<div class="d-flex flex-column ga-3 my-6">
65-
<p>You will need to provide a character reference. You'll enter their name and email. We'll contact them later after you submit your application.</p>
59+
<p>You will need to provide a character reference. You'll enter their name and email. We'll contact them later
60+
after you submit your application.</p>
6661
<p>The reference must be someone who:</p>
6762
<ul class="ml-10">
6863
<li>Can speak to your character</li>
@@ -78,7 +73,8 @@
7873
<ECEHeader title="Work experience" />
7974
<div class="d-flex flex-column ga-3 my-6">
8075
<p>
81-
You need to have completed 400 hours of work experience and be able to provide references to verify the hours. If you worked at multiple locations, you
76+
You need to have completed 400 hours of work experience and be able to provide references to verify the hours.
77+
If you worked at multiple locations, you
8278
can provide multiple references.
8379
</p>
8480
<p>The hours must:</p>
@@ -97,31 +93,31 @@
9793
<v-col v-if="expired" cols="12">
9894
<ECEHeader title="Professional development" />
9995
<div class="d-flex flex-column ga-3 my-6">
100-
<p>You must have completed at least 40 hours of professional development.</p>
101-
<p>The course or workshop must:</p>
102-
<ul class="ml-10">
103-
<li>Be relevant to the field of early childhood education</li>
104-
<li>Have been completed within the last 5 years</li>
105-
</ul>
106-
<p>You'll need to provide the following information about each course or workshop:</p>
96+
<p>To meet the professional development requirement, you need to have completed 40 hours of training.</p>
97+
<h3>What courses or workshops are eligible?</h3>
98+
<p>Each course or workshop must:</p>
10799
<ul class="ml-10">
108-
<li>Name of the course or workshop</li>
109-
<li>Name of the place where you took it</li>
110-
<li>Dates when you started and completed it</li>
111-
<li>How many hours it was</li>
112-
<li>Contact information for the facilitator/instructor or a document to show you've completed the course</li>
100+
<li>Be related to early childhood education</li>
101+
<li v-if="!expired">
102+
Have been completed within the dates of your current certificate:
103+
<strong>{{ formattedLatestCertificationEffectiveDate }}</strong>
104+
to
105+
<strong>{{ formattedLatestCertificationExpiryDate }}</strong>
106+
</li>
107+
<li v-else>Have been completed within the last 5 years</li>
113108
</ul>
114109
</div>
115110
</v-col>
116111
</template>
117112

118113
<script lang="ts">
119-
import { defineComponent } from "vue";
114+
import { defineComponent, type PropType } from "vue";
120115
121116
import Alert from "@/components/Alert.vue";
122117
import ECEHeader from "@/components/ECEHeader.vue";
123118
import { useApplicationStore } from "@/store/application";
124119
import { useCertificationStore } from "@/store/certification";
120+
import { formatDate } from "@/utils/format";
125121
126122
export default defineComponent({
127123
name: "ECEOneYearRenewalRequirements",
@@ -133,13 +129,25 @@ export default defineComponent({
133129
},
134130
},
135131
setup() {
136-
const certificationStore = useCertificationStore();
137132
const applicationStore = useApplicationStore();
138-
139-
return {
140-
certificationStore,
141-
applicationStore,
142-
};
133+
const certificationStore = useCertificationStore();
134+
return { applicationStore, certificationStore };
135+
},
136+
computed: {
137+
formattedLatestCertificationExpiryDate(): string {
138+
const fromCertificateId = this.applicationStore.draftApplication.fromCertificate;
139+
if (fromCertificateId) {
140+
return formatDate(this.certificationStore.certificationExpiryDate(fromCertificateId) ?? "", "LLL d, yyyy");
141+
}
142+
return formatDate("", "LLL d, yyyy"); // Default to empty if no fromCertificate is specified
143+
},
144+
formattedLatestCertificationEffectiveDate(): string {
145+
const fromCertificateId = this.applicationStore.draftApplication.fromCertificate;
146+
if (fromCertificateId) {
147+
return formatDate(this.certificationStore.certificationEffectiveDate(fromCertificateId) ?? "", "LLL d, yyyy");
148+
}
149+
return formatDate("", "LLL d, yyyy"); // Default to empty if no fromCertificate is specified
150+
},
143151
},
144152
});
145153
</script>

‎src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ECEOneYearRequirements.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<v-row>
1313
<v-col>
1414
<ECEHeader title="Education information"></ECEHeader>
15-
<p>You must have completed a basic early childhood education training program.</p>
15+
<p>You must have completed a basic early childhood education program.</p>
1616
<br />
1717
<p>The program must be either:</p>
1818
<br />

‎src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ECESneRegistrantRequirements.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<v-row>
99
<v-col cols="12">
1010
<ECEHeader title="Education for Special Needs Educator (SNE)"></ECEHeader>
11-
<p>You must have completed a special needs early childhood educator training program.</p>
11+
<p>You must have completed a special needs educator program.</p>
1212
<br />
1313
<p>The program must be either:</p>
1414
<br />

‎src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ProfessionalDevelopmentCard.vue‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@
66
<v-col>
77
<p class="font-weight-bold">{{ professionalDevelopment.courseName }}</p>
88
</v-col>
9+
<v-spacer></v-spacer>
10+
<v-col class="text-wrap" cols="auto">
11+
<p>
12+
{{
13+
`${formatDate(professionalDevelopment.startDate || "", "LLLL d, yyyy")} - ${formatDate(professionalDevelopment.endDate || "", "LLLL d, yyyy")}`
14+
}}
15+
</p>
16+
</v-col>
17+
<v-spacer></v-spacer>
918
<v-col>
1019
<p>{{ `${professionalDevelopment.numberOfHours} hours` }}</p>
1120
</v-col>
12-
13-
<div></div>
1421
</v-row>
1522
</v-card-title>
1623
</template>
@@ -44,6 +51,7 @@
4451
<script lang="ts">
4552
import { defineComponent } from "vue";
4653
import { useLoadingStore } from "@/store/loading";
54+
import { formatDate } from "@/utils/format";
4755
4856
import type { ProfessionalDevelopmentExtended } from "./inputs/EceProfessionalDevelopment.vue";
4957
@@ -57,7 +65,7 @@ export default defineComponent({
5765
},
5866
setup() {
5967
const loadingStore = useLoadingStore();
60-
return { loadingStore };
68+
return { loadingStore, formatDate };
6169
},
6270
emits: {
6371
edit: (_reference: ProfessionalDevelopmentExtended) => true,

0 commit comments

Comments
 (0)