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

2023-07-18 15:25:35 +03:30
parent a0fafed37f ea6903aaa5
commit 57910678e4
36 changed files with 310 additions and 119 deletions
--- a/src/components/dashboard/machinary-office/index.jsx
+++ b/src/components/dashboard/machinary-office/index.jsx
@@ -7,7 +7,12 @@ import { GET_MACHINARY_OFFICE } from "@/core/data/apiRoutes";
 import { useTranslations } from "next-intl";
 import TableRowActions from "./TableRowActions";
 import { format } from "date-fns-jalali";
-
+import {
+  LocalizationProvider,
+  MobileDateTimePicker,
+} from "@mui/x-date-pickers";
+import { AdapterDateFnsJalali } from "@mui/x-date-pickers/AdapterDateFnsJalali";
+import moment from "moment";
 function DashboardMachinaryOfficeComponent() {
  const t = useTranslations();
  const columns = useMemo(
@@ -82,39 +87,55 @@ function DashboardMachinaryOfficeComponent() {
        ),
      },
      {
-        accessorFn: (row) => format(new Date(row.created_at), "yyyy/mm/dd"),
+        accessorFn: (row) =>
+          format(new Date(row.created_at), "HH:mm | yyyy/mm/dd"),
        id: "created_at",
        header: t("MachinaryOffice.created_at"),
        enableColumnFilter: true,
-        datatype: "numeric",
-        filterFn: "equals",
-        columnFilterModeOptions: [
-          "equals",
-          "notEquals",
-          "contains",
-          "lessThan",
-          "greaterThan",
-          "between",
-        ],
-        Cell: ({ renderedCellValue }) => (
-          <Typography variant="body2">{renderedCellValue}</Typography>
-        ),
+        datatype: "date",
+        filterFn: "lessThan",
+        columnFilterModeOptions: ["lessThan", "greaterThan"],
+        Cell: ({ renderedCellValue }) => {
+          return (
+            <Typography variant="body2" style={{ minWidth: "200px" }}>
+              {renderedCellValue}
+            </Typography>
+          );
+        },
+        Header: ({ column }) => <em>{column.columnDef.header}</em>,
+        Filter: ({ column }) => {
+          return (
+            <LocalizationProvider dateAdapter={AdapterDateFnsJalali}>
+              <MobileDateTimePicker
+                onChange={(newValue) => {
+                  const date = new Date(newValue);
+                  const formattedDate = moment(date)
+                    .locale("en")
+                    .format("YYYY-MM-DD HH:mm");
+                  column.setFilterValue(formattedDate);
+                }}
+                slotProps={{
+                  textField: {
+                    helperText: `Filter Mode: ${column.columnDef._filterFn}`,
+                    sx: { minWidth: "120px" },
+                    variant: "standard",
+                  },
+                }}
+                value={moment(column.getFilterValue())
+                  .locale("fa")
+                  .format("yyyy/mm/dd HH:mm")}
+              />
+            </LocalizationProvider>
+          );
+        },
      },
      {
-        accessorFn: (row) => format(new Date(row.updated_at), "yyyy/mm/dd"),
+        accessorFn: (row) =>
+          format(new Date(row.updated_at), "HH:mm | yyyy/mm/dd"),
        id: "updated_at",
        header: t("MachinaryOffice.updated_at"),
-        enableColumnFilter: true,
+        enableColumnFilter: false,
        datatype: "numeric",
-        filterFn: "equals",
-        columnFilterModeOptions: [
-          "equals",
-          "notEquals",
-          "contains",
-          "lessThan",
-          "greaterThan",
-          "between",
-        ],
        Cell: ({ renderedCellValue }) => (
          <Typography variant="body2">{renderedCellValue}</Typography>
        ),
@@ -154,9 +175,9 @@ function DashboardMachinaryOfficeComponent() {
        accessorFn: (row) => row.state_name,
        id: "state_id",
        header: t("MachinaryOffice.state_name"),
-        enableColumnFilter: true,
+        enableColumnFilter: false,
        datatype: "numeric",
-        filterFn: "equals",
+        // filterFn: "equals",
        // filterSelectOptions: [
        // ],
        // filterVariant: "select",
--- a/src/components/dashboard/passenger-office/index.jsx
+++ b/src/components/dashboard/passenger-office/index.jsx
@@ -7,12 +7,16 @@ import { GET_PASSENGER_OFFICE } from "@/core/data/apiRoutes";
 import { useTranslations } from "next-intl";
 import TableRowActions from "./TableRowActions";
 import { format } from "date-fns-jalali";
-import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers";
+import {
+  LocalizationProvider,
+  MobileDateTimePicker,
+} from "@mui/x-date-pickers";
 import { AdapterDateFnsJalali } from "@mui/x-date-pickers/AdapterDateFnsJalali";
 import moment from "moment";

 function DashboardPassengerOfficeComponent() {
  const t = useTranslations();
+
  const columns = useMemo(
    () => [
      {
@@ -86,7 +90,7 @@ function DashboardPassengerOfficeComponent() {
      },
      {
        accessorFn: (row) =>
-          format(new Date(row.created_at), "yyyy/mm/dd HH:mm"),
+          format(new Date(row.created_at), "HH:mm | yyyy/mm/dd"),
        id: "created_at",
        header: t("PassengerOffice.created_at"),
        enableColumnFilter: true,
@@ -94,28 +98,22 @@ function DashboardPassengerOfficeComponent() {
        filterFn: "lessThan",
        columnFilterModeOptions: ["lessThan", "greaterThan"],
        Cell: ({ renderedCellValue }) => {
-          return <Typography variant="body2">{renderedCellValue}</Typography>;
+          return (
+            <Typography variant="body2" style={{ minWidth: "200px" }}>
+              {renderedCellValue}
+            </Typography>
+          );
        },
        Header: ({ column }) => <em>{column.columnDef.header}</em>,
        Filter: ({ column }) => {
          return (
            <LocalizationProvider dateAdapter={AdapterDateFnsJalali}>
-              <DateTimePicker
+              <MobileDateTimePicker
                onChange={(newValue) => {
-                  console.log({ newValue });
                  const date = new Date(newValue);
-                  console.log({ date });
                  const formattedDate = moment(date)
                    .locale("en")
                    .format("YYYY-MM-DD HH:mm");
-                  console.log(formattedDate);
-                  // const formattedDate = format(date, "YYYY-MM-DD HH:mm");
-                  // console.log(
-                  //   "moment",
-                  //   moment(formattedDate)
-                  //     .locale("en")
-                  //     .format("YYYY-MM-DD HH:mm")
-                  // );
                  column.setFilterValue(formattedDate);
                }}
                slotProps={{
@@ -125,27 +123,21 @@ function DashboardPassengerOfficeComponent() {
                    variant: "standard",
                  },
                }}
-                value={column.getFilterValue()}
+                value={moment(column.getFilterValue())
+                  .locale("fa")
+                  .format("yyyy/mm/dd HH:mm")}
              />
            </LocalizationProvider>
          );
        },
      },
      {
-        accessorFn: (row) => format(new Date(row.updated_at), "yyyy/mm/dd"),
+        accessorFn: (row) =>
+          format(new Date(row.updated_at), "HH:mm | yyyy/mm/dd"),
        id: "updated_at",
        header: t("PassengerOffice.updated_at"),
-        enableColumnFilter: true,
+        enableColumnFilter: false,
        datatype: "numeric",
-        filterFn: "equals",
-        columnFilterModeOptions: [
-          "equals",
-          "notEquals",
-          "contains",
-          "lessThan",
-          "greaterThan",
-          "between",
-        ],
        Cell: ({ renderedCellValue }) => (
          <Typography variant="body2">{renderedCellValue}</Typography>
        ),
@@ -185,9 +177,9 @@ function DashboardPassengerOfficeComponent() {
        accessorFn: (row) => row.state_name,
        id: "state_id",
        header: t("PassengerOffice.state_name"),
-        enableColumnFilter: true,
+        enableColumnFilter: false,
        datatype: "numeric",
-        filterFn: "equals",
+        // filterFn: "equals",
        // filterSelectOptions: [
        // ],
        // filterVariant: "select",
--- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/transportation-assistance/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_TRANSPORTATION_ASSISTANCE, rowId);
  };
  return (
--- a/src/components/dashboard/transportation-assistance/Form/RejectForm.jsx
+++ b/src/components/dashboard/transportation-assistance/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 [description, setDescription] = useState("");
  const t = useTranslations();
-  const handleRejectRequest = () => {
-    handleDelete();
-    rejectData(REJECT_TRANSPORTATION_ASSISTANCE, rowId);
+
+  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_TRANSPORTATION_ASSISTANCE, 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>
--- a/src/components/dashboard/transportation-assistance/TableRowActions.jsx
+++ b/src/components/dashboard/transportation-assistance/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>
  );
 };
--- a/src/components/dashboard/transportation-assistance/index.jsx
+++ b/src/components/dashboard/transportation-assistance/index.jsx
@@ -7,7 +7,12 @@ import { GET_TRANSPORTATION_ASSISTANCE } from "@/core/data/apiRoutes";
 import { useTranslations } from "next-intl";
 import TableRowActions from "./TableRowActions";
 import { format } from "date-fns-jalali";
-
+import {
+  LocalizationProvider,
+  MobileDateTimePicker,
+} from "@mui/x-date-pickers";
+import { AdapterDateFnsJalali } from "@mui/x-date-pickers/AdapterDateFnsJalali";
+import moment from "moment";
 function DashboardTransportationAssistanceComponent() {
  const t = useTranslations();
  const columns = useMemo(
@@ -83,39 +88,53 @@ function DashboardTransportationAssistanceComponent() {
        ),
      },
      {
-        accessorFn: (row) => format(new Date(row.created_at), "yyyy/mm/dd"),
+        accessorFn: (row) =>
+          format(new Date(row.created_at), "HH:mm | yyyy/mm/dd"),
        id: "created_at",
        header: t("TransportationAssistance.created_at"),
        enableColumnFilter: true,
-        datatype: "numeric",
-        filterFn: "equals",
-        columnFilterModeOptions: [
-          "equals",
-          "notEquals",
-          "contains",
-          "lessThan",
-          "greaterThan",
-          "between",
-        ],
+        datatype: "date",
+        filterFn: "lessThan",
+        columnFilterModeOptions: ["lessThan", "greaterThan"],
        Cell: ({ renderedCellValue }) => (
-          <Typography variant="body2">{renderedCellValue}</Typography>
+          <Typography variant="body2" style={{ minWidth: "200px" }}>
+            {renderedCellValue}
+          </Typography>
        ),
+        Header: ({ column }) => <em>{column.columnDef.header}</em>,
+        Filter: ({ column }) => {
+          return (
+            <LocalizationProvider dateAdapter={AdapterDateFnsJalali}>
+              <MobileDateTimePicker
+                onChange={(newValue) => {
+                  const date = new Date(newValue);
+                  const formattedDate = moment(date)
+                    .locale("en")
+                    .format("YYYY-MM-DD HH:mm");
+                  column.setFilterValue(formattedDate);
+                }}
+                slotProps={{
+                  textField: {
+                    helperText: `Filter Mode: ${column.columnDef._filterFn}`,
+                    sx: { minWidth: "120px" },
+                    variant: "standard",
+                  },
+                }}
+                value={moment(column.getFilterValue())
+                  .locale("fa")
+                  .format("yyyy/mm/dd HH:mm")}
+              />
+            </LocalizationProvider>
+          );
+        },
      },
      {
-        accessorFn: (row) => format(new Date(row.updated_at), "yyyy/mm/dd"),
+        accessorFn: (row) =>
+          format(new Date(row.updated_at), "HH:mm | yyyy/mm/dd"),
        id: "updated_at",
        header: t("TransportationAssistance.updated_at"),
-        enableColumnFilter: true,
+        enableColumnFilter: false,
        datatype: "numeric",
-        filterFn: "equals",
-        columnFilterModeOptions: [
-          "equals",
-          "notEquals",
-          "contains",
-          "lessThan",
-          "greaterThan",
-          "between",
-        ],
        Cell: ({ renderedCellValue }) => (
          <Typography variant="body2">{renderedCellValue}</Typography>
        ),
@@ -155,9 +174,9 @@ function DashboardTransportationAssistanceComponent() {
        accessorFn: (row) => row.state_name,
        id: "state_id",
        header: t("TransportationAssistance.state_name"),
-        enableColumnFilter: true,
+        enableColumnFilter: false,
        datatype: "numeric",
-        filterFn: "equals",
+        // filterFn: "equals",
        // filterSelectOptions: [
        // ],
        // filterVariant: "select",