Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/machinary_office_implement

public/locales/fa/app.json

@@ -122,6 +122,8 @@
     "reject": "عدم تایید",
     "context": "آیا از عدم تایید این آیتم اطمینان دارید",
     "button-reject": "عدم تایید",
-    "button-cancel": "بستن"
+    "button-cancel": "بستن",
+    "description": "توضیحات",
+    "description_error": "وارد کردن توضیحات الزامی است!"
   }
 }

src/components/dashboard/passenger-office/Form/ConfirmForm.jsx

@@ -9,16 +9,10 @@ import {
 } from "@mui/material";
 import { useTranslations } from "next-intl";
 
-const ConfirmForm = ({
-  open,
-  handleClose,
-  handleDelete,
-  rowId,
-  confirmData,
-}) => {
+const ConfirmForm = ({ open, handleClose, rowId, confirmData }) => {
   const t = useTranslations();
   const handleConfirm = () => {
-    handleDelete();
+    handleClose();
     confirmData(CONFIRM_PASSENGER_OFFICE, rowId);
   };
   return (

src/components/dashboard/passenger-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_PASSENGER_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_PASSENGER_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/passenger-office/TableRowActions.jsx

@@ -14,8 +14,6 @@ const TableRowActions = ({ row }) => {
     handleOpenRejectDialog,
     handleCloseConfirmDialog,
     handleCloseRejectDialog,
-    handleConfirmDialog,
-    handleRejectDialog,
     rowId,
     confirmData,
     rejectData,
@@ -30,23 +28,25 @@ const TableRowActions = ({ 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/lib/app/hooks/useDatatable.jsx

@@ -57,10 +57,10 @@ const useDataTable = () => {
       });
   }, []);
 
-  const rejectData = useCallback(async (url, rowID) => {
-    dispatch({ type: "REJECT_DATA", url: url, rowID: rowID });
+  const rejectData = useCallback(async (url, rowID, values) => {
+    dispatch({ type: "REJECT_DATA", url: url, rowID: rowID, values: values });
     axios
-      .post(`${url}/${rowID}`, {
+      .post(`${url}/${rowID}`,values, {
         headers: { authorization: `Bearer ${token}` },
       })
       .then(() => {
@@ -80,10 +80,6 @@ const useDataTable = () => {
   const handleCloseConfirmDialog = () => {
     setOpenConfirmDialog(false);
   };
-
-  const handleConfirmDialog = () => {
-    setOpenConfirmDialog(false);
-  };
   //End Confirm Data
 
   // Reject Data
@@ -95,19 +91,13 @@ const useDataTable = () => {
   const handleCloseRejectDialog = () => {
     setOpenRejectDialog(false);
   };
-
-  const handleRejectDialog = () => {
-    setOpenRejectDialog(false);
-  };
   // End Reject Data
 
   const contextValue = {
     handleOpenConfirmDialog,
     handleCloseConfirmDialog,
-    handleConfirmDialog,
     handleOpenRejectDialog,
     handleCloseRejectDialog,
-    handleRejectDialog,
     rowId,
     openConfirmDialog,
     openRejectDialog,