Merge pull request #1449 from bcgov/stories/ecer-4782

Stories/ecer 4782: Work experience references for ICRA eligibility object

Author: farzadnadiri

src/ECER.Clients.RegistryPortal/ECER.Clients.RegistryPortal.Server/ICRA/ICRAEligibilitiesEndpoints.cs

@@ -78,6 +78,7 @@ public record ICRAEligibility()
 
   public ICRAStatus Status { get; set; }
   public IEnumerable<InternationalCertification> InternationalCertifications { get; set; } = Array.Empty<InternationalCertification>();
+  public IEnumerable<EmploymentReference> EmploymentReferences { get; set; } = Array.Empty<EmploymentReference>();
 }
 public record InternationalCertification
 {
@@ -107,6 +108,15 @@ public enum CertificateStatus
   Expired
 }
 
+public record EmploymentReference
+{
+  public string? Id { get; set; }
+  public string? LastName { get; set; }
+  public string? FirstName { get; set; }
+  public string? EmailAddress { get; set; }
+  public string? PhoneNumber { get; set; }
+}
+
 public enum ICRAStatus
 {
   Active,

src/ECER.Clients.RegistryPortal/ECER.Clients.RegistryPortal.Server/ICRA/ICRAEligibilityMapper.cs

@@ -12,5 +12,6 @@ public ICRAEligibilityMapper()
 
     CreateMap<InternationalCertification, Managers.Registry.Contract.ICRA.InternationalCertification>()
       .ReverseMap();
+    CreateMap<EmploymentReference, Managers.Registry.Contract.ICRA.EmploymentReference>().ReverseMap();
   }
 }

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/EceIcraWorkExperienceEligibilityCard.vue renamed to src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/EceEmploymentExperienceCard.vue

