Skip to content

Commit 1bcb8c5

Browse files
authored
Merge pull request #1324 from bcgov/release/master
Release/master
2 parents 9779492 + 2a3fccd commit 1bcb8c5

18 files changed

+1504
-1448
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,15 @@ export default defineComponent({
147147
}
148148
this.router.push({ name: "declaration" });
149149
} else {
150-
//this corrects edge case where user clicks requirements and does not select a new path. We need to remove ITE + SNE or it will persist.
151-
const currentTypes =
152-
this.applicationStore.draftApplication.certificationTypes?.filter((certification) => certification !== "Ite" && certification !== "Sne") || [];
150+
let currentTypes = this.applicationStore.draftApplication.certificationTypes || [];
151+
152+
// Filter out "Ite" and "Sne" unless currentTypes *only* contains "Ite" or "Sne".
153+
// This corrects edge case where user clicks requirements and does not select a new path. We need to remove ITE + SNE or it will persist.
154+
currentTypes =
155+
currentTypes.length === 1 && (currentTypes.includes("Ite") || currentTypes.includes("Sne"))
156+
? currentTypes
157+
: currentTypes.filter((certification) => certification !== "Ite" && certification !== "Sne");
158+
153159
const updatedTypes = [...currentTypes, ...this.specializationSelection];
154160
155161
// Remove duplicates if necessary

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,3 +382,10 @@ export default defineComponent({
382382
},
383383
});
384384
</script>
385+
386+
<style>
387+
.v-breadcrumbs__item:not(.v-breadcrumbs__item--disabled),
388+
.v-breadcrumbs-item:not(.v-breadcrumbs-item--disabled) {
389+
text-decoration: underline !important;
390+
}
391+
</style>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ export default defineComponent({
151151
return this.certification.certificatePDFGeneration === "Yes";
152152
},
153153
isCertificateActive(): boolean {
154-
return this.certification.statusCode === "Active" || this.certification.statusCode === "Renewed";
154+
return this.certification.statusCode === "Active";
155155
},
156156
},
157157
async mounted() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ export default defineComponent({
2020
let text;
2121
switch (this.certification.statusCode) {
2222
case "Active":
23-
case "Renewed":
2423
case "Reprinted":
2524
text = "Active";
2625
break;
2726
case "Expired":
2827
case "Inactive":
28+
case "Renewed":
2929
text = "Expired";
3030
break;
3131
case "Cancelled":

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/reference/inputs/EceCharacterReferenceDeclaration.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
{{ certificationType }}. We'll review your reference when assessing if the applicant is eligible for certification.
1515
</div>
1616
<br />
17+
<p>
18+
<b>
19+
This reference request is for {{ cleanPreferredName(wizardStore.wizardData.applicantFirstName, wizardStore.wizardData.applicantLastName) }}. If
20+
you are not {{ cleanPreferredName(wizardStore.wizardData.referenceFirstName, wizardStore.wizardData.referenceLastName) }}, please select "No"
21+
below and “Other” on the following page.
22+
</b>
23+
</p>
24+
<br />
1725

1826
<h2>Information you'll need</h2>
1927
<div>

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/reference/inputs/EceWorkExperienceReferenceDeclaration.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
{{ certificationType }}. We'll review your reference when assessing if the applicant is eligible for certification.
1515
</p>
1616
<br />
17+
<p>
18+
<b>
19+
This reference request is for {{ cleanPreferredName(wizardStore.wizardData.applicantFirstName, wizardStore.wizardData.applicantLastName) }}. If
20+
you are not {{ cleanPreferredName(wizardStore.wizardData.referenceFirstName, wizardStore.wizardData.referenceLastName) }}, please select "No"
21+
below and “Other” on the following page.
22+
</b>
23+
</p>
24+
<br />
1725

1826
<h2 class="mb-5">Information you'll need</h2>
1927
<p>

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/config/character-reference-wizard.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const characterReferenceWizardConfig: Wizard = {
2828
key: "item.3",
2929
},
3030
review: {
31-
title: "Preview",
31+
title: "Review",
3232
stage: "Review",
3333
form: characterReferenceReviewForm,
3434
key: "item.4",

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/config/preview-form-assistant-and-one-year-labor-mobility.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { Form } from "@/types/form";
55

66
const previewForm: Form = {
77
id: "previewForm",
8-
title: "Preview",
8+
title: "Review",
99
inputs: {
1010
certificateInformationPreview: {
1111
id: "certificateInformationPreview",

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/config/preview-form-assistant-and-one-year.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type { Form } from "@/types/form";
66

77
const previewForm: Form = {
88
id: "previewForm",
9-
title: "Preview",
9+
title: "Review",
1010
inputs: {
1111
certificationSelectionPreview: {
1212
id: "certificationSelectionPreview",

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/config/preview-form-five-year-labor-mobility.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type { Form } from "@/types/form";
66

77
const previewForm: Form = {
88
id: "previewForm",
9-
title: "Preview",
9+
title: "Review",
1010
inputs: {
1111
certificateInformationPreview: {
1212
id: "certificateInformationPreview",

0 commit comments

Comments
 (0)