From c48e3e3657f8252ae5b52c382794f88b19d33ba0 Mon Sep 17 00:00:00 2001
From: Thanaphon Frappet <thanaphon@frappet.com>
Date: Wed, 11 Dec 2024 15:35:20 +0700
Subject: [PATCH] refactor: handle date can is null

---
 .../01_branch-management/FormBranchInformation.vue |  4 ++--
 src/pages/01_branch-management/MainPage.vue        | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/01_branch-management/FormBranchInformation.vue b/src/components/01_branch-management/FormBranchInformation.vue
index f9933f32..19aa178c 100644
--- a/src/components/01_branch-management/FormBranchInformation.vue
+++ b/src/components/01_branch-management/FormBranchInformation.vue
@@ -13,8 +13,8 @@ const nameEN = defineModel<string>('nameEn');
 const typeBranch = defineModel<string>('typeBranch');
 const virtual = defineModel<boolean>('virtual');
 
-const permitExpireDate = defineModel<Date>('permitExpireDate');
-const permitIssueDate = defineModel<Date>('permitIssueDate');
+const permitExpireDate = defineModel<Date | null>('permitExpireDate');
+const permitIssueDate = defineModel<Date | null>('permitIssueDate');
 const permitNo = defineModel<string>('permitNo');
 
 defineProps<{
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index 65f61228..878b67d9 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -465,8 +465,10 @@ async function fetchBranchById(id: string) {
       street: res.street,
       streetEN: res.streetEN,
 
-      permitExpireDate: new Date(res.permitExpireDate),
-      permitIssueDate: new Date(res.permitIssueDate),
+      permitExpireDate:
+        res.permitExpireDate === null ? null : new Date(res.permitExpireDate),
+      permitIssueDate:
+        res.permitIssueDate === null ? null : new Date(res.permitIssueDate),
       permitNo: res.permitNo,
     };
     return res;
@@ -756,6 +758,14 @@ async function onSubmit(submitSelectedItem?: boolean) {
       currentEdit.value.id,
       {
         ...formData.value,
+        permitExpireDate:
+          formData.value.permitExpireDate === undefined
+            ? null
+            : formData.value.permitExpireDate,
+        permitIssueDate:
+          formData.value.permitIssueDate === undefined
+            ? null
+            : formData.value.permitIssueDate,
         status: undefined,
       },
       qrCodeFile.value,