@@ -38,22 +38,22 @@ import { cleanPreferredName } from "@/utils/functions";
 import type { Components } from "@/types/openapi";
 
 export default defineComponent({
-  name: "WorkExperienceReferenceCard",
+  name: "EmploymentExperienceCard",
   setup() {
     const loadingStore = useLoadingStore();
 
     return { loadingStore };
   },
   props: {
     reference: {
-      type: Object as () => Components.Schemas.WorkExperienceReference,
+      type: Object as () => Components.Schemas.EmploymentReference,
       required: true,
     },
   },
 
   emits: {
-    edit: (_reference: Components.Schemas.WorkExperienceReference) => true,
-    delete: (_reference: Components.Schemas.WorkExperienceReference) => true,
+    edit: (_reference: Components.Schemas.EmploymentReference) => true,
+    delete: (_reference: Components.Schemas.EmploymentReference) => true,
   },
   computed: {
     referenceFullName() {

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceIcraWorkExperienceEligibility.vue renamed to src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceEmploymentExperience.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- add view -->
-  <div v-if="icraWorkExperienceEligibilityFormMode === 'edit' || icraWorkExperienceEligibilityFormMode === 'add'">
+  <div v-if="employmentExperienceFormMode === 'edit' || employmentExperienceFormMode === 'add'">
     <ECEHeader title="Employment experience references" />
     <br />
     <p>
@@ -84,11 +84,7 @@
     </v-row>
     <v-row v-if="Array.isArray(modelValue) && modelValue.length > 0" v-for="(reference, index) in modelValue" :key="index">
       <v-col sm="12" md="10" lg="8" xl="6">
-        <EceIcraWorkExperienceEligibilityCard
-          :reference="reference"
-          @edit="handleEdit"
-          @delete="(internationalCertification) => handleDelete(internationalCertification, index)"
-        />
+        <EceEmploymentExperienceCard :reference="reference" @edit="handleEdit" @delete="(reference) => handleDelete(reference, index)" />
       </v-col>
     </v-row>
     <v-row v-else-if="modelValue?.length === 0">
@@ -100,7 +96,7 @@
     <v-row v-if="showAddWorkExperienceEligibilityButton">
       <v-col sm="12" md="10" lg="8" xl="6">
         <v-btn
-          id="btnAddInternationalCertification"
+          id="btnAddEmploymentExperience"
           prepend-icon="mdi-plus"
           rounded="lg"
           color="primary"
@@ -134,7 +130,7 @@
 
 <script lang="ts">
 import { mapWritableState } from "pinia";
-import { defineComponent } from "vue";
+import { defineComponent, type PropType } from "vue";
 import type { VForm, VInput } from "vuetify/components";
 
 import EceDateInput from "@/components/inputs/EceDateInput.vue";
@@ -153,28 +149,28 @@ import * as Rules from "@/utils/formRules";
 import { removeElementByIndex, replaceElementByIndex } from "@/utils/functions";
 
 import ECEHeader from "../ECEHeader.vue";
-import EceIcraWorkExperienceEligibilityCard from "../EceIcraWorkExperienceEligibilityCard.vue";
+import EceEmploymentExperienceCard from "../EceEmploymentExperienceCard.vue";
 import ProgressBar from "../ProgressBar.vue";
 import { useIcraStore } from "@/store/icra";
 
 const MAX_NUM_REFERENCES = 6;
 
-interface IcraWorkExperienceEligibilityData extends Components.Schemas.WorkExperienceReference {
+interface EmploymentExperienceData extends Components.Schemas.EmploymentReference {
   //other fields
-  icraWorkExperienceEligibilityFormMode: "add" | "edit" | undefined; //TODO not supposed to be optional
+  employmentExperienceFormMode: "add" | "edit" | undefined;
 }
 
 export default defineComponent({
-  name: "EceIcraWorkExperienceEligibility",
-  components: { ProgressBar, EceIcraWorkExperienceEligibilityCard, EceDateInput, EceTextField, Callout, ECEHeader },
+  name: "EceEmploymentExperience",
+  components: { ProgressBar, EceEmploymentExperienceCard, EceDateInput, EceTextField, Callout, ECEHeader },
   props: {
     modelValue: {
-      type: Object as () => Components.Schemas.WorkExperienceReference[],
+      type: Array as PropType<Components.Schemas.EmploymentReference[]>,
       required: true, //to switch to true
     },
   },
   emits: {
-    "update:model-value": (_icraWorkExperienceEligibility: Components.Schemas.WorkExperienceReference[]) => true,
+    "update:model-value": (_icraWorkExperienceEligibility: Components.Schemas.EmploymentReference[]) => true,
   },
   setup: () => {
     const alertStore = useAlertStore();
@@ -198,16 +194,16 @@ export default defineComponent({
       MAX_NUM_REFERENCES,
     };
   },
-  data(): IcraWorkExperienceEligibilityData {
+  data(): EmploymentExperienceData {
     return {
-      //international certification
-      id: "",
+      //employment experience
+      id: null,
       lastName: "",
       firstName: "",
       emailAddress: "",
       phoneNumber: "",
       //other data
-      icraWorkExperienceEligibilityFormMode: undefined,
+      employmentExperienceFormMode: undefined,
     };
   },
   computed: {
@@ -238,10 +234,10 @@ export default defineComponent({
       // Reset the form fields
       this.resetFormData();
       this.mode = "add";
-      this.icraWorkExperienceEligibilityFormMode = "add";
+      this.employmentExperienceFormMode = "add";
       window.scroll(0, 0);
     },
-    handleEdit(reference: Components.Schemas.WorkExperienceReference) {
+    handleEdit(reference: Components.Schemas.EmploymentReference) {
       // Set the form fields to component data
       this.id = reference.id;
       this.lastName = reference.lastName;
@@ -250,9 +246,10 @@ export default defineComponent({
       this.phoneNumber = reference.phoneNumber;
 
       this.mode = "add";
-      this.icraWorkExperienceEligibilityFormMode = "edit";
+      this.employmentExperienceFormMode = "edit";
+      window.scroll(0, 0);
     },
-    async handleDelete(_reference: Components.Schemas.WorkExperienceReference, index: number) {
+    async handleDelete(_reference: Components.Schemas.EmploymentReference, index: number) {
       this.$emit("update:model-value", removeElementByIndex(this.modelValue, index));
 
       // await this.icraStore.saveDraft();
@@ -263,7 +260,7 @@ export default defineComponent({
       const { valid } = await (this.$refs.icraWorkExperienceEligibilityForm as VForm).validate();
 
       if (valid) {
-        const newIcraWorkExperienceEligibilityReference: Components.Schemas.WorkExperienceReference = {
+        const newEmploymentExperienceReference: Components.Schemas.EmploymentReference = {
           id: this.id, //empty if we are adding
           lastName: this.lastName,
           firstName: this.firstName,
@@ -272,21 +269,19 @@ export default defineComponent({
         };
         let updatedModelValue = this.modelValue?.slice() || []; //create a copy of the array
 
-        if (this.icraWorkExperienceEligibilityFormMode === "edit") {
-          const indexOfEditedReference = updatedModelValue.findIndex((reference) => reference.id === newIcraWorkExperienceEligibilityReference.id);
-          updatedModelValue = replaceElementByIndex(updatedModelValue, indexOfEditedReference, newIcraWorkExperienceEligibilityReference);
-        } else if (this.icraWorkExperienceEligibilityFormMode === "add") {
-          updatedModelValue.push(newIcraWorkExperienceEligibilityReference);
+        if (this.employmentExperienceFormMode === "edit") {
+          const indexOfEditedReference = updatedModelValue.findIndex((reference) => reference.id === newEmploymentExperienceReference.id);
+          updatedModelValue = replaceElementByIndex(updatedModelValue, indexOfEditedReference, newEmploymentExperienceReference);
+        } else if (this.employmentExperienceFormMode === "add") {
+          updatedModelValue.push(newEmploymentExperienceReference);
         }
 
         this.$emit("update:model-value", updatedModelValue);
 
-        // await this.icraStore.saveDraft(); //TODO add in when save draft is ready
+        await this.icraStore.saveDraft();
 
         this.alertStore.setSuccessAlert(
-          this.icraWorkExperienceEligibilityFormMode === "edit"
-            ? "You have successfully edited your reference."
-            : "You have successfully added your reference.",
+          this.employmentExperienceFormMode === "edit" ? "You have successfully edited your reference." : "You have successfully added your reference.",
         );
 
         this.resetFormData();
@@ -299,13 +294,13 @@ export default defineComponent({
       }
     },
     resetFormData() {
-      this.id = "";
-      this.lastName = "so"; //TODO remove test data
-      this.firstName = "derek";
-      this.emailAddress = "[email protected]";
+      this.id = null;
+      this.lastName = "";
+      this.firstName = "";
+      this.emailAddress = "";
       this.phoneNumber = "";
 
-      this.icraWorkExperienceEligibilityFormMode = undefined;
+      this.employmentExperienceFormMode = undefined;
     },
   },
 });

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

@@ -59,7 +59,7 @@ export default defineComponent({
     };
   },
   computed: {
-    employmentExperiences(): Components.Schemas.WorkExperienceReference[] {
+    employmentExperiences(): Components.Schemas.EmploymentReference[] {
       return this.wizardStore.wizardData[this.wizardStore.wizardConfig.steps?.employmentExperience?.form?.inputs?.employmentExperience?.id || ""];
     },
   },

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/config/employment-experience-form.ts

@@ -1,4 +1,4 @@
-import EceIcraWorkExperienceEligibility from "@/components/inputs/EceIcraWorkExperienceEligibility.vue";
+import EceEmploymentExperience from "@/components/inputs/EceEmploymentExperience.vue";
 import type { Form } from "@/types/form";
 
 const employmentExperienceForm: Form = {
@@ -7,7 +7,7 @@ const employmentExperienceForm: Form = {
   inputs: {
     employmentExperience: {
       id: "employmentExperience",
-      component: EceIcraWorkExperienceEligibility,
+      component: EceEmploymentExperience,
       cols: {
         md: 12,
         lg: 12,

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/store/icra.ts

@@ -92,7 +92,7 @@ export const useIcraStore = defineStore("icra", {
       }
 
       if (employmentExperienceId) {
-        console.log("employment experience TODO not implemented"); //TODO
+        this.draftIcraEligibility.employmentReferences = wizardStore.wizardData[employmentExperienceId];
       }
     },
     async upsertDraftIcraEligibility(): Promise<Components.Schemas.DraftICRAEligibilityResponse | null | undefined> {

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/store/wizard.ts

@@ -207,10 +207,7 @@ export const useWizardStore = defineStore("wizard", {
 
         //employment experience
         ...(wizard.steps?.employmentExperience?.form?.inputs?.employmentExperience?.id && {
-          [wizard.steps?.employmentExperience?.form?.inputs?.employmentExperience?.id]: [
-            { id: "", lastName: "test", firstName: "test", emailAddress: "[email protected]", phoneNumber: "" },
-            { id: "", lastName: "test2", firstName: "test2", emailAddress: "[email protected]", phoneNumber: "135131313" },
-          ], // TODO we need to add in the draft object here when it's ready
+          [wizard.steps?.employmentExperience?.form?.inputs?.employmentExperience?.id]: draftIcraEligibility.employmentReferences || [],
         }),
       });
     },

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/types/openapi.d.ts

@@ -277,6 +277,13 @@ declare namespace Components {
         }
         export type EducationOrigin = "InsideBC" | "OutsideBC" | "OutsideofCanada";
         export type EducationRecognition = "Recognized" | "NotRecognized";
+        export interface EmploymentReference {
+            id?: string | null;
+            lastName?: string | null;
+            firstName?: string | null;
+            emailAddress?: string | null;
+            phoneNumber?: string | null;
+        }
         export interface FileInfo {
             id?: string | null;
             url?: string | null;
@@ -318,6 +325,7 @@ declare namespace Components {
             createdOn?: string | null; // date-time
             status?: ICRAStatus;
             internationalCertifications?: InternationalCertification[] | null;
+            employmentReferences?: EmploymentReference[] | null;
         }
         export type ICRAStatus = "Active" | "Draft" | "Eligible" | "Inactive" | "Ineligible" | "InReview" | "ReadyforReview" | "Submitted";
         export interface IdentificationType {
@@ -621,7 +629,7 @@ declare namespace Components {
             timestamp?: string | null;
             commit?: string | null;
         }
-        export type WorkExperienceRefStage = "ApplicationSubmitted" | "Approved" | "Draft" | "InProgress" | "Rejected" | "Submitted" | "UnderReview" | "WaitingforResponse" | "ICRAEligibilitySubmitted";
+        export type WorkExperienceRefStage = "ApplicationSubmitted" | "Approved" | "Draft" | "InProgress" | "Rejected" | "Submitted" | "UnderReview" | "WaitingforResponse" | "ICRAEligibilitySubmitted" | "EligibilityResponseSubmitted";
         export interface WorkExperienceReference {
             lastName?: string | null;
             emailAddress?: string | null;
@@ -1998,6 +2006,7 @@ export type DraftApplicationResponse = Components.Schemas.DraftApplicationRespon
 export type DraftICRAEligibilityResponse = Components.Schemas.DraftICRAEligibilityResponse;
 export type EducationOrigin = Components.Schemas.EducationOrigin;
 export type EducationRecognition = Components.Schemas.EducationRecognition;
+export type EmploymentReference = Components.Schemas.EmploymentReference;
 export type FileInfo = Components.Schemas.FileInfo;
 export type FileResponse = Components.Schemas.FileResponse;
 export type FiveYearRenewalExplanations = Components.Schemas.FiveYearRenewalExplanations;

src/ECER.Managers.Registry.Contract/ICRA/Contract.cs

@@ -22,6 +22,7 @@ public record ICRAEligibility()
   public DateTime? CreatedOn { get; set; }
   public ICRAStatus Status { get; set; }
   public IEnumerable<InternationalCertification> InternationalCertifications { get; set; } = Array.Empty<InternationalCertification>();
+  public IEnumerable<EmploymentReference> EmploymentReferences { get; set; } = Array.Empty<EmploymentReference>();
 }
 public record InternationalCertification
 {
@@ -45,6 +46,15 @@ public record InternationalCertification
   public IEnumerable<string> NewFiles { get; set; } = Array.Empty<string>();
 }
 
+public record EmploymentReference
+{
+  public string? Id { get; set; }
+  public string? LastName { get; set; }
+  public string? FirstName { get; set; }
+  public string? EmailAddress { get; set; }
+  public string? PhoneNumber { get; set; }
+}
+
 public enum CertificateStatus
 {
   Valid,