From f74be73064cd497650dce07680ddfc9e040c830e Mon Sep 17 00:00:00 2001
From: Parker Atkins <parker.cattell.atkins@gmail.com>
Date: Wed, 20 Mar 2024 13:49:18 -0700
Subject: [PATCH 01/16] Adjust Wizard template to allow for more customization

---
 .../src/components/Wizard.vue                 | 44 +++++++++++--------
 .../src/store/wizard.ts                       |  4 +-
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/Wizard.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/Wizard.vue
index 5209d568d..77a243c20 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/Wizard.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/Wizard.vue
@@ -1,23 +1,31 @@
 <template>
   <WizardHeader class="mb-6" />
-  <v-stepper v-model="wizardStore.step" min-height="100dvh" flat color="primary" :items="getStepTitles()" :alt-labels="true" :mobile="$vuetify.display.mobile">
-    <template v-for="step in wizard.steps" :key="step.stage" #[step.key]>
-      <v-container>
-        <h3>{{ step.title }}</h3>
-        <h4>{{ step.subtitle }}</h4>
-        <DeclarationStepContent v-if="step.stage == 'Declaration'" class="mt-6" />
-        <v-row>
-          <v-col cols="12">
-            <EceForm
-              :form="step.form"
-              :form-data="wizardStore.wizardData"
-              @updated-form-data="wizardStore.setWizardData"
-              @updated-validation="$emit('updatedValidation', $event)"
-            />
-          </v-col>
-        </v-row>
-      </v-container>
-    </template>
+  <v-stepper v-model="wizardStore.step" min-height="100dvh" color="primary" :alt-labels="true" :mobile="$vuetify.display.mobile">
+    <v-stepper-header>
+      <template v-for="(step, index) in Object.values(wizard.steps)" :key="step.stage">
+        <v-stepper-item :step="wizardStore.step" :value="index + 1" :title="step.title"></v-stepper-item>
+        <v-divider v-if="index !== Object.values(wizard.steps).length - 1" :key="`divider-${index}`" />
+      </template>
+    </v-stepper-header>
+    <v-stepper-window v-model="wizardStore.step">
+      <v-stepper-window-item v-for="(step, index) in Object.values(wizard.steps)" :key="step.stage" :value="index + 1">
+        <v-container>
+          <h3>{{ step.title }}</h3>
+          <h4>{{ step.subtitle }}</h4>
+          <DeclarationStepContent v-if="step.stage == 'Declaration'" class="mt-6" />
+          <v-row>
+            <v-col cols="12">
+              <EceForm
+                :form="step.form"
+                :form-data="wizardStore.wizardData"
+                @updated-form-data="wizardStore.setWizardData"
+                @updated-validation="$emit('updatedValidation', $event)"
+              />
+            </v-col>
+          </v-row>
+        </v-container>
+      </v-stepper-window-item>
+    </v-stepper-window>
     <template #actions>
       <slot name="actions"></slot>
     </template>
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
index c889446f3..1c106dd61 100644
--- 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
@@ -24,7 +24,9 @@ export const useWizardStore = defineStore("wizard", {
   }),
   persist: true,
   getters: {
-    steps: (state) => Object.values(state.wizardConfig.steps),
+    steps(state): Step[] {
+      return Object.values(state.wizardConfig.steps);
+    },
     currentStep(state): Step {
       return this.steps[state.step - 1];
     },

From 337e5736a07cf0e302147b2984db52c24bec8dc2 Mon Sep 17 00:00:00 2001
From: Parker Atkins <parker.cattell.atkins@gmail.com>
Date: Wed, 20 Mar 2024 22:26:53 -0700
Subject: [PATCH 02/16] Styling for preview form on laptop size screens

---
 .../src/config/preview-form.ts                         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/config/preview-form.ts b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/config/preview-form.ts
index 44d576cf4..89fd238a4 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/config/preview-form.ts
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/config/preview-form.ts
@@ -15,7 +15,7 @@ const previewForm: Form = {
       props: {},
       cols: {
         md: 8,
-        lg: 6,
+        lg: 8,
         xl: 6,
       },
     },
@@ -25,7 +25,7 @@ const previewForm: Form = {
       props: {},
       cols: {
         md: 8,
-        lg: 6,
+        lg: 8,
         xl: 6,
       },
     },
@@ -35,7 +35,7 @@ const previewForm: Form = {
       props: {},
       cols: {
         md: 8,
-        lg: 6,
+        lg: 8,
         xl: 6,
       },
     },
@@ -45,7 +45,7 @@ const previewForm: Form = {
       props: {},
       cols: {
         md: 8,
-        lg: 6,
+        lg: 8,
         xl: 6,
       },
     },
@@ -55,7 +55,7 @@ const previewForm: Form = {
       props: {},
       cols: {
         md: 8,
-        lg: 6,
+        lg: 8,
         xl: 6,
       },
     },

From e0aeeee4e422552a5b2cfcf50de832242b6d581f Mon Sep 17 00:00:00 2001
From: Parker Atkins <parker.cattell.atkins@gmail.com>
Date: Wed, 20 Mar 2024 22:28:01 -0700
Subject: [PATCH 03/16] Only validate steps behind current step

---
 .../src/components/Wizard.vue                          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/Wizard.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/Wizard.vue
index 77a243c20..e2165f361 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/Wizard.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/Wizard.vue
@@ -1,9 +1,15 @@
 <template>
   <WizardHeader class="mb-6" />
-  <v-stepper v-model="wizardStore.step" min-height="100dvh" color="primary" :alt-labels="true" :mobile="$vuetify.display.mobile">
+  <v-stepper v-model="wizardStore.step" min-height="100dvh" :alt-labels="true" :mobile="$vuetify.display.mobile">
     <v-stepper-header>
       <template v-for="(step, index) in Object.values(wizard.steps)" :key="step.stage">
-        <v-stepper-item :step="wizardStore.step" :value="index + 1" :title="step.title"></v-stepper-item>
+        <v-stepper-item
+          color="primary"
+          :step="wizardStore.step"
+          :value="index + 1"
+          :title="step.title"
+          :rules="wizardStore.step <= index + 1 ? [] : [() => wizardStore.validationState[step.stage]]"
+        ></v-stepper-item>
         <v-divider v-if="index !== Object.values(wizard.steps).length - 1" :key="`divider-${index}`" />
       </template>
     </v-stepper-header>

From 57861ee9778383d02fe165755749750700cb710d Mon Sep 17 00:00:00 2001
From: Parker Atkins <parker.cattell.atkins@gmail.com>
Date: Wed, 20 Mar 2024 22:28:35 -0700
Subject: [PATCH 04/16] Add validation lookup to wizard store

---
 .../src/store/wizard.ts                       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

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
index 1c106dd61..fb0a66565 100644
--- 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
@@ -16,6 +16,10 @@ export interface WizardState {
   wizardData: WizardData;
 }
 
+export type PortalStageValidation = {
+  [key in Components.Schemas.PortalStage]: boolean;
+};
+
 export const useWizardStore = defineStore("wizard", {
   state: (): WizardState => ({
     step: 1,
@@ -36,6 +40,27 @@ export const useWizardStore = defineStore("wizard", {
     currentStepStage(state): Components.Schemas.PortalStage {
       return this.steps[state.step - 1].stage;
     },
+    validationState(state): PortalStageValidation {
+      let totalHours = 0;
+      const referenceListPath = state.wizardData[this.wizardConfig.steps.workReference.form.inputs.referenceList.id];
+      if (Array.isArray(referenceListPath) && referenceListPath.length > 0) {
+        totalHours = referenceListPath.reduce((sum, currentReference) => {
+          return sum + (currentReference.hours || 0);
+        }, 0);
+      }
+
+      return {
+        CertificationType: (state.wizardData[this.wizardConfig.steps.certificationType.form.inputs.certificationSelection.id].length || []) > 0,
+        Declaration:
+          state.wizardData[this.wizardConfig.steps.declaration.form.inputs.signedDate.id] !== null &&
+          state.wizardData[this.wizardConfig.steps.declaration.form.inputs.consentCheckbox.id] === true,
+        ContactInformation: true,
+        Education: Object.values(state.wizardData[this.wizardConfig.steps.education.form.inputs.educationList.id]).length > 0,
+        CharacterReferences: (state.wizardData[this.wizardConfig.steps.characterReferences.form.inputs.characterReferences.id].length || []) > 0,
+        WorkReferences: Object.values(state.wizardData[this.wizardConfig.steps.workReference.form.inputs.referenceList.id]).length > 0 && totalHours >= 500,
+        Review: true,
+      };
+    },
   },
   actions: {
     initializeWizard(wizard: Wizard, draftApplication: Components.Schemas.DraftApplication): void {
@@ -106,11 +131,13 @@ export const useWizardStore = defineStore("wizard", {
     incrementStep(): void {
       if (this.step < Object.keys(this.wizardConfig.steps).length) {
         this.step += 1;
+        window.scrollTo(0, 0);
       }
     },
     decrementStep(): void {
       if (this.step > 1) {
         this.step -= 1;
+        window.scrollTo(0, 0);
       }
     },
   },

From 445180ec02976dcc257db4913527267acc37376d Mon Sep 17 00:00:00 2001
From: Parker Atkins <parker.cattell.atkins@gmail.com>
Date: Wed, 20 Mar 2024 22:28:42 -0700
Subject: [PATCH 05/16] Remove stepper styling

---
 .../src/styles/main.scss                       |  1 -
 .../src/styles/v-stepper.scss                  | 18 ------------------
 2 files changed, 19 deletions(-)
 delete mode 100644 src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/styles/v-stepper.scss

diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/styles/main.scss b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/styles/main.scss
index 6f549384e..dce04f72d 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/styles/main.scss
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/styles/main.scss
@@ -1,7 +1,6 @@
 @import "./typography.scss";
 @import "./v-btn.scss";
 @import "./v-navigation-drawer.scss";
-@import "./v-stepper.scss";
 @import "./v-expansion-panel.scss";
 @import "./v-radio.scss";
 @import "./v-checkbox.scss";
diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/styles/v-stepper.scss b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/styles/v-stepper.scss
deleted file mode 100644
index d12d6c69a..000000000
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/styles/v-stepper.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-@import "./_colors.scss";
-
-.v-stepper {
-  .v-stepper-item {
-    .v-avatar {
-      background: #{$primary};
-    }
-  }
-
-  .v-stepper-actions {
-    .v-btn {
-      background-color: #{$primary};
-      &__content {
-        color: white;
-      }
-    }
-  }
-}

From 1c69fada4882c16f843f8bd3399803ce11326655 Mon Sep 17 00:00:00 2001
From: soletsdev <soletsdev@github>
Date: Tue, 26 Mar 2024 08:36:23 -0700
Subject: [PATCH 06/16] work experience error handling updated messages

---
 .../components/inputs/EceWorkExperienceReferences.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceWorkExperienceReferences.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceWorkExperienceReferences.vue
index 792518c7b..be924b188 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceWorkExperienceReferences.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceWorkExperienceReferences.vue
@@ -6,7 +6,7 @@
       <v-form ref="addWorkExperienceReferenceForm" validate-on="input" class="mt-6">
         <v-text-field
           v-model="lastName"
-          :rules="[Rules.required()]"
+          :rules="[Rules.required('Enter your reference\'s last name')]"
           label="Reference Last Name"
           variant="outlined"
           color="primary"
@@ -14,7 +14,7 @@
         ></v-text-field>
         <v-text-field
           v-model="firstName"
-          :rules="[Rules.required()]"
+          :rules="[Rules.required('Enter your reference\'s first name')]"
           label="Reference First Name"
           variant="outlined"
           color="primary"
@@ -23,7 +23,7 @@
         ></v-text-field>
         <v-text-field
           v-model="email"
-          :rules="[Rules.required(), Rules.email()]"
+          :rules="[Rules.required(), Rules.email('Enter your reference\'s email in the format \'name@email.com\'')]"
           label="Reference Email"
           variant="outlined"
           color="primary"
@@ -32,16 +32,17 @@
         ></v-text-field>
         <v-text-field
           v-model="phoneNumber"
-          :rules="[Rules.phoneNumber()]"
+          :rules="[Rules.phoneNumber('Enter your reference\'s 10-digit phone number')]"
           label="Reference Phone Number (Optional)"
           variant="outlined"
           color="primary"
           maxlength="20"
           class="my-8"
+          @keypress="isNumber($event)"
         ></v-text-field>
         <v-text-field
           v-model.number="hours"
-          :rules="[Rules.required()]"
+          :rules="[Rules.required('Enter your work experience hours')]"
           type="number"
           label="Work Experience Hours"
           variant="outlined"

From f71f47b6cdb827128dc39fdc3fac00284e2dc8fa Mon Sep 17 00:00:00 2001
From: Farzad <farzad.alankesh@quartech.com>
Date: Tue, 26 Mar 2024 09:42:17 -0700
Subject: [PATCH 07/16] ECER-1041: Error messages changed for character
 reference

---
 .../components/inputs/EceCharacterReference.vue  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReference.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReference.vue
index 2dab4210f..8e353da96 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReference.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReference.vue
@@ -16,8 +16,8 @@
     <v-col cols="12" md="8" lg="6" xl="4">
       <v-text-field
         v-model="firstName"
-        :rules="[Rules.required()]"
-        label="First Name"
+        :rules="[Rules.required('Enter your reference\'s first name')]"
+        label="Reference First Name"
         variant="outlined"
         color="primary"
         maxlength="100"
@@ -29,8 +29,8 @@
     <v-col cols="12" md="8" lg="6" xl="4">
       <v-text-field
         v-model="lastName"
-        :rules="[Rules.required()]"
-        label="Last Name"
+        :rules="[Rules.required('Enter your reference\'s last name')]"
+        label="Reference Last Name"
         variant="outlined"
         color="primary"
         maxlength="100"
@@ -42,8 +42,8 @@
     <v-col cols="12" md="8" lg="6" xl="4">
       <v-text-field
         v-model="phoneNumber"
-        :rules="[Rules.phoneNumber()]"
-        label="Phone Number (Optional)"
+        :rules="[Rules.phoneNumber('Enter your reference\'s 10-digit phone number')]"
+        label="Reference Phone Number (Optional)"
         variant="outlined"
         color="primary"
         type="number"
@@ -56,8 +56,8 @@
     <v-col cols="12" md="8" lg="6" xl="4">
       <v-text-field
         v-model="emailAddress"
-        :rules="[Rules.required(), Rules.email()]"
-        label="Email"
+        :rules="[Rules.required(), Rules.email('Enter your reference\'s email in the format \'name@email.com\'')]"
+        label="Reference Email"
         variant="outlined"
         color="primary"
         maxlength="100"

From 2ee848c8164c563aa3b5edfe59d17388713e76c0 Mon Sep 17 00:00:00 2001
From: Farzad <farzad.alankesh@quartech.com>
Date: Tue, 26 Mar 2024 09:49:50 -0700
Subject: [PATCH 08/16] ECER-1019: Education custom error messages

---
 .../src/components/inputs/EceEducation.vue       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceEducation.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceEducation.vue
index e30655ef4..e365c9d9e 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceEducation.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceEducation.vue
@@ -6,7 +6,7 @@
       <v-form ref="addEducationForm" validate-on="input" class="mt-6">
         <v-text-field
           v-model="school"
-          :rules="[Rules.required()]"
+          :rules="[Rules.required('Enter the full name of your educational institution')]"
           label="Full Name of Educational Institution"
           variant="outlined"
           color="primary"
@@ -14,8 +14,8 @@
         ></v-text-field>
         <v-text-field
           v-model="program"
-          :rules="[Rules.required()]"
-          label="Name of Program (as it appears on official transcript) "
+          :rules="[Rules.required('Enter the name of your program/course')]"
+          label="Name of Program/Course"
           variant="outlined"
           color="primary"
           maxlength="100"
@@ -24,7 +24,7 @@
         <v-text-field v-model="campusLocation" label="Campus Location (Optional)" variant="outlined" color="primary" maxlength="50" class="my-8"></v-text-field>
         <v-text-field
           v-model="studentName"
-          :rules="[Rules.required()]"
+          :rules="[Rules.required('Enter your student name as it appears on your official transcript')]"
           label="Student Name (as it appears on your official transcript)"
           variant="outlined"
           color="primary"
@@ -33,8 +33,8 @@
         ></v-text-field>
         <v-text-field
           v-model="studentNumber"
-          :rules="[Rules.required()]"
-          label="Student Number/ ID (as it appears on your official transcript)"
+          :rules="[Rules.required('Enter your student ID as it appears on your official transcript')]"
+          label="Student ID"
           variant="outlined"
           color="primary"
           maxlength="100"
@@ -50,7 +50,7 @@
         ></v-text-field>
         <v-text-field
           v-model="startYear"
-          :rules="[Rules.required()]"
+          :rules="[Rules.required('Enter the start date of your program')]"
           label="Start Date of Program"
           type="date"
           variant="outlined"
@@ -60,7 +60,7 @@
         ></v-text-field>
         <v-text-field
           v-model="endYear"
-          :rules="[Rules.required()]"
+          :rules="[Rules.required('Enter the end date of your program')]"
           label="End Date of Program"
           type="date"
           variant="outlined"

From 945c141dc651cf255c568d34c8a2ae7395e89de5 Mon Sep 17 00:00:00 2001
From: Farzad <farzad.alankesh@quartech.com>
Date: Tue, 26 Mar 2024 09:54:35 -0700
Subject: [PATCH 09/16] ECER-1041: Character reference email format error
 edited

---
 .../src/components/inputs/EceCharacterReference.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReference.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReference.vue
index 8e353da96..2248888ed 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReference.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReference.vue
@@ -56,7 +56,7 @@
     <v-col cols="12" md="8" lg="6" xl="4">
       <v-text-field
         v-model="emailAddress"
-        :rules="[Rules.required(), Rules.email('Enter your reference\'s email in the format \'name@email.com\'')]"
+        :rules="[Rules.required('Enter your reference\'s email in the format \'name@email.com\''), Rules.email('Enter your reference\'s email in the format \'name@email.com\'')]"
         label="Reference Email"
         variant="outlined"
         color="primary"

From 09dd02044741bfe6b340d2e5d85c6580ac631e1d Mon Sep 17 00:00:00 2001
From: soletsdev <soletsdev@github>
Date: Tue, 26 Mar 2024 10:25:08 -0700
Subject: [PATCH 10/16] adding additional validation to the repository level
 for submit + cancel applications

---
 .../Applications/ApplicationRepository.cs         |  4 ++--
 .../Applications/ApplicationRepositoryTests.cs    | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/ECER.Resources.Documents/Applications/ApplicationRepository.cs b/src/ECER.Resources.Documents/Applications/ApplicationRepository.cs
index 5d91922fb..055681161 100644
--- a/src/ECER.Resources.Documents/Applications/ApplicationRepository.cs
+++ b/src/ECER.Resources.Documents/Applications/ApplicationRepository.cs
@@ -79,7 +79,7 @@ public async Task<string> SaveDraft(Application application, CancellationToken c
   public async Task<string> Submit(string applicationId, CancellationToken cancellationToken)
   {
     await Task.CompletedTask;
-    var application = context.ecer_ApplicationSet.FirstOrDefault(d => d.ecer_ApplicationId == Guid.Parse(applicationId));
+    var application = context.ecer_ApplicationSet.FirstOrDefault(d => d.ecer_ApplicationId == Guid.Parse(applicationId) && d.StatusCode == ecer_Application_StatusCode.Draft);
     if (application == null) throw new InvalidOperationException($"Application '{applicationId}' not found");
 
     application.StatusCode = ecer_Application_StatusCode.Submitted;
@@ -198,7 +198,7 @@ public async Task<string> Cancel(string applicationId, CancellationToken cancell
   {
     await Task.CompletedTask;
     var application = context.ecer_ApplicationSet.FirstOrDefault(
-      d => d.ecer_ApplicationId == Guid.Parse(applicationId)
+      d => d.ecer_ApplicationId == Guid.Parse(applicationId) && d.StatusCode == ecer_Application_StatusCode.Draft
       );
     if (application == null) throw new InvalidOperationException($"Application '{applicationId}' not found");
     application.StatusCode = ecer_Application_StatusCode.Cancelled;
diff --git a/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs b/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs
index c2830cd5a..dc310c508 100644
--- a/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs
+++ b/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs
@@ -349,7 +349,18 @@ public async Task SubmitApplication_QueryShouldReturnStatusSubmitted()
   }
 
   [Fact]
-  public async Task CancelApplication_QueryShouldnotReturnResults()
+  public async Task SubmitApplicationNotInDraft_ShouldThrowInvalidOperationException()
+  {
+    var applicantId = Fixture.AuthenticatedBcscUserId;
+    var application = new Application(null, applicantId, new[] { CertificationType.OneYear }) { };
+    application.Status = ApplicationStatus.Submitted;
+    var savedApplicationId = await repository.SaveDraft(application, CancellationToken.None);
+
+    await Assert.ThrowsAsync<InvalidOperationException>(async () => await repository.Submit(savedApplicationId, CancellationToken.None));
+  }
+
+  [Fact]
+  public async Task CancelApplication_QueryShouldnotReturnResults_ThenTryToSubmitAgain_ShouldThrowInvalidOperationException()
   {
     var applicantId = Fixture.AuthenticatedBcscUserId2;
     var application = new Application(null, applicantId, new[] { CertificationType.OneYear });
@@ -358,6 +369,8 @@ public async Task CancelApplication_QueryShouldnotReturnResults()
     await repository.Cancel(savedApplicationId, CancellationToken.None);
 
     (await repository.Query(new ApplicationQuery { ById = savedApplicationId })).ShouldBeEmpty();
+
+    await Assert.ThrowsAsync<InvalidOperationException>(async () => await repository.Cancel(savedApplicationId, CancellationToken.None));
   }
 
   private CharacterReference CreateCharacterReference()

From ecd6b729967175c13198bbef7ce293d7a87bac51 Mon Sep 17 00:00:00 2001
From: soletsdev <soletsdev@github>
Date: Tue, 26 Mar 2024 10:29:39 -0700
Subject: [PATCH 11/16] small typo

---
 .../Resources/Applications/ApplicationRepositoryTests.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs b/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs
index dc310c508..11d97d6b0 100644
--- a/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs
+++ b/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs
@@ -360,7 +360,7 @@ public async Task SubmitApplicationNotInDraft_ShouldThrowInvalidOperationExcepti
   }
 
   [Fact]
-  public async Task CancelApplication_QueryShouldnotReturnResults_ThenTryToSubmitAgain_ShouldThrowInvalidOperationException()
+  public async Task CancelApplication_QueryShouldnotReturnResults_ThenTryToCancelAgain_ShouldThrowInvalidOperationException()
   {
     var applicantId = Fixture.AuthenticatedBcscUserId2;
     var application = new Application(null, applicantId, new[] { CertificationType.OneYear });

From ace084dac94dea6d373bc1d9054133dedf4d84cf Mon Sep 17 00:00:00 2001
From: Parker Atkins <parker.cattell.atkins@gmail.com>
Date: Tue, 26 Mar 2024 13:28:03 -0700
Subject: [PATCH 12/16] Update PreviewCard to display invalid state

---
 .../src/components/PreviewCard.vue            | 56 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/PreviewCard.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/PreviewCard.vue
index dbca46431..d56acd079 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/PreviewCard.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/PreviewCard.vue
@@ -1,13 +1,65 @@
 <template>
-  <v-card variant="outlined" color="grey-lightest" rounded="lg">
-    <slot></slot>
+  <v-card variant="outlined" :color="cardColor" rounded="lg">
+    <div class="float-right">
+      <v-btn icon="mdi-pencil" :color="isValid ? 'primary' : 'error'" variant="plain" @click="setWizard(portalStage)" />
+    </div>
+    <v-container>
+      <v-row align="center">
+        <v-col>
+          <h3 :class="isValid ? 'text-black' : 'text-error'">{{ title }}</h3>
+          <p v-if="!isValid" class="small text-error">
+            <v-icon icon="mdi-alert-circle" color="error" class="mr-2"></v-icon>
+            You must enter all required information in a valid format before submitting your application
+          </p>
+        </v-col>
+      </v-row>
+      <slot name="content"></slot>
+    </v-container>
   </v-card>
 </template>
 
 <script lang="ts">
+import type { PropType } from "vue";
 import { defineComponent } from "vue";
 
+import { useApplicationStore } from "@/store/application";
+import { useWizardStore } from "@/store/wizard";
+import type { Components } from "@/types/openapi";
+
 export default defineComponent({
   name: "PreviewCard",
+  props: {
+    isValid: {
+      type: Boolean,
+      default: true,
+    },
+    title: {
+      type: String,
+      required: true,
+    },
+    portalStage: {
+      type: String as PropType<Components.Schemas.PortalStage>,
+      required: true,
+    },
+  },
+  setup: () => {
+    const wizardStore = useWizardStore();
+    const applicationStore = useApplicationStore();
+    return {
+      wizardStore,
+      applicationStore,
+    };
+  },
+  computed: {
+    cardColor() {
+      return this.isValid ? "grey-lightest" : "error";
+    },
+  },
+  methods: {
+    setWizard(stage: Components.Schemas.PortalStage) {
+      this.wizardStore.setCurrentStep(stage);
+      this.applicationStore.draftApplication.stage = this.wizardStore.currentStepStage;
+    },
+  },
 });
 </script>

From 489c4c4aea840d7aa0c6167abcd4386f6ccba7ae Mon Sep 17 00:00:00 2001
From: Parker Atkins <parker.cattell.atkins@gmail.com>
Date: Tue, 26 Mar 2024 13:35:09 -0700
Subject: [PATCH 13/16] Add tooltip to edit icon button

---
 .../src/components/PreviewCard.vue                     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/PreviewCard.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/PreviewCard.vue
index d56acd079..c2cc5ce8d 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/PreviewCard.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/PreviewCard.vue
@@ -1,7 +1,12 @@
 <template>
   <v-card variant="outlined" :color="cardColor" rounded="lg">
     <div class="float-right">
-      <v-btn icon="mdi-pencil" :color="isValid ? 'primary' : 'error'" variant="plain" @click="setWizard(portalStage)" />
+      <v-tooltip v-model="show" location="top">
+        <template #activator="{ props }">
+          <v-btn icon="mdi-pencil" v-bind="props" :color="isValid ? 'primary' : 'error'" variant="plain" @click="setWizard(portalStage)" />
+        </template>
+        <span>Edit {{ title }}</span>
+      </v-tooltip>
     </div>
     <v-container>
       <v-row align="center">
@@ -50,6 +55,9 @@ export default defineComponent({
       applicationStore,
     };
   },
+  data: () => ({
+    show: false,
+  }),
   computed: {
     cardColor() {
       return this.isValid ? "grey-lightest" : "error";

From 045345758797e8eeadc2c7a8d5d10293f097ee1f Mon Sep 17 00:00:00 2001
From: Parker Atkins <parker.cattell.atkins@gmail.com>
Date: Tue, 26 Mar 2024 14:25:06 -0700
Subject: [PATCH 14/16] Fix Work Experience Reference validation

---
 .../src/store/wizard.ts                                   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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
index 376ac9826..37c5ad836 100644
--- 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
@@ -41,9 +41,11 @@ export const useWizardStore = defineStore("wizard", {
     },
     validationState(state): PortalStageValidation {
       let totalHours = 0;
-      const referenceListPath = state.wizardData[this.wizardConfig.steps.workReference.form.inputs.referenceList.id];
-      if (Array.isArray(referenceListPath) && referenceListPath.length > 0) {
-        totalHours = referenceListPath.reduce((sum, currentReference) => {
+      const references: Components.Schemas.WorkExperienceReference[] = Object.values(
+        state.wizardData[this.wizardConfig.steps.workReference.form.inputs.referenceList.id],
+      );
+      if (references.length > 0) {
+        totalHours = references.reduce((sum, currentReference) => {
           return sum + (currentReference.hours || 0);
         }, 0);
       }

From d0231714f58553939b1e4baf1b56788a4a899bb3 Mon Sep 17 00:00:00 2001
From: Parker Atkins <parker.cattell.atkins@gmail.com>
Date: Tue, 26 Mar 2024 14:29:39 -0700
Subject: [PATCH 15/16] Adjust preview components for updated PreviewCard

---
 .../inputs/EceCertificationTypePreview.vue    | 24 +++----------------
 .../inputs/EceCharacterReferencePreview.vue   | 23 +++---------------
 .../inputs/EceContactInformationPreview.vue   | 24 +++----------------
 .../components/inputs/EceEducationPreview.vue | 23 +++---------------
 .../EceWorkExperienceReferencePreview.vue     | 23 +++---------------
 5 files changed, 15 insertions(+), 102 deletions(-)

diff --git a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCertificationTypePreview.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCertificationTypePreview.vue
index fbeaedd60..6f406e81a 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCertificationTypePreview.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCertificationTypePreview.vue
@@ -1,14 +1,6 @@
 <template>
-  <PreviewCard>
-    <v-container>
-      <v-row align="center">
-        <v-col>
-          <h3 class="font-black">Certification Selection</h3>
-        </v-col>
-        <v-col align="end">
-          <v-btn v-bind="props" icon="mdi-pencil" color="primary" variant="plain" @click="setWizard('CertificationType')" />
-        </v-col>
-      </v-row>
+  <PreviewCard :is-valid="wizardStore.validationState.CertificationType" title="Certification Selection" portal-stage="CertificationType">
+    <template #content>
       <v-row>
         <v-col cols="4">
           <p class="small">Certification Type</p>
@@ -17,7 +9,7 @@
           <p class="small font-weight-bold">{{ certificationType }}</p>
         </v-col>
       </v-row>
-    </v-container>
+    </template>
   </PreviewCard>
 </template>
 
@@ -25,10 +17,8 @@
 import { defineComponent } from "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: "EceCertificationTypePreview",
   components: {
@@ -42,10 +32,8 @@ export default defineComponent({
   },
   setup: () => {
     const wizardStore = useWizardStore();
-    const applicationStore = useApplicationStore();
     return {
       wizardStore,
-      applicationStore,
     };
   },
   computed: {
@@ -70,11 +58,5 @@ 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/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReferencePreview.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReferencePreview.vue
index 01345a69e..7b0f0c930 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReferencePreview.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceCharacterReferencePreview.vue
@@ -1,14 +1,6 @@
 <template>
-  <PreviewCard>
-    <v-container>
-      <v-row align="center">
-        <v-col>
-          <h3 class="font-black">Character Reference</h3>
-        </v-col>
-        <v-col align="end">
-          <v-btn v-bind="props" icon="mdi-pencil" color="primary" variant="plain" @click="setWizard('CharacterReferences')" />
-        </v-col>
-      </v-row>
+  <PreviewCard :is-valid="wizardStore.validationState.CharacterReferences" title="Character Reference" portal-stage="CharacterReferences">
+    <template #content>
       <v-row>
         <v-col cols="4">
           <p class="small">Reference Last Name</p>
@@ -41,7 +33,7 @@
           <p class="small font-weight-bold">{{ characterReference.phoneNumber }}</p>
         </v-col>
       </v-row>
-    </v-container>
+    </template>
   </PreviewCard>
 </template>
 
@@ -49,7 +41,6 @@
 import { defineComponent } from "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";
@@ -67,10 +58,8 @@ export default defineComponent({
   },
   setup: () => {
     const wizardStore = useWizardStore();
-    const applicationStore = useApplicationStore();
     return {
       wizardStore,
-      applicationStore,
     };
   },
   computed: {
@@ -84,11 +73,5 @@ export default defineComponent({
       };
     },
   },
-  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/components/inputs/EceContactInformationPreview.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceContactInformationPreview.vue
index a1cc0cf43..07df3e176 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceContactInformationPreview.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceContactInformationPreview.vue
@@ -1,14 +1,6 @@
 <template>
-  <PreviewCard>
-    <v-container>
-      <v-row align="center">
-        <v-col>
-          <h3 class="font-black">Contact Information</h3>
-        </v-col>
-        <v-col align="end">
-          <v-btn v-bind="props" icon="mdi-pencil" color="primary" variant="plain" @click="setWizard('ContactInformation')" />
-        </v-col>
-      </v-row>
+  <PreviewCard :is-valid="wizardStore.validationState.ContactInformation" title="Contact Information" portal-stage="ContactInformation">
+    <template #content>
       <v-row>
         <v-col cols="4">
           <p class="small">Legal Last Name</p>
@@ -97,7 +89,7 @@
           <p class="small font-weight-bold">{{ alternatePhoneNumber }}</p>
         </v-col>
       </v-row>
-    </v-container>
+    </template>
   </PreviewCard>
 </template>
 
@@ -106,10 +98,8 @@ import { defineComponent } from "vue";
 
 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: {
@@ -123,10 +113,8 @@ export default defineComponent({
   },
   setup: () => {
     const wizardStore = useWizardStore();
-    const applicationStore = useApplicationStore();
     return {
       wizardStore,
-      applicationStore,
     };
   },
   computed: {
@@ -166,11 +154,5 @@ 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/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceEducationPreview.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceEducationPreview.vue
index 2623ce384..8de4f79c1 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceEducationPreview.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceEducationPreview.vue
@@ -1,14 +1,6 @@
 <template>
-  <PreviewCard>
-    <v-container>
-      <v-row align="center">
-        <v-col>
-          <h3>Education</h3>
-        </v-col>
-        <v-col align="end">
-          <v-btn v-bind="props" icon="mdi-pencil" color="primary" variant="plain" @click="setWizard('Education')" />
-        </v-col>
-      </v-row>
+  <PreviewCard :is-valid="wizardStore.validationState.Education" title="Education" portal-stage="Education">
+    <template #content>
       <div v-for="(education, id, index) in educations" :key="id">
         <v-divider v-if="index !== 0" :thickness="2" color="grey-lightest" class="border-opacity-100 my-6" />
         <v-row>
@@ -73,7 +65,7 @@
           </v-col>
         </v-row>
       </div>
-    </v-container>
+    </template>
   </PreviewCard>
 </template>
 
@@ -81,7 +73,6 @@
 import { defineComponent } from "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";
@@ -99,10 +90,8 @@ export default defineComponent({
   },
   setup: () => {
     const wizardStore = useWizardStore();
-    const applicationStore = useApplicationStore();
     return {
       wizardStore,
-      applicationStore,
     };
   },
   computed: {
@@ -110,11 +99,5 @@ export default defineComponent({
       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/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceWorkExperienceReferencePreview.vue b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceWorkExperienceReferencePreview.vue
index 2926211e4..d940548d9 100644
--- a/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceWorkExperienceReferencePreview.vue
+++ b/src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceWorkExperienceReferencePreview.vue
@@ -1,14 +1,6 @@
 <template>
-  <PreviewCard>
-    <v-container>
-      <v-row align="center">
-        <v-col>
-          <h3>Work Experience References</h3>
-        </v-col>
-        <v-col align="end">
-          <v-btn v-bind="props" icon="mdi-pencil" color="primary" variant="plain" @click="setWizard('WorkReferences')" />
-        </v-col>
-      </v-row>
+  <PreviewCard :is-valid="wizardStore.validationState.WorkReferences" title="Work Experience References" portal-stage="WorkReferences">
+    <template #content>
       <div v-for="(experience, id, index) in references" :key="id">
         <v-divider v-if="index !== 0" :thickness="2" color="grey-lightest" class="border-opacity-100 my-6" />
         <v-row>
@@ -41,7 +33,7 @@
           </v-col>
         </v-row>
       </div>
-    </v-container>
+    </template>
   </PreviewCard>
 </template>
 
@@ -49,7 +41,6 @@
 import { defineComponent } from "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";
@@ -67,11 +58,9 @@ export default defineComponent({
   },
   setup: () => {
     const wizardStore = useWizardStore();
-    const applicationStore = useApplicationStore();
 
     return {
       wizardStore,
-      applicationStore,
     };
   },
   computed: {
@@ -79,11 +68,5 @@ export default defineComponent({
       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>

From 06d408b1e992b9858c4a2927599e69d74fdfd731 Mon Sep 17 00:00:00 2001
From: Parker Atkins <parker.cattell.atkins@gmail.com>
Date: Tue, 26 Mar 2024 16:00:02 -0700
Subject: [PATCH 16/16] Fix Character Reference test data

---
 src/ECER.Tests/Integration/RegistryApi/ApplicationTests.cs      | 2 +-
 .../Resources/Applications/ApplicationRepositoryTests.cs        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ECER.Tests/Integration/RegistryApi/ApplicationTests.cs b/src/ECER.Tests/Integration/RegistryApi/ApplicationTests.cs
index b56e792ab..88c33db24 100644
--- a/src/ECER.Tests/Integration/RegistryApi/ApplicationTests.cs
+++ b/src/ECER.Tests/Integration/RegistryApi/ApplicationTests.cs
@@ -200,7 +200,7 @@ private CharacterReference CreateCharacterReference()
     var faker = new Faker("en_CA");
 
     return new CharacterReference(
-      faker.Name.FirstName(), faker.Name.LastName(), faker.Internet.Email(), faker.Phone.PhoneNumber()
+      faker.Name.FirstName(), faker.Name.LastName(), faker.Phone.PhoneNumber(), faker.Internet.Email()
     );
   }
 
diff --git a/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs b/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs
index c2830cd5a..1f4dd379b 100644
--- a/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs
+++ b/src/ECER.Tests/Integration/Resources/Applications/ApplicationRepositoryTests.cs
@@ -365,7 +365,7 @@ private CharacterReference CreateCharacterReference()
     var faker = new Faker("en_CA");
 
     return new CharacterReference(
-      faker.Name.FirstName(), faker.Name.LastName(), faker.Internet.Email(), faker.Phone.PhoneNumber()
+      faker.Name.FirstName(), faker.Name.LastName(), faker.Phone.PhoneNumber(), faker.Internet.Email()
     );
   }