From 901bca65292944b54d420dcfad73faa95359eecf Mon Sep 17 00:00:00 2001
From: Ehsan <ehsanahmadi8338@gmail.com>
Date: Fri, 18 Jul 2025 13:54:48 +0330
Subject: [PATCH] handle save some data and send server correct & change
 component form & clean code & fix bugs

---
 app/component/date/dateTime/SendAppo.js       |  11 +-
 app/component/selectors/GroupedSelect.js      | 102 ++++++++++++++++
 components/panel/addDoctor/form/Fields.js     |  97 +++++++++++++++
 .../addDoctor/form/fields/RadioGender.js      |   6 +-
 .../panel/addDoctor/form/fields/Selector.js   |   6 +-
 components/panel/addDoctor/form/index.js      | 111 +++---------------
 .../panel/addDoctor/form/sendReq/function.js  |   5 +-
 .../panel/addDoctor/form/sendReq/index.js     |   4 +-
 components/panel/addDoctor/index.js           |   1 -
 9 files changed, 235 insertions(+), 108 deletions(-)
 create mode 100644 app/component/selectors/GroupedSelect.js
 create mode 100644 components/panel/addDoctor/form/Fields.js

diff --git a/app/component/date/dateTime/SendAppo.js b/app/component/date/dateTime/SendAppo.js
index 3f636b3..0d27cc6 100644
--- a/app/component/date/dateTime/SendAppo.js
+++ b/app/component/date/dateTime/SendAppo.js
@@ -16,17 +16,12 @@ function SendAppo({ hour }) {
         doctor_id: doctorId,
         slot: hour,
       })
