feat(fe:FSADT1-1350): Create client for staff Step 4 - Review

bcgov · Jul 16, 2024 · 2be206c · 2be206c
1 parent 0f06c19
commit 2be206c
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 6 deletions.
diff --git a/frontend/src/helpers/validators/StaffFormValidations.ts b/frontend/src/helpers/validators/StaffFormValidations.ts
@@ -217,7 +217,6 @@ fieldValidations["location.addresses.*.notes"] = [
 ];
 
 // Step 3: Contacts
-
 fieldValidations["location.contacts.*.locationNames.text"] = [
   isNotEmptyArray("You must select at least one location"),
 ];
@@ -249,6 +248,12 @@ fieldValidations["location.contacts.*.secondaryPhoneNumber"] = [...phoneValidati
 
 fieldValidations["location.contacts.*.faxNumber"] = [...phoneValidations];
 
+// Step 4: Review
+fieldValidations["businessInformation.notes"] = [
+  isMaxSizeMsg("notes", 10),
+  isAsciiLineBreak("notes"),
+];
+
 // General information
 
 export const addValidation = (key: string, validation: (value: string) => string): void => {

diff --git a/frontend/src/pages/FormStaffPage.vue b/frontend/src/pages/FormStaffPage.vue
@@ -9,13 +9,13 @@ import { useRouter } from "vue-router";
 import { useEventBus } from "@vueuse/core";
 import { usePost } from "@/composables/useFetch";
 import { useFocus } from "@/composables/useFocus";
+import { isSmallScreen, isTouchScreen } from "@/composables/useScreenSize";
 import {
   BusinessTypeEnum,
   ClientTypeEnum,
   LegalTypeEnum,
   type CodeNameType,
   type ValidationMessageType,
-  type CodeDescrType,
 } from "@/dto/CommonTypesDto";
 import {
   locationName as defaultLocation,
@@ -150,7 +150,35 @@ const progressData = reactive([
     disabled: true,
     valid: false,
     step: 3,
-    fields: [],
+    fields: [
+      "businessInformation.businessType",
+      "businessInformation.businessName",
+      "businessInformation.clientType",
+      "businessInformation.notes",
+      "location.addresses.*.locationName",
+      "location.addresses.*.complementaryAddressOne",
+      "location.addresses.*.complementaryAddressTwo",
+      "location.addresses.*.country.text",
+      "location.addresses.*.province.text",
+      "location.addresses.*.city",
+      "location.addresses.*.streetAddress",
+      'location.addresses.*.postalCode($.location.addresses.*.country.value === "CA")',
+      'location.addresses.*.postalCode($.location.addresses.*.country.value === "US")',
+      'location.addresses.*.postalCode($.location.addresses.*.country.value !== "CA" && $.location.addresses.*.country.value !== "US")',
+      "location.addresses.*.emailAddress",
+      "location.addresses.*.businessPhoneNumber",
+      "location.addresses.*.secondaryPhoneNumber",
+      "location.addresses.*.faxNumber",
+      "location.addresses.*.notes",
+      "location.contacts.*.locationNames.*.text",
+      "location.contacts.*.contactType.text",
+      "location.contacts.*.firstName",
+      "location.contacts.*.lastName",
+      "location.contacts.*.email",
+      "location.contacts.*.phoneNumber",
+      "location.contacts.*.secondaryPhoneNumber",
+      "location.contacts.*.faxNumber",
+    ],
     extraValidations: [],
   },
 ]);
@@ -420,7 +448,7 @@ const submit = () => {
           />
         </div>
       </div>
-
+      
       <div v-if="currentTab == 3" class="form-steps-04">
         <div class="form-steps-section form-steps-section-04">
           <h2 data-scroll="scroll-3" data-focus="focus-3" tabindex="-1">

diff --git a/frontend/src/pages/staffform/ReviewWizardStep.vue b/frontend/src/pages/staffform/ReviewWizardStep.vue
@@ -91,15 +91,18 @@ emit("valid", false);
           {{ clientType.text }}
         </p>
       </div>
-      <div v-if="formData.businessInformation.identificationType" class="grouping-22-item">
+      <div class="grouping-22" 
+          v-if="clientType.value === 'I'">
+      <div class="grouping-22-item">
         <p class="label-01">{{ formData.businessInformation.identificationType.text }}</p>
         <p class="body-compact-01">{{ formData.businessInformation.clientIdentification }}</p>
       </div>
-      <div v-if="formData.businessInformation.birthdate" class="grouping-22-item">
+      <div class="grouping-22-item">
         <p class="label-01">Birthdate</p>
         <p class="body-compact-01">{{ formData.businessInformation.birthdate }}</p>
       </div>
     </div>
+    </div>
     <div class="grouping-06">
       <cds-button kind="tertiary" @click.prevent="goToStep(0)">
         <span>Edit business information</span>