revamped submissioons table and gave required functionality and style…

… to each column, based on PADS-189 comment
bcgov · Jul 16, 2024 · 20a99d5 · 20a99d5
1 parent eebd19d
commit 20a99d5
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 218 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -43,7 +43,7 @@
     "pinia-plugin-persistedstate": "^3.2.1",
     "primeflex": "^3.3.1",
     "primeicons": "^6.0.1",
-    "primevue": "3.52.0",
+    "primevue": "3.53.0",
     "proj4": "^2.11.0",
     "qrcode.vue": "^3.4.1",
     "quill": "^2.0.0",

diff --git a/frontend/src/components/housing/submission/SubmissionForm.vue b/frontend/src/components/housing/submission/SubmissionForm.vue
@@ -36,7 +36,7 @@ import { applicantValidator, assignedToValidator, latitudeValidator, longitudeVa
 import type { Ref } from 'vue';
 import type { IInputEvent } from '@/interfaces';
 import type { Submission, User } from '@/types';
-import { omit, setEmptyStringsToNull } from '@/utils/utils';
+import { concatenateAddress, omit, setEmptyStringsToNull } from '@/utils/utils';
 
 // Interfacefs
 interface SubmissionForm extends Submission {
@@ -218,12 +218,8 @@ const onSubmit = async (values: any) => {
 };
 
 function updateLocationAddress(values: any, setFieldValue?: Function) {
-  const locationAddress = [];
-  if (values.streetAddress?.length) locationAddress.push(values.streetAddress);
-  if (values.locality?.length) locationAddress.push(values.locality);
-  if (values.province?.length) locationAddress.push(values.province);
+  const locationAddressStr = concatenateAddress(values);
 
-  const locationAddressStr = locationAddress.join(', ');
   if (setFieldValue) setFieldValue('locationAddress', locationAddressStr);
 
   return locationAddressStr;