Fixed applied permits verified date issues

bcgov · Dec 4, 2024 · 1c0ed84 · 1c0ed84
1 parent cc9b501
commit 1c0ed84
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/frontend/src/components/housing/submission/SubmissionIntakeForm.vue b/frontend/src/components/housing/submission/SubmissionIntakeForm.vue
@@ -64,7 +64,7 @@ import type { Ref } from 'vue';
 import type { AutoCompleteCompleteEvent } from 'primevue/autocomplete';
 import type { DropdownChangeEvent } from 'primevue/dropdown';
 import type { IInputEvent } from '@/interfaces';
-import type { Document, Permit, SubmissionIntake } from '@/types';
+import type { Document, IntakeAppliedPermit, Permit, SubmissionIntake } from '@/types';
 import type { GenericObject } from 'vee-validate';
 
 // Types
@@ -462,7 +462,15 @@ onBeforeMount(async () => {
 
     if (draftId) {
       response = (await submissionService.getDraft(draftId)).data;
-      initialFormValues.value = { ...response.data, activityId: response.activityId };
+
+      initialFormValues.value = {
+        ...response.data,
+        activityId: response.activityId,
+        appliedPermits: response.data.appliedPermits.map((x: IntakeAppliedPermit) => ({
+          ...x,
+          statusLastVerified: x.statusLastVerified ? new Date(x.statusLastVerified) : undefined
+        }))
+      };
 
       if (response.activityId) {
         documents = (await documentService.listDocuments(response.activityId)).data;
@@ -1549,6 +1557,7 @@ onBeforeMount(async () => {
                                     :name="`appliedPermits[${idx}].statusLastVerified`"
                                     :disabled="!editable"
                                     placeholder="Status last verified"
+                                    :max-date="new Date()"
                                   />
                                   <div class="flex align-items-center ml-2 mb-3">
                                     <Button

diff --git a/frontend/src/types/IntakeAppliedPermit.ts b/frontend/src/types/IntakeAppliedPermit.ts
@@ -0,0 +1,7 @@
+import type { IStamps } from '@/interfaces';
+
+export type IntakeAppliedPermit = {
+  permitTypeId?: number;
+  statusLastVerified?: string;
+  trackingId?: string;
+} & Partial<IStamps>;
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
@@ -10,6 +10,7 @@ export type { Email } from './Email';
 export type { Enquiry } from './Enquiry';
 export type { Group } from './Group';
 export type { IdentityProvider } from './IdentityProvider';
+export type { IntakeAppliedPermit } from './IntakeAppliedPermit';
 export type { IDIRAttribute } from './IDIRAttribute';
 export type { ListPermitsOptions } from './ListPermitsOptions';
 export type { Note } from './Note';

diff --git a/frontend/src/views/permit/PermitStatusView.vue b/frontend/src/views/permit/PermitStatusView.vue
@@ -266,12 +266,6 @@ onBeforeMount(async () => {
         icon="fa-circle-question"
         @click="descriptionModalVisible = true"
       />
-      <!-- <div :onclick="(descriptionModalVisible = true)">
-        <font-awesome-icon
-          class="status-description-icon"
-          icon="fa-circle-question"
-        />
-      </div> -->
     </div>
     <div class="status-verified-message">
       <div v-if="permit?.statusLastVerified">