From 390bd2fd7cf4a9abedfd833daadacf3fa47b02b9 Mon Sep 17 00:00:00 2001
From: Amin Ghasempoor <aminghasempoor79@gmail.com>
Date: Sun, 16 Jul 2023 11:00:57 +0330
Subject: [PATCH 1/4] machinary office implement

---
 .../machinary-office/Form/ConfirmForm.jsx     | 16 +++---
 .../machinary-office/Form/RejectForm.jsx      | 16 +++---
 .../machinary-office/TableRowActions.jsx      | 51 ++++++++++---------
 .../dashboard/machinary-office/index.jsx      |  4 +-
 .../passenger-office/TableRowActions.jsx      |  9 ++--
 src/core/data/apiRoutes.js                    | 11 ++++
 src/lib/app/hooks/useDatatable.jsx            |  4 +-
 7 files changed, 67 insertions(+), 44 deletions(-)

diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
index 5fd3f3b..702ce9b 100644
--- a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
@@ -1,3 +1,4 @@
+import { CONFIRM_MACHINARY_OFFICE } from "@/core/data/apiRoutes";
 import {
   Dialog,
   DialogTitle,
@@ -13,24 +14,25 @@ const ConfirmForm = ({
   handleClose,
   handleDelete,
   rowId,
-  deleteData,
+  confirmData,
 }) => {
   const t = useTranslations();
-  const handleDeleteExpert = () => {
+  const handleConfirm = () => {
     handleDelete();
+    confirmData(CONFIRM_MACHINARY_OFFICE, rowId);
   };
   return (
     <Dialog open={open} onClose={handleClose}>
-      <DialogTitle>{t("delete-dialog.confirm")}</DialogTitle>
+      <DialogTitle>{t("ConfirmDialog.confirm")}</DialogTitle>
       <DialogContent>
-        <DialogContentText>{t("delete-dialog.context")}</DialogContentText>
+        <DialogContentText>{t("ConfirmDialog.context")}</DialogContentText>
       </DialogContent>
       <DialogActions>
-        <Button onClick={handleDeleteExpert} color="primary">
-          {t("delete-dialog.button-delete")}
+        <Button onClick={handleConfirm} color="primary">
+          {t("ConfirmDialog.button-confirm")}
         </Button>
         <Button onClick={handleClose} color="secondary" autoFocus>
-          {t("delete-dialog.button-cancel")}
+          {t("ConfirmDialog.button-cancel")}
         </Button>
       </DialogActions>
     </Dialog>
diff --git a/src/components/dashboard/machinary-office/Form/RejectForm.jsx b/src/components/dashboard/machinary-office/Form/RejectForm.jsx
index cf551a8..4fce632 100644
--- a/src/components/dashboard/machinary-office/Form/RejectForm.jsx
+++ b/src/components/dashboard/machinary-office/Form/RejectForm.jsx
@@ -1,3 +1,4 @@
+import { REJECT_MACHINARY_OFFICE } from "@/core/data/apiRoutes";
 import {
   Dialog,
   DialogTitle,
@@ -8,23 +9,24 @@ import {
 } from "@mui/material";
 import { useTranslations } from "next-intl";
 
-const RejectForm = ({ open, handleClose, handleDelete, rowId, deleteData }) => {
+const RejectForm = ({ open, handleClose, handleDelete, rowId, rejectData }) => {
   const t = useTranslations();
-  const handleDeleteExpert = () => {
+  const handleRejectRequest = () => {
     handleDelete();
+    rejectData(REJECT_MACHINARY_OFFICE, rowId);
   };
   return (
     <Dialog open={open} onClose={handleClose}>
-      <DialogTitle>{t("delete-dialog.confirm")}</DialogTitle>
+      <DialogTitle>{t("RejectDialog.reject")}</DialogTitle>
       <DialogContent>
-        <DialogContentText>{t("delete-dialog.context")}</DialogContentText>
+        <DialogContentText>{t("RejectDialog.context")}</DialogContentText>
       </DialogContent>
       <DialogActions>
-        <Button onClick={handleDeleteExpert} color="primary">
-          {t("delete-dialog.button-delete")}
+        <Button onClick={handleRejectRequest} color="primary">
+          {t("RejectDialog.button-reject")}
         </Button>
         <Button onClick={handleClose} color="secondary" autoFocus>
-          {t("delete-dialog.button-cancel")}
+          {t("RejectDialog.button-cancel")}
         </Button>
       </DialogActions>
     </Dialog>
diff --git a/src/components/dashboard/machinary-office/TableRowActions.jsx b/src/components/dashboard/machinary-office/TableRowActions.jsx
index 832e77e..f5ec46b 100644
--- a/src/components/dashboard/machinary-office/TableRowActions.jsx
+++ b/src/components/dashboard/machinary-office/TableRowActions.jsx
@@ -6,39 +6,42 @@ import { DataTableContext } from "@/lib/app/contexts/DataTableContext";
 import ConfirmForm from "./Form/ConfirmForm";
 import RejectForm from "./Form/RejectForm";
 
-// import DeleteForm from "./Form/DeleteForm";
-
 const TableRowActions = ({ row }) => {
-  // const {
-  //   openDeleteDialog,
-  //   handleOpenDeleteDialog,
-  //   handleCloseDeleteDialog,
-  //   handleDeleteDialog,
-  //   rowId,
-  //   deleteData,
-  // } = useContext(DataTableContext);
+  const {
+    openConfirmDialog,
+    openRejectDialog,
+    handleOpenConfirmDialog,
+    handleOpenRejectDialog,
+    handleCloseConfirmDialog,
+    handleCloseRejectDialog,
+    handleConfirmDialog,
+    handleRejectDialog,
+    rowId,
+    confirmData,
+    rejectData,
+  } = useContext(DataTableContext);
   return (
     <Box sx={{ display: "flex", flexWrap: "nowrap", gap: "8px" }}>
-      <IconButton color="primary" onClick={() => handleOpenDeleteDialog(row)}>
+      <IconButton color="primary" onClick={() => handleOpenConfirmDialog(row)}>
         <ThumbUpAltIcon />
       </IconButton>
-      {/* <ConfirmForm
+      <ConfirmForm
         rowId={rowId}
-        open={openDeleteDialog}
-        handleClose={handleCloseDeleteDialog}
-        handleDelete={handleDeleteDialog}
-        deleteData={deleteData}
-      /> */}
-      <IconButton color="primary" onClick={() => handleOpenDeleteDialog(row)}>
+        open={openConfirmDialog}
+        handleClose={handleCloseConfirmDialog}
+        handleDelete={handleConfirmDialog}
+        confirmData={confirmData}
+      />
+      <IconButton color="primary" onClick={() => handleOpenRejectDialog(row)}>
         <ThumbDownIcon />
       </IconButton>
-      {/* <RejectForm
+      <RejectForm
         rowId={rowId}
-        open={openDeleteDialog}
-        handleClose={handleCloseDeleteDialog}
-        handleDelete={handleDeleteDialog}
-        deleteData={deleteData}
-      /> */}
+        open={openRejectDialog}
+        handleClose={handleCloseRejectDialog}
+        handleDelete={handleRejectDialog}
+        rejectData={rejectData}
+      />
     </Box>
   );
 };
diff --git a/src/components/dashboard/machinary-office/index.jsx b/src/components/dashboard/machinary-office/index.jsx
index a9af448..8a88f5f 100644
--- a/src/components/dashboard/machinary-office/index.jsx
+++ b/src/components/dashboard/machinary-office/index.jsx
@@ -3,7 +3,7 @@ import DashboardLayouts from "@/layouts/dashboardLayouts";
 import { Box, Typography } from "@mui/material";
 import { useMemo } from "react";
 // import TableToolbar from "./TableTollbar";
-import { GET_PASSENGER_OFFICE } from "@/core/data/apiRoutes";
+import { GET_MACHINARY_OFFICE } from "@/core/data/apiRoutes";
 import { useTranslations } from "next-intl";
 import TableRowActions from "./TableRowActions";
 
@@ -153,7 +153,7 @@ function DashboardMachinaryOfficeComponent() {
     <DashboardLayouts>
       <Box sx={{ px: 3 }}>
         <DataTableStructure
-          tableUrl={GET_PASSENGER_OFFICE}
+          tableUrl={GET_MACHINARY_OFFICE}
           columns={columns}
           selectableRow={false}
           enableCustomToolbar={true}
diff --git a/src/components/dashboard/passenger-office/TableRowActions.jsx b/src/components/dashboard/passenger-office/TableRowActions.jsx
index ec2d790..586a976 100644
--- a/src/components/dashboard/passenger-office/TableRowActions.jsx
+++ b/src/components/dashboard/passenger-office/TableRowActions.jsx
@@ -6,8 +6,6 @@ import { DataTableContext } from "@/lib/app/contexts/DataTableContext";
 import ConfirmForm from "./Form/ConfirmForm";
 import RejectForm from "./Form/RejectForm";
 
-// import DeleteForm from "./Form/DeleteForm";
-
 const TableRowActions = ({ row }) => {
   const {
     openConfirmDialog,
@@ -24,7 +22,12 @@ const TableRowActions = ({ row }) => {
   } = useContext(DataTableContext);
   return (
     <Box sx={{ display: "flex", flexWrap: "nowrap", gap: "8px" }}>
-      <IconButton color="primary" onClick={() => handleOpenConfirmDialog(row)}>
+      <IconButton
+        color="primary"
+        onClick={() => {
+          handleOpenConfirmDialog(row);
+        }}
+      >
         <ThumbUpAltIcon />
       </IconButton>
       <ConfirmForm
diff --git a/src/core/data/apiRoutes.js b/src/core/data/apiRoutes.js
index 5c73fcf..f16d573 100644
--- a/src/core/data/apiRoutes.js
+++ b/src/core/data/apiRoutes.js
@@ -22,3 +22,14 @@ export const CONFIRM_PASSENGER_OFFICE =
 export const REJECT_PASSENGER_OFFICE =
   BASE_URL + "/dashboard/passenger_office_chief/reject";
 //passenger office
+
+//machinary office
+export const GET_MACHINARY_OFFICE =
+  BASE_URL + "/dashboard/machinery_expert/show";
+
+export const CONFIRM_MACHINARY_OFFICE =
+  BASE_URL + "/dashboard/machinery_expert/confirm";
+
+export const REJECT_MACHINARY_OFFICE =
+  BASE_URL + "dashboard/machinery_expert/reject";
+//passenger office
diff --git a/src/lib/app/hooks/useDatatable.jsx b/src/lib/app/hooks/useDatatable.jsx
index 9b6f855..9584eea 100644
--- a/src/lib/app/hooks/useDatatable.jsx
+++ b/src/lib/app/hooks/useDatatable.jsx
@@ -47,7 +47,9 @@ const useDataTable = () => {
     dispatch({ type: "CONFIRM_DATA", url: url, rowID: rowID });
     axios
       .post(`${url}/${rowID}`, {
-        headers: { authorization: `Bearer ${token}` },
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
       })
       .then(() => {
         setReloadDataTable(true);

From 024da3baf7dd45649f397950459276f5501ac0a4 Mon Sep 17 00:00:00 2001
From: Amin Ghasempoor <aminghasempoor79@gmail.com>
Date: Sun, 16 Jul 2023 13:39:46 +0330
Subject: [PATCH 2/4] machinary implement

---
 public/locales/fa/app.json                       |  3 ++-
 .../machinary-office/Form/ConfirmForm.jsx        | 16 +++++++++++++++-
 src/lib/app/hooks/useDatatable.jsx               |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index 1a505df..35fa040 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -109,7 +109,8 @@
     "updated_at": "تاریخ بروزرسانی",
     "navgan_id": "کد ناوگان",
     "vehicle_type": "نوع ماشین",
-    "state_name": "وضعیت درخواست"
+    "state_name": "وضعیت درخواست",
+    "proposed_amount": "مقدار پیشنهادی"
   },
   "ConfirmDialog": {
     "confirm": "تایید",
diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
index 702ce9b..3e64087 100644
--- a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
@@ -6,8 +6,10 @@ import {
   DialogContentText,
   DialogActions,
   Button,
+  TextField,
 } from "@mui/material";
 import { useTranslations } from "next-intl";
+import { useState } from "react";
 
 const ConfirmForm = ({
   open,
@@ -17,15 +19,27 @@ const ConfirmForm = ({
   confirmData,
 }) => {
   const t = useTranslations();
+  const [proposedAmount, setProposedAmount] = useState("");
   const handleConfirm = () => {
+    const formData = new FormData();
+    formData.append("proposed_amount", proposedAmount);
     handleDelete();
-    confirmData(CONFIRM_MACHINARY_OFFICE, rowId);
+    confirmData(CONFIRM_MACHINARY_OFFICE, rowId, formData);
   };
   return (
     <Dialog open={open} onClose={handleClose}>
       <DialogTitle>{t("ConfirmDialog.confirm")}</DialogTitle>
       <DialogContent>
         <DialogContentText>{t("ConfirmDialog.context")}</DialogContentText>
+        <TextField
+          label={t("MachinaryOffice.proposed_amount")}
+          type="number"
+          variant="outlined"
+          value={proposedAmount}
+          onChange={(e) => setProposedAmount(e.target.value)}
+          sx={{ mt: 2 }}
+          fullWidth
+        />
       </DialogContent>
       <DialogActions>
         <Button onClick={handleConfirm} color="primary">
diff --git a/src/lib/app/hooks/useDatatable.jsx b/src/lib/app/hooks/useDatatable.jsx
index ccd772a..cdc84d8 100644
--- a/src/lib/app/hooks/useDatatable.jsx
+++ b/src/lib/app/hooks/useDatatable.jsx
@@ -43,7 +43,7 @@ const useDataTable = () => {
 
   const { token } = useUser();
 
-  const confirmData = useCallback(async (url, rowID) => {
+  const confirmData = useCallback(async (url, rowID, values) => {
     dispatch({ type: "CONFIRM_DATA", url: url, rowID: rowID });
     axios
       .post(`${url}/${rowID}`, null, {

From 29d031a83e6b34afd11c9d1046bf284ea8a61826 Mon Sep 17 00:00:00 2001
From: Amin Ghasempoor <aminghasempoor79@gmail.com>
Date: Sun, 16 Jul 2023 15:16:31 +0330
Subject: [PATCH 3/4] machinary implement

---
 public/locales/fa/app.json                    |  3 +-
 .../machinary-office/Form/ConfirmForm.jsx     | 69 +++++++++++++++----
 .../machinary-office/Form/RejectForm.jsx      | 51 ++++++++++++--
 .../machinary-office/TableRowActions.jsx      | 39 ++++++-----
 src/core/data/apiRoutes.js                    |  2 +-
 src/lib/app/hooks/useDatatable.jsx            |  7 +-
 6 files changed, 129 insertions(+), 42 deletions(-)

diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index c7b9d16..ef91fef 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -116,7 +116,8 @@
     "confirm": "تایید",
     "context": "آیا از تایید این آیتم اطمینان دارید",
     "button-confirm": "تایید",
-    "button-cancel": "بستن"
+    "button-cancel": "بستن",
+    "amount_error": "وارد کردن مقدار پیشنهادی الزامیست"
   },
   "RejectDialog": {
     "reject": "عدم تایید",
diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
index 3e64087..804036a 100644
--- a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
@@ -10,39 +10,78 @@ import {
 } from "@mui/material";
 import { useTranslations } from "next-intl";
 import { useState } from "react";
+import { useFormik } from "formik";
+import * as Yup from "yup";
 
-const ConfirmForm = ({
-  open,
-  handleClose,
-  handleDelete,
-  rowId,
-  confirmData,
-}) => {
+const ConfirmForm = ({ open, handleClose, rowId, confirmData }) => {
   const t = useTranslations();
   const [proposedAmount, setProposedAmount] = useState("");
-  const handleConfirm = () => {
-    const formData = new FormData();
-    formData.append("proposed_amount", proposedAmount);
-    handleDelete();
-    confirmData(CONFIRM_MACHINARY_OFFICE, rowId, formData);
+  const [description, setDescription] = useState("");
+
+  //formik
+  const validationSchema = Yup.object().shape({
+    proposed_amount: Yup.string().required(t("ConfirmDialog.amount_error")),
+  });
+  const formik = useFormik({
+    initialValues: {
+      proposed_amount: "",
+      description: "",
+    },
+    validationSchema,
+    onSubmit: () => {
+      const formData = new FormData();
+      formData.append("proposed_amount", proposedAmount);
+      formData.append("expert_description", description);
+      handleClose();
+      confirmData(CONFIRM_MACHINARY_OFFICE, rowId, formData);
+    },
+  });
+
+  const handleDescriptionChange = (event) => {
+    setDescription(event.target.value);
   };
+  const handleAmountChange = (event) => {
+    setProposedAmount(event.target.value);
+    formik.handleChange(event);
+  };
+
   return (
     <Dialog open={open} onClose={handleClose}>
       <DialogTitle>{t("ConfirmDialog.confirm")}</DialogTitle>
       <DialogContent>
         <DialogContentText>{t("ConfirmDialog.context")}</DialogContentText>
         <TextField
+          name="description"
+          multiline
+          rows={8}
+          placeholder={t("RejectDialog.description")}
+          value={description}
+          onChange={handleDescriptionChange}
+          fullWidth
+          variant="outlined"
+          sx={{ mt: 1 }}
+        />
+        <TextField
+          name="proposed_amount"
           label={t("MachinaryOffice.proposed_amount")}
           type="number"
           variant="outlined"
           value={proposedAmount}
-          onChange={(e) => setProposedAmount(e.target.value)}
-          sx={{ mt: 2 }}
+          onChange={handleAmountChange}
+          onBlur={formik.handleBlur("proposed_amount")}
+          error={
+            formik.touched.proposed_amount &&
+            Boolean(formik.errors.proposed_amount)
+          }
+          helperText={
+            formik.touched.proposed_amount && formik.errors.proposed_amount
+          }
+          sx={{ mt: 1 }}
           fullWidth
         />
       </DialogContent>
       <DialogActions>
-        <Button onClick={handleConfirm} color="primary">
+        <Button onClick={formik.handleSubmit} color="primary">
           {t("ConfirmDialog.button-confirm")}
         </Button>
         <Button onClick={handleClose} color="secondary" autoFocus>
diff --git a/src/components/dashboard/machinary-office/Form/RejectForm.jsx b/src/components/dashboard/machinary-office/Form/RejectForm.jsx
index 4fce632..723f9a6 100644
--- a/src/components/dashboard/machinary-office/Form/RejectForm.jsx
+++ b/src/components/dashboard/machinary-office/Form/RejectForm.jsx
@@ -6,23 +6,63 @@ import {
   DialogContentText,
   DialogActions,
   Button,
+  TextField,
 } from "@mui/material";
 import { useTranslations } from "next-intl";
+import { useFormik } from "formik";
+import * as Yup from "yup";
+import { useState } from "react";
 
-const RejectForm = ({ open, handleClose, handleDelete, rowId, rejectData }) => {
+const RejectForm = ({ open, handleClose, rowId, rejectData }) => {
   const t = useTranslations();
-  const handleRejectRequest = () => {
-    handleDelete();
-    rejectData(REJECT_MACHINARY_OFFICE, rowId);
+  const [description, setDescription] = useState("");
+
+  const validationSchema = Yup.object().shape({
+    description: Yup.string().required(t("RejectDialog.description_error")),
+  });
+
+  const formik = useFormik({
+    initialValues: {
+      description: "",
+    },
+    validationSchema,
+    onSubmit: () => {
+      const formData = new FormData();
+      formData.append("expert_description", description);
+      handleClose();
+      rejectData(REJECT_MACHINARY_OFFICE, rowId, formData);
+    },
+  });
+
+  const handleDescriptionChange = (event) => {
+    setDescription(event.target.value);
+    formik.handleChange(event);
   };
+
   return (
     <Dialog open={open} onClose={handleClose}>
       <DialogTitle>{t("RejectDialog.reject")}</DialogTitle>
       <DialogContent>
         <DialogContentText>{t("RejectDialog.context")}</DialogContentText>
+        <TextField
+          name="description"
+          multiline
+          rows={8}
+          placeholder={t("RejectDialog.description")}
+          value={description}
+          onChange={handleDescriptionChange}
+          onBlur={formik.handleBlur("description")}
+          error={
+            formik.touched.description && Boolean(formik.errors.description)
+          }
+          helperText={formik.touched.description && formik.errors.description}
+          fullWidth
+          variant="outlined"
+          sx={{ mt: 1 }}
+        />
       </DialogContent>
       <DialogActions>
-        <Button onClick={handleRejectRequest} color="primary">
+        <Button onClick={formik.handleSubmit} color="primary">
           {t("RejectDialog.button-reject")}
         </Button>
         <Button onClick={handleClose} color="secondary" autoFocus>
@@ -32,4 +72,5 @@ const RejectForm = ({ open, handleClose, handleDelete, rowId, rejectData }) => {
     </Dialog>
   );
 };
+
 export default RejectForm;
diff --git a/src/components/dashboard/machinary-office/TableRowActions.jsx b/src/components/dashboard/machinary-office/TableRowActions.jsx
index f5ec46b..e9e815e 100644
--- a/src/components/dashboard/machinary-office/TableRowActions.jsx
+++ b/src/components/dashboard/machinary-office/TableRowActions.jsx
@@ -14,34 +14,39 @@ const TableRowActions = ({ row }) => {
     handleOpenRejectDialog,
     handleCloseConfirmDialog,
     handleCloseRejectDialog,
-    handleConfirmDialog,
-    handleRejectDialog,
     rowId,
     confirmData,
     rejectData,
   } = useContext(DataTableContext);
   return (
     <Box sx={{ display: "flex", flexWrap: "nowrap", gap: "8px" }}>
-      <IconButton color="primary" onClick={() => handleOpenConfirmDialog(row)}>
+      <IconButton
+        color="primary"
+        onClick={() => {
+          handleOpenConfirmDialog(row);
+        }}
+      >
         <ThumbUpAltIcon />
       </IconButton>
-      <ConfirmForm
-        rowId={rowId}
-        open={openConfirmDialog}
-        handleClose={handleCloseConfirmDialog}
-        handleDelete={handleConfirmDialog}
-        confirmData={confirmData}
-      />
+      {openConfirmDialog && (
+        <ConfirmForm
+          rowId={rowId}
+          open={openConfirmDialog}
+          handleClose={handleCloseConfirmDialog}
+          confirmData={confirmData}
+        />
+      )}
       <IconButton color="primary" onClick={() => handleOpenRejectDialog(row)}>
         <ThumbDownIcon />
       </IconButton>
-      <RejectForm
-        rowId={rowId}
-        open={openRejectDialog}
-        handleClose={handleCloseRejectDialog}
-        handleDelete={handleRejectDialog}
-        rejectData={rejectData}
-      />
+      {openRejectDialog && (
+        <RejectForm
+          rowId={rowId}
+          open={openRejectDialog}
+          handleClose={handleCloseRejectDialog}
+          rejectData={rejectData}
+        />
+      )}
     </Box>
   );
 };
diff --git a/src/core/data/apiRoutes.js b/src/core/data/apiRoutes.js
index f16d573..79046bc 100644
--- a/src/core/data/apiRoutes.js
+++ b/src/core/data/apiRoutes.js
@@ -31,5 +31,5 @@ export const CONFIRM_MACHINARY_OFFICE =
   BASE_URL + "/dashboard/machinery_expert/confirm";
 
 export const REJECT_MACHINARY_OFFICE =
-  BASE_URL + "dashboard/machinery_expert/reject";
+  BASE_URL + "/dashboard/machinery_expert/reject";
 //passenger office
diff --git a/src/lib/app/hooks/useDatatable.jsx b/src/lib/app/hooks/useDatatable.jsx
index e7730bc..9823aca 100644
--- a/src/lib/app/hooks/useDatatable.jsx
+++ b/src/lib/app/hooks/useDatatable.jsx
@@ -44,9 +44,9 @@ const useDataTable = () => {
   const { token } = useUser();
 
   const confirmData = useCallback(async (url, rowID, values) => {
-    dispatch({ type: "CONFIRM_DATA", url: url, rowID: rowID });
+    dispatch({ type: "CONFIRM_DATA", url: url, rowID: rowID, values: values });
     axios
-      .post(`${url}/${rowID}`, null, {
+      .post(`${url}/${rowID}`, values, {
         headers: { authorization: `Bearer ${token}` },
       })
       .then(() => {
@@ -60,13 +60,14 @@ const useDataTable = () => {
   const rejectData = useCallback(async (url, rowID, values) => {
     dispatch({ type: "REJECT_DATA", url: url, rowID: rowID, values: values });
     axios
-      .post(`${url}/${rowID}`,values, {
+      .post(`${url}/${rowID}`, values, {
         headers: { authorization: `Bearer ${token}` },
       })
       .then(() => {
         setReloadDataTable(true);
       })
       .catch((error) => {
+        console.log(error);
         Notifications(directionApp, error.response, t);
       });
   }, []);

From c2259031fc73e68b090fd9b88b45d9789e802c1e Mon Sep 17 00:00:00 2001
From: Amin Ghasempoor <aminghasempoor79@gmail.com>
Date: Sun, 16 Jul 2023 15:31:20 +0330
Subject: [PATCH 4/4] confirm data

---
 src/components/dashboard/machinary-office/Form/ConfirmForm.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
index 804036a..754abce 100644
--- a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
@@ -31,7 +31,7 @@ const ConfirmForm = ({ open, handleClose, rowId, confirmData }) => {
     onSubmit: () => {
       const formData = new FormData();
       formData.append("proposed_amount", proposedAmount);
-      formData.append("expert_description", description);
+      if (description != "") formData.append("expert_description", description);
       handleClose();
       confirmData(CONFIRM_MACHINARY_OFFICE, rowId, formData);
     },