machinary implement

public/locales/fa/app.json

@@ -116,7 +116,8 @@
     "confirm": "تایید",
     "context": "آیا از تایید این آیتم اطمینان دارید",
     "button-confirm": "تایید",
-    "button-cancel": "بستن"
+    "button-cancel": "بستن",
+    "amount_error": "وارد کردن مقدار پیشنهادی الزامیست"
   },
   "RejectDialog": {
     "reject": "عدم تایید",

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>

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;

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>
   );
 };

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

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);
       });
   }, []);