From 3366842544d8c6e358705fd6b078dc6f313d7302 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Mon, 27 May 2024 16:41:16 +0800
Subject: [PATCH] fix company

---
 src/app/utils/formatUtil.ts                     |  2 +-
 src/components/CreateCompany/CompanyDetails.tsx | 17 +++++++++--------
 src/components/CreateCompany/CreateCompany.tsx  |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/app/utils/formatUtil.ts b/src/app/utils/formatUtil.ts
index 150b350..ff9cc19 100644
--- a/src/app/utils/formatUtil.ts
+++ b/src/app/utils/formatUtil.ts
@@ -52,7 +52,7 @@ export const convertTimeArrayToString = (
   format: string = OUTPUT_TIME_FORMAT,
   needTime: boolean = false,
 ) => {
-  let timeString = "";
+  let timeString = null;
 
   if (timeArray !== null && timeArray !== undefined) {
     const hour = timeArray[0] || 0;
diff --git a/src/components/CreateCompany/CompanyDetails.tsx b/src/components/CreateCompany/CompanyDetails.tsx
index 347580e..893dadf 100644
--- a/src/components/CreateCompany/CompanyDetails.tsx
+++ b/src/components/CreateCompany/CompanyDetails.tsx
@@ -47,10 +47,10 @@ const CompanyDetails: React.FC<Props> = ({
   // console.log(content)
 
   useEffect(() => {
-    setValue("normalHourFrom", convertTimeArrayToString(content.normalHourFrom, "HH:mm:ss", false));
-    setValue("normalHourTo", convertTimeArrayToString(content.normalHourTo, "HH:mm:ss", false));
-    setValue("otHourFrom", convertTimeArrayToString(content.otHourFrom, "HH:mm:ss", false));
-    setValue("otHourTo", convertTimeArrayToString(content.otHourTo, "HH:mm:ss", false));
+    setValue("normalHourFrom", convertTimeArrayToString(content.normalHourFrom, "HH:mm:ss", false) ?? "09:00:00");
+    setValue("normalHourTo", convertTimeArrayToString(content.normalHourTo, "HH:mm:ss", false) ?? "18:00:00");
+    setValue("otHourFrom", convertTimeArrayToString(content.otHourFrom, "HH:mm:ss", false) ?? "20:00:00");
+    setValue("otHourTo", convertTimeArrayToString(content.otHourTo, "HH:mm:ss", false) ?? "08:00:00");
   }, [content])
 
   return (
@@ -125,10 +125,11 @@ const CompanyDetails: React.FC<Props> = ({
             <FormControl fullWidth>
               <TimePicker
                 label={t("Normal Hour From")}
-                value={content.normalHourFrom !== undefined && content.normalHourFrom !== null ? 
+                defaultValue={content.normalHourFrom !== undefined && content.normalHourFrom !== null ? 
                   dayjs().hour(content.normalHourFrom[0]).minute(content.normalHourFrom[1]) : 
                   dayjs().hour(9).minute(0)}
                 onChange={(time) => {
+                  console.log(time?.format("HH:mm:ss"))
                   if (!time) return;
                   setValue("normalHourFrom", time.format("HH:mm:ss"));
                 }}
@@ -144,7 +145,7 @@ const CompanyDetails: React.FC<Props> = ({
             <FormControl fullWidth>
               <TimePicker
                 label={t("Normal Hour To")}
-                value={content.normalHourTo !== undefined && content.normalHourTo !== null ? 
+                defaultValue={content.normalHourTo !== undefined && content.normalHourTo !== null ? 
                   dayjs().hour(content.normalHourTo[0]).minute(content.normalHourTo[1]) : 
                   dayjs().hour(18).minute(0)}
                 onChange={(time) => {
@@ -163,7 +164,7 @@ const CompanyDetails: React.FC<Props> = ({
             <FormControl fullWidth>
               <TimePicker
                 label={t("OT Hour From")}
-                value={content.otHourFrom !== undefined && content.otHourFrom !== null ? 
+                defaultValue={content.otHourFrom !== undefined && content.otHourFrom !== null ? 
                   dayjs().hour(content.otHourFrom[0]).minute(content.otHourFrom[1]) : 
                   dayjs().hour(20).minute(0)}
                 onChange={(time) => {
@@ -182,7 +183,7 @@ const CompanyDetails: React.FC<Props> = ({
             <FormControl fullWidth>
               <TimePicker
                 label={t("OT Hour To")}
-                value={content.otHourTo !== undefined && content.otHourTo !== null ? 
+                defaultValue={content.otHourTo !== undefined && content.otHourTo !== null ? 
                   dayjs().hour(content.otHourTo[0]).minute(content.otHourTo[1]) : 
                   dayjs().hour(8).minute(0)}
                 onChange={(time) => {
diff --git a/src/components/CreateCompany/CreateCompany.tsx b/src/components/CreateCompany/CreateCompany.tsx
index 26aae87..7ae3d5b 100644
--- a/src/components/CreateCompany/CreateCompany.tsx
+++ b/src/components/CreateCompany/CreateCompany.tsx
@@ -69,7 +69,7 @@ const CreateCompany: React.FC<Props> = ({
             contactName: company?.contactName,
             phone: company?.phone,
             otHourTo: "",
-            otHourFrom: "",
+            otHourFrom:  "",
             normalHourTo: "",
             normalHourFrom: "",
             currency: company?.currency,