ECER-966: SetStage input changed to PortalStage (PR feedbacks)

bcgov · Mar 25, 2024 · 3798a51 · 3798a51
1 parent e71414d
commit 3798a51
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 50 deletions.
diff --git a/.../ecer.clients.registryportal.client/src/components/WorkExperienceReferenceProgressBar.vue b/.../ecer.clients.registryportal.client/src/components/WorkExperienceReferenceProgressBar.vue
@@ -37,7 +37,6 @@ export default defineComponent({
     },
     totalHours(): number {
       return this.referenceList.reduce((acc, reference) => {
-
         return acc + (reference.hours as number);
       }, 0);
     },

diff --git a/.../ecer.clients.registryportal.client/src/components/inputs/EceCertificationTypePreview.vue b/.../ecer.clients.registryportal.client/src/components/inputs/EceCertificationTypePreview.vue
@@ -6,7 +6,7 @@
           <h3 class="font-black">Certification Selection</h3>
         </v-col>
         <v-col align="end">
-          <v-btn @click="setWizard('CertificationType')" v-bind="props" icon="mdi-pencil" color="primary" variant="plain" />
+          <v-btn v-bind="props" icon="mdi-pencil" color="primary" variant="plain" @click="setWizard('CertificationType')" />
         </v-col>
       </v-row>
       <v-row>
@@ -23,11 +23,12 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import { useApplicationStore } from "@/store/application";
+
 import PreviewCard from "@/components/PreviewCard.vue";
+import { useApplicationStore } from "@/store/application";
 import { useWizardStore } from "@/store/wizard";
 import type { EcePreviewProps } from "@/types/input";
-
+import type { Components } from "@/types/openapi";
 export default defineComponent({
   name: "EceCertificationTypePreview",
   components: {
@@ -43,15 +44,10 @@ export default defineComponent({
     const wizardStore = useWizardStore();
     const applicationStore = useApplicationStore();
     return {
-      wizardStore,applicationStore,
+      wizardStore,
+      applicationStore,
     };
   },
-  methods:{
-    setWizard(stage:string) {
-      this.wizardStore.setCurrentStep(stage);
-      this.applicationStore.draftApplication.stage = this.wizardStore.currentStepStage;
-    },
-  },
   computed: {
     certificationType() {
       let certificationType = "";
@@ -74,5 +70,11 @@ export default defineComponent({
       return certificationType;
     },
   },
+  methods: {
+    setWizard(stage: Components.Schemas.PortalStage) {
+      this.wizardStore.setCurrentStep(stage);
+      this.applicationStore.draftApplication.stage = this.wizardStore.currentStepStage;
+    },
+  },
 });
 </script>
diff --git a/...ecer.clients.registryportal.client/src/components/inputs/EceCharacterReferencePreview.vue b/...ecer.clients.registryportal.client/src/components/inputs/EceCharacterReferencePreview.vue
@@ -6,7 +6,7 @@
           <h3 class="font-black">Character Reference</h3>
         </v-col>
         <v-col align="end">
-          <v-btn v-bind="props" @click="setWizard('CharacterReferences')" icon="mdi-pencil" color="primary" variant="plain" />
+          <v-btn v-bind="props" icon="mdi-pencil" color="primary" variant="plain" @click="setWizard('CharacterReferences')" />
         </v-col>
       </v-row>
       <v-row>
@@ -47,8 +47,9 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import { useApplicationStore } from "@/store/application";
+
 import PreviewCard from "@/components/PreviewCard.vue";
+import { useApplicationStore } from "@/store/application";
 import { useWizardStore } from "@/store/wizard";
 import type { EcePreviewProps } from "@/types/input";
 import type { Components } from "@/types/openapi";
@@ -68,15 +69,10 @@ export default defineComponent({
     const wizardStore = useWizardStore();
     const applicationStore = useApplicationStore();
     return {
-      wizardStore, applicationStore,
+      wizardStore,
+      applicationStore,
     };
   },
-  methods:{
-    setWizard(stage:string) {
-      this.wizardStore.setCurrentStep(stage);
-      this.applicationStore.draftApplication.stage = this.wizardStore.currentStepStage;
-    },
-  },
   computed: {
     characterReference(): Components.Schemas.CharacterReference {
       return {
@@ -88,5 +84,11 @@ export default defineComponent({
       };
     },
   },
+  methods: {
+    setWizard(stage: Components.Schemas.PortalStage) {
+      this.wizardStore.setCurrentStep(stage);
+      this.applicationStore.draftApplication.stage = this.wizardStore.currentStepStage;
+    },
+  },
 });
 </script>
diff --git a/...ecer.clients.registryportal.client/src/components/inputs/EceContactInformationPreview.vue b/...ecer.clients.registryportal.client/src/components/inputs/EceContactInformationPreview.vue
@@ -6,7 +6,7 @@
           <h3 class="font-black">Contact Information</h3>
         </v-col>
         <v-col align="end">
-          <v-btn @click="setWizard('ContactInformation')" v-bind="props" icon="mdi-pencil" color="primary" variant="plain" />
+          <v-btn v-bind="props" icon="mdi-pencil" color="primary" variant="plain" @click="setWizard('ContactInformation')" />
         </v-col>
       </v-row>
       <v-row>
@@ -103,12 +103,13 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import { useApplicationStore } from "@/store/application";
+
 import type { AddressesData } from "@/components/inputs/EceAddresses.vue";
 import PreviewCard from "@/components/PreviewCard.vue";
+import { useApplicationStore } from "@/store/application";
 import { useWizardStore } from "@/store/wizard";
 import type { EcePreviewProps } from "@/types/input";
-
+import type { Components } from "@/types/openapi";
 export default defineComponent({
   name: "EceContactInformationPreview",
   components: {
@@ -124,15 +125,10 @@ export default defineComponent({
     const wizardStore = useWizardStore();
     const applicationStore = useApplicationStore();
     return {
-      wizardStore,applicationStore,
+      wizardStore,
+      applicationStore,
     };
   },
-  methods:{
-    setWizard(stage:string) {
-      this.wizardStore.setCurrentStep(stage);
-      this.applicationStore.draftApplication.stage = this.wizardStore.currentStepStage;
-    },
-  },
   computed: {
     legalLastName() {
       return this.wizardStore.wizardData[this.wizardStore.wizardConfig.steps.profile.form.inputs.legalLastName.id] ?? "—";
@@ -170,5 +166,11 @@ export default defineComponent({
       return this.wizardStore.wizardData[this.wizardStore.wizardConfig.steps.profile.form.inputs.alternateContactNumber.id] ?? "—";
     },
   },
+  methods: {
+    setWizard(stage: Components.Schemas.PortalStage) {
+      this.wizardStore.setCurrentStep(stage);
+      this.applicationStore.draftApplication.stage = this.wizardStore.currentStepStage;
+    },
+  },
 });
 </script>
diff --git a/...ryPortal/ecer.clients.registryportal.client/src/components/inputs/EceEducationPreview.vue b/...ryPortal/ecer.clients.registryportal.client/src/components/inputs/EceEducationPreview.vue
@@ -6,7 +6,7 @@
           <h3>Education</h3>
         </v-col>
         <v-col align="end">
-          <v-btn @click="setWizard('Education')" v-bind="props" icon="mdi-pencil" color="primary" variant="plain" />
+          <v-btn v-bind="props" icon="mdi-pencil" color="primary" variant="plain" @click="setWizard('Education')" />
         </v-col>
       </v-row>
       <div v-for="(education, id, index) in educations" :key="id">
@@ -79,8 +79,9 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import { useApplicationStore } from "@/store/application";
+
 import PreviewCard from "@/components/PreviewCard.vue";
+import { useApplicationStore } from "@/store/application";
 import { useWizardStore } from "@/store/wizard";
 import type { EcePreviewProps } from "@/types/input";
 import type { Components } from "@/types/openapi";
@@ -100,19 +101,20 @@ export default defineComponent({
     const wizardStore = useWizardStore();
     const applicationStore = useApplicationStore();
     return {
-      wizardStore,applicationStore,
+      wizardStore,
+      applicationStore,
     };
   },
-  methods:{
-    setWizard(stage:string) {
-      this.wizardStore.setCurrentStep(stage);
-      this.applicationStore.draftApplication.stage = this.wizardStore.currentStepStage;
-    },
-  },
   computed: {
     educations(): { [id: string]: Components.Schemas.Transcript } {
       return this.wizardStore.wizardData[this.wizardStore.wizardConfig.steps.education.form.inputs.educationList.id];
     },
   },
+  methods: {
+    setWizard(stage: Components.Schemas.PortalStage) {
+      this.wizardStore.setCurrentStep(stage);
+      this.applicationStore.draftApplication.stage = this.wizardStore.currentStepStage;
+    },
+  },
 });
 </script>
diff --git a/...clients.registryportal.client/src/components/inputs/EceWorkExperienceReferencePreview.vue b/...clients.registryportal.client/src/components/inputs/EceWorkExperienceReferencePreview.vue
@@ -6,7 +6,7 @@
           <h3>Work Experience References</h3>
         </v-col>
         <v-col align="end">
-          <v-btn @click="setWizard('WorkReferences')" v-bind="props" icon="mdi-pencil" color="primary" variant="plain" />
+          <v-btn v-bind="props" icon="mdi-pencil" color="primary" variant="plain" @click="setWizard('WorkReferences')" />
         </v-col>
       </v-row>
       <div v-for="(experience, id, index) in references" :key="id">
@@ -47,8 +47,9 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import { useApplicationStore } from "@/store/application";
+
 import PreviewCard from "@/components/PreviewCard.vue";
+import { useApplicationStore } from "@/store/application";
 import { useWizardStore } from "@/store/wizard";
 import type { EcePreviewProps } from "@/types/input";
 import type { Components } from "@/types/openapi";
@@ -69,19 +70,20 @@ export default defineComponent({
     const applicationStore = useApplicationStore();
 
     return {
-      wizardStore,applicationStore,
+      wizardStore,
+      applicationStore,
     };
   },
-  methods:{
-    setWizard(stage:string) {
-      this.wizardStore.setCurrentStep(stage);
-      this.applicationStore.draftApplication.stage = this.wizardStore.currentStepStage;
-    },
-  },
   computed: {
     references(): { [id: string]: Components.Schemas.WorkExperienceReference } {
       return this.wizardStore.wizardData[this.wizardStore.wizardConfig.steps.workReference.form.inputs.referenceList.id];
     },
   },
+  methods: {
+    setWizard(stage: Components.Schemas.PortalStage) {
+      this.wizardStore.setCurrentStep(stage);
+      this.applicationStore.draftApplication.stage = this.wizardStore.currentStepStage;
+    },
+  },
 });
 </script>
diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/store/wizard.ts b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/store/wizard.ts
@@ -1,9 +1,10 @@
 import { defineStore } from "pinia";
+
 import { AddressType } from "@/components/inputs/EceAddresses.vue";
 import type { Components } from "@/types/openapi";
 import type { Step, Wizard } from "@/types/wizard";
-import { useUserStore } from "./user";
 
+import { useUserStore } from "./user";
 export interface WizardData {
   [key: string]: any;
 }
@@ -99,7 +100,7 @@ export const useWizardStore = defineStore("wizard", {
     setWizardData(wizardData: WizardData): void {
       this.wizardData = { ...this.wizardData, ...wizardData };
     },
-    setCurrentStep(stage: string): void {
+    setCurrentStep(stage: Components.Schemas.PortalStage): void {
       const item = Object.values(this.wizardConfig.steps).findIndex((step) => step.stage === stage) + 1;
       this.step = item;
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,6 @@ export default defineComponent({ @@
         },
         totalHours(): number {
           return this.referenceList.reduce((acc, reference) => {
             return acc + (reference.hours as number);
           }, 0);
         },
@@ Expand Down @@