-      .then((res) => {
+      .then(() => {
         setLoading(false);
       })
-      .catch((err) => {
-        console.log(err);
+      .catch(() => {
+        // 
       });
-    // if (locateVisit) {
-    //   setStep((prev) => prev + 1);
-    // } else {
-    //   setIsError(true);
-    // }
   };
 
   return (
diff --git a/app/component/selectors/GroupedSelect.js b/app/component/selectors/GroupedSelect.js
new file mode 100644
index 0000000..8cad342
--- /dev/null
+++ b/app/component/selectors/GroupedSelect.js
@@ -0,0 +1,102 @@
+import MenuItem from "@mui/material/MenuItem";
+import ListSubheader from "@mui/material/ListSubheader";
+import Select from "@mui/material/Select";
+import { useState } from "react";
+import { styleTextSelectRight } from "@/mui";
+import IconMultipleSelect from "@/components/icons/IconMultipleSelect";
+
+function groupSpecialtiesByParent(specialties) {
+  const groups = [];
+
+  const parents = specialties.filter((item) => item.parent === null);
+
+  parents.forEach((parent) => {
+    const children = specialties.filter((item) => item.parent === parent.id);
+    if (children.length > 0) {
+      groups.push({
+        parent,
+        children,
+      });
+    }
+  });
+
+  return groups;
+}
+
+export default function GroupedSelect({
+  list,
+  name,
+  updateData,
+  data,
+  nameKey = "name",
+}) {
+  const groupedList = groupSpecialtiesByParent(list);
+
+  const handleChange = (event) => {
+    const value = event.target.value;
+    updateData && updateData(value, "value", name);
+  };
+
+  return (
+    <div className="w-full auto-complete-selector">
+      <Select
+        value={data}
+        onChange={handleChange}
+        IconComponent={IconMultipleSelect}
+        MenuProps={{
+          style: {
+            maxHeight: 300,
+          },
+        }}
+        className="!w-full"
+        sx={{
+          ...styleTextSelectRight,
+          "& .MuiSelect-icon": {
+            left: "16px",
+            right: "auto",
+          },
+          "& .MuiInputBase-input": { padding: "12.5px 14px !important" },
+          "& .MuiInputBase-root": {
+            borderRadius: 2,
+            padding: "0 !important",
+            height: {
+              xs: "43px !important",
+              sm: "43px !important",
+              md: "46px !important",
+              lg: "48px !important",
+            },
+          },
+          "& .MuiOutlinedInput-notchedOutline": {
+            border: "1px solid #D7D7D7",
+          },
+          "& .MuiInput-underline:hover:not(.Mui-disabled):before, .MuiOutlinedInput-notchedOutline":
+            {
+              borderColor: "#D7D7D7 !important",
+            },
+          "& .muirtl-1kiro5a-MuiInputBase-root-MuiOutlinedInput-root.Mui-focused .MuiOutlinedInput-notchedOutline":
+            {
+              border: "1px solid #5559CE !important",
+            },
+        }}
+      >
+        {groupedList.map((group) => [
+          <ListSubheader
+            key={group.parent.id}
+            sx={{
+              backgroundColor: "#35343D",
+              color: "#fff",
+              fontSize: "14px",
+            }}
+          >
+            {group.parent[nameKey]}
+          </ListSubheader>,
+          ...group.children.map((child) => (
+            <MenuItem key={child.id} value={child.id}>
+              {child[nameKey]}
+            </MenuItem>
+          )),
+        ])}
+      </Select>
+    </div>
+  );
+}
diff --git a/components/panel/addDoctor/form/Fields.js b/components/panel/addDoctor/form/Fields.js
new file mode 100644
index 0000000..80d95fd
--- /dev/null
+++ b/components/panel/addDoctor/form/Fields.js
@@ -0,0 +1,97 @@
+import Selector from "./fields/Selector";
+import EditField from "@/app/component/fields/EditField";
+import GroupedSelect from "@/app/component/selectors/GroupedSelect";
+import MultipleSelect from "@/app/component/selectors/MultipleSelect";
+
+// Data
+import specialties from "@/data/specialties.json";
+import education from "@/data/education.json";
+import ContentText from "@/app/component/ContentText";
+
+const validate_medical_number = {
+  min: 1,
+  max: 9999999999,
+};
+
+function Fields({ services, data, updateNum, changeData }) {
+  return (
+    <>
+      <ContentText text="نام و نام خانوادگی">
+        <EditField
+          isTransparent={true}
+          iconGray={true}
+          changeData={changeData}
+          data={data?.name}
+          placeholder={data?.name.placeholder}
+          name="name"
+        />
+      </ContentText>
+      <ContentText text="شماره نظام پزشکی">
+        <EditField
+          isTransparent={true}
+          iconGray={true}
+          changeData={updateNum}
+          data={data?.medical_system_number}
+          noDisable={true}
+          type="number"
+          placeholder={data?.medical_system_number.placeholder}
+          name="medical_system_number"
+          props={{
+            inputProps: validate_medical_number,
+          }}
+        />
+      </ContentText>
+      <ContentText text="تخصص">
+        <GroupedSelect
+          updateData={changeData}
+          data={data?.expertise.value}
+          name="expertise"
+          list={specialties}
+          nameKey="name"
+        />
+      </ContentText>
+      <ContentText text="مدرک">
+        <Selector
+          updateData={changeData}
+          label="انتخاب کنید..."
+          name="degree"
+          data={data?.degree.value}
+          list={education}
+          nameKey="label"
+        />
+      </ContentText>
+      <ContentText text="مهارت ها">
+        <MultipleSelect
+          name="skills"
+          list={services}
+          updateData={changeData}
+          value={data?.skills.value}
+        />
+      </ContentText>
+      <ContentText text="شماره موبایل">
+        <EditField
+          isTransparent={true}
+          iconGray={true}
+          changeData={changeData}
+          data={data?.phone}
+          type="number"
+          placeholder={data?.phone.placeholder}
+          name="phone"
+        />
+      </ContentText>
+      <ContentText text="توضیحات">
+        <EditField
+          multiline={5}
+          placeholder="درباره سوابق خود توضیحاتی بنویسید..."
+          isTransparent={true}
+          iconGray={true}
+          changeData={changeData}
+          data={data?.description}
+          name="description"
+        />
+      </ContentText>
+    </>
+  );
+}
+
+export default Fields;
diff --git a/components/panel/addDoctor/form/fields/RadioGender.js b/components/panel/addDoctor/form/fields/RadioGender.js
index 0768993..1adc3e4 100644
--- a/components/panel/addDoctor/form/fields/RadioGender.js
+++ b/components/panel/addDoctor/form/fields/RadioGender.js
@@ -1,11 +1,11 @@
 import { FormControlLabel, Radio, RadioGroup } from "@mui/material";
 
-function RadioGender({ changeData, name }) {
+function RadioGender({ changeData, name, data }) {
   return (
     <RadioGroup
       dir="ltr"
+      value={data}
       className="!flex radio-mui !flex-row !gap-[36px] !items-center !justify-start"
-      defaultValue="woman"
       onChange={(e) => changeData(e.target.value, "value", name)}
       sx={{
         "& .muirtl-j204z7-MuiFormControlLabel-root": {
@@ -17,12 +17,14 @@ function RadioGender({ changeData, name }) {
         label="مرد"
         value="man"
         control={<Radio />}
+        dir="rtl"
         className="!text-[#A1A1A1]"
       />
       <FormControlLabel
         label="زن"
         value="woman"
         control={<Radio />}
+        dir="rtl"
         className="!text-[#A1A1A1]"
       />
     </RadioGroup>
diff --git a/components/panel/addDoctor/form/fields/Selector.js b/components/panel/addDoctor/form/fields/Selector.js
index 8833fa4..f38cf2b 100644
--- a/components/panel/addDoctor/form/fields/Selector.js
+++ b/components/panel/addDoctor/form/fields/Selector.js
@@ -2,9 +2,12 @@ import BottomSelect from "@/components/icons/BottomSelect";
 import { Autocomplete, Button, TextField } from "@mui/material";
 import { styleTextSelectRight } from "@/mui";
 
-function Selector({ updateData, nameKey, label, name, list }) {
+function Selector({ data, updateData, nameKey, label, name, list }) {
+  const selectedOption = list.find((item) => item.id === data) || null;
+
   return (
     <Autocomplete
+      value={selectedOption}
       disablePortal
       options={list}
       getOptionLabel={(option) => option[nameKey] || ""}
@@ -17,7 +20,6 @@ function Selector({ updateData, nameKey, label, name, list }) {
       }}
       sx={{
         ...styleTextSelectRight,
-        // Hide Icon Number
         "& input::-webkit-outer-spin-button, & input::-webkit-inner-spin-button":
           {
             display: "none",
diff --git a/components/panel/addDoctor/form/index.js b/components/panel/addDoctor/form/index.js
index aeac80b..e51d23a 100644
--- a/components/panel/addDoctor/form/index.js
+++ b/components/panel/addDoctor/form/index.js
@@ -2,17 +2,9 @@ import { useEffect, useState } from "react";
 import FieldDate from "./fields/FieldDate";
 import RadioGender from "./fields/RadioGender";
 import SendReq from "./sendReq";
-import Selector from "./fields/Selector";
-
-// Components
-import EditField from "@/app/component/fields/EditField";
 import ContentText from "@/app/component/ContentText";
-
-// Data
-import specialties from "@/data/specialties.json";
-import education from "@/data/education.json";
-import MultipleSelect from "@/app/component/selectors/MultipleSelect";
 import { request } from "@/services/response";
+import Fields from "./Fields";
 
 const validate_medical_number = {
   min: 1,
@@ -41,7 +33,6 @@ function Form({ image, data, setData, resetData }) {
     const validateValue = parseValue > max ? data[name].value : value;
     changeData(validateValue, type, name);
   };
-  const filteredSpe = specialties.filter((item) => item.parent);
 
   useEffect(() => {
     request
@@ -49,94 +40,30 @@ function Form({ image, data, setData, resetData }) {
       .then((res) => {
         setServices(res.data);
       })
-      .catch((err) => {
-        console.log(err);
+      .catch(() => {
+        //
       });
   }, []);
-  console.log(services);
 
   return (
     <>
       <div className="mt-[24px] sm-modal scroll-mui md:mt-[26px] lg:mt-[28px] grid grid-cols-1 md:grid-cols-2 gap-x-[48px] gap-y-[24px]">
-        <ContentText text="نام و نام خانوادگی">
-          <EditField
-            isTransparent={true}
-            iconGray={true}
-            changeData={changeData}
-            data={data?.name}
-            placeholder={data?.name.placeholder}
-            name="name"
-          />
-        </ContentText>
-        <ContentText text="شماره نظام پزشکی">
-          <EditField
-            isTransparent={true}
-            iconGray={true}
-            changeData={updateNum}
-            data={data?.medical_system_number}
-            noDisable={true}
-            type="number"
-            placeholder={data?.medical_system_number.placeholder}
-            name="medical_system_number"
-            props={{
-              inputProps: validate_medical_number,
-            }}
-          />
-        </ContentText>
-        <ContentText text="تخصص">
-          <Selector
-            updateData={changeData}
-            data={data?.expertise.value}
-            label="انتخاب کنید..."
-            name="expertise"
-            list={filteredSpe}
-            nameKey="name"
-          />
-        </ContentText>
-        <ContentText text="مدرک">
-          <Selector
-            updateData={changeData}
-            label="انتخاب کنید..."
-            name="degree"
-            data={data?.degree.value}
-            list={education}
-            nameKey="label"
-          />
-        </ContentText>
-        <ContentText text="مهارت ها">
-          <MultipleSelect
-            name="skills"
-            list={services}
-            updateData={changeData}
-            value={data?.skills.value}
-          />
-        </ContentText>
-        <ContentText text="شماره موبایل">
-          <EditField
-            isTransparent={true}
-            iconGray={true}
-            changeData={changeData}
-            data={data?.phone}
-            type="number"
-            placeholder={data?.phone.placeholder}
-            name="phone"
-          />
-        </ContentText>
-        <FieldDate changeListData={changeData} data={data?.time_work} />
-        <ContentText text="جنسیت">
-          <RadioGender changeData={changeData} name="gender" />
-        </ContentText>
-        <ContentText text="توضیحات">
-          <EditField
-            multiline={5}
-            placeholder="درباره سوابق خود توضیحاتی بنویسید..."
-            isTransparent={true}
-            iconGray={true}
-            changeData={changeData}
-            data={data?.description}
-            name="description"
-          />
-        </ContentText>
+        <Fields
+          data={data}
+          services={services}
+          changeData={changeData}
+          updateNum={updateNum}
+        />
+        <div className="flex flex-col gap-y-[24px]">
+          <FieldDate changeListData={changeData} data={data?.time_work} />
+          <ContentText text="جنسیت">
+            <RadioGender
+              changeData={changeData}
+              data={data?.gender.value}
+              name="gender"
+            />
+          </ContentText>
+        </div>
       </div>
       <SendReq img={image} data={data} resetData={resetData} />
     </>
diff --git a/components/panel/addDoctor/form/sendReq/function.js b/components/panel/addDoctor/form/sendReq/function.js
index 0249999..21e0303 100644
--- a/components/panel/addDoctor/form/sendReq/function.js
+++ b/components/panel/addDoctor/form/sendReq/function.js
@@ -12,7 +12,10 @@ export const transformData = (data) => {
     activity_time: dateToTimestamp(data.time_work.value),
     doctor_mobile_number: data.phone.value,
     degree: data.degree.value,
-    specialty: [Number(data.expertise.value)],
+    specialty: [data.expertise.value],
     info: data.description.value,
+    doctor_id: data.medical_system_number.value,
+    doctor_services: data.skills.value,
+    gender: data.gender.value,
   };
 };
diff --git a/components/panel/addDoctor/form/sendReq/index.js b/components/panel/addDoctor/form/sendReq/index.js
index 1ed303e..9b82581 100644
--- a/components/panel/addDoctor/form/sendReq/index.js
+++ b/components/panel/addDoctor/form/sendReq/index.js
@@ -27,6 +27,7 @@ function SendReq({ img, data, resetData }) {
   };
 
   const saveImg = () => {
+    resetData();
     setLoading(true);
     if (img) {
       request
@@ -35,7 +36,7 @@ function SendReq({ img, data, resetData }) {
           const imgId = res.fid[0].value;
           saveData(imgId);
         })
-        .catch((err) => {
+        .catch(() => {
           setLoading(false);
         });
     } else {
@@ -47,7 +48,6 @@ function SendReq({ img, data, resetData }) {
     <div className="mt-[40px] w-full flex justify-end">
       <Button
         className="!w-full md:!w-fit !shadow-none !rounded-[4px] !gap-[4px] !text-[#EFEFEF] !text-[14px] md:!text-[16px] !font-medium"
-        // onClick={() => setValue((prev) => prev + 1)}
         disabled={!checkAllValues(data)}
         variant="contained"
         onClick={saveImg}
diff --git a/components/panel/addDoctor/index.js b/components/panel/addDoctor/index.js
index a6b1330..adac173 100644
--- a/components/panel/addDoctor/index.js
+++ b/components/panel/addDoctor/index.js
@@ -8,7 +8,6 @@ import UploadFile from "@/app/component/uploadFile";
 function AddDoctorPage() {
   const [data, setData] = useState(defaultState);
   const [image, setImage] = useState("");
-  console.log(data);
 
   const resetData = () => {
     setData(defaultState);