From 2dd21a387a89625fa32ed8103c869fc04b3df6b8 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Thu, 13 Jun 2024 14:43:41 +0800
Subject: [PATCH] update staff

---
 src/components/EditStaff/EditStaff.tsx | 20 +++++------------
 src/components/EditStaff/StaffInfo.tsx | 30 ++++++++++++++------------
 2 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/src/components/EditStaff/EditStaff.tsx b/src/components/EditStaff/EditStaff.tsx
index 062c080..271fc87 100644
--- a/src/components/EditStaff/EditStaff.tsx
+++ b/src/components/EditStaff/EditStaff.tsx
@@ -96,11 +96,11 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos }) => {
           haveError = true
           formProps.setError("email", { message: t("Please Enter Correct Email."), type: "required" })
         }
-        if(!regex_phone.test(data.phone1)) {
+        if (!regex_phone.test(data.phone1)) {
           haveError = true
           formProps.setError("phone1", { message: t("Please Enter Correct Phone No.."), type: "required" })
         }
-        if(data.emergContactPhone && !regex_phone.test(data.emergContactPhone)) {
+        if (data.emergContactPhone && !regex_phone.test(data.emergContactPhone)) {
           haveError = true
           formProps.setError("emergContactPhone", { message: t("Please Enter Correct Phone No.."), type: "required" })
         }
@@ -110,7 +110,7 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos }) => {
             formProps.setError("phone2", { message: t("Please Enter Correct Phone No.."), type: "required" })
           }
         }
-        if (data.phone1 === data.phone2 || data.phone1 === data.emergContactPhone || data.phone2 === data.emergContactPhone) {
+        if (data.phone1 === data.phone2 || data.phone1 === data.emergContactPhone || data.phone2 && data.phone2 === data.emergContactPhone && data.phone2.length > 0) {
           haveError = true
           formProps.setError("phone1", { message: t("Please Enter Different Phone No.."), type: "required" })
           if (data.phone2!.length > 0) {
@@ -130,18 +130,10 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos }) => {
           haveError = true
           formProps.setError("employType", { message: t("Please Enter Employ Type."), type: "required" })
         }
-        if (!data.departmentId) {
-          haveError = true
-          formProps.setError("departmentId", { message: t("Please Enter Department."), type: "required" })
-        }
         if (!data.salaryId) {
           haveError = true
           formProps.setError("salaryId", { message: t("Please Enter Salary."), type: "required" })
         }
-        if (!data.joinDate) {
-          haveError = true
-          formProps.setError("joinDate", { message: t("Please Enter Join Date."), type: "required" })
-        }
         if (data.joinDate &&data.departDate && new Date(data.departDate) <= new Date(data.joinDate)) {
           haveError = true
           formProps.setError("departDate", { message: t("Depart Date cannot be earlier than Join Date."), type: "required" })
@@ -153,11 +145,10 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos }) => {
         const postData = {
           id: id,
           ...data,
-          // removeSkillSetId: removeSkillSetId
         }
         console.log(postData)
-        // await saveStaff(postData)
-        // router.replace("/settings/staff")
+        await saveStaff(postData)
+        router.replace("/settings/staff")
       } catch (e: any) {
         console.log(e);
         formProps.setError("staffId", { message: t("Please Enter Employ Type."), type: "required" })
@@ -186,7 +177,6 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos }) => {
       departmentId: Staff.department?.id,
       gradeId: Staff.grade?.id,
       skillSetId: defaultSkillset,
-      // removeSkillSetId: [],
       currentPositionId: Staff.currentPosition?.id,
       salaryId: Staff.salary.salaryPoint,
       employType: Staff.employType,
diff --git a/src/components/EditStaff/StaffInfo.tsx b/src/components/EditStaff/StaffInfo.tsx
index b48b404..06f197d 100644
--- a/src/components/EditStaff/StaffInfo.tsx
+++ b/src/components/EditStaff/StaffInfo.tsx
@@ -168,7 +168,7 @@ const StaffInfo: React.FC<Props> = ({ combos }) => {
             </Grid>
             <Grid item xs={6}>
               <FormControl fullWidth>
-                <InputLabel required>{t("Department")}</InputLabel>
+                <InputLabel>{t("Department")}</InputLabel>
                 <Controller
                   control={control}
                   name="departmentId"
@@ -176,7 +176,7 @@ const StaffInfo: React.FC<Props> = ({ combos }) => {
                     <Select
                       label={t("Department")}
                       {...field}
-                      error={Boolean(errors.departmentId)}
+                      // error={Boolean(errors.departmentId)}
                     >
                       {combos.department.map((department, index) => (
                         <MenuItem
@@ -378,11 +378,12 @@ const StaffInfo: React.FC<Props> = ({ combos }) => {
               <TextField
                 label={t("Emergency Contact Name")}
                 fullWidth
-                required
-                {...register("emergContactName", {
-                  required: "Emergency Contact Name required!",
-                })}
-                error={Boolean(errors.emergContactName)}
+                {...register("emergContactName"
+                // , {
+                //   required: "Emergency Contact Name required!",
+                // }
+              )}
+                // error={Boolean(errors.emergContactName)}
                 helperText={
                   Boolean(errors.emergContactName) &&
                   (errors.emergContactName?.message
@@ -395,14 +396,15 @@ const StaffInfo: React.FC<Props> = ({ combos }) => {
               <TextField
                 label={t("Emergency Contact Phone")}
                 fullWidth
-                required
-                {...register("emergContactPhone", {
-                  required: "Emergency Contact Phone required!",
-                })}
-                error={Boolean(errors.emergContactPhone)}
+                {...register("emergContactPhone"
+                // , {
+                //   required: "Emergency Contact Phone required!",
+                // }
+              )}
+                // error={Boolean(errors.emergContactPhone)}
                 helperText={
                   Boolean(errors.emergContactPhone) &&
-                  (errors.emergContactPhone?.message
+                 (errors.emergContactPhone?.message
                     ? t(errors.emergContactPhone.message)
                     : t("Please input correct Emergency Contact Phone"))
                 }
@@ -426,7 +428,7 @@ const StaffInfo: React.FC<Props> = ({ combos }) => {
                     textField: {
                       // required: true,
                       error:
-                        joinDate === "Invalid Date" || Boolean(errors.joinDate),
+                        joinDate === "Invalid Date",
                       // value: errors.joinDate?.message,
                     },
                   }}