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

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",

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",

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",

src/core/components/Datatable.jsx

@@ -3,7 +3,7 @@ import useLanguage from "@/lib/app/hooks/useLanguage";
 import { Typography } from "@mui/material";
 import axios from "axios";
 import MaterialReactTable from "material-react-table";
-import moment from "moment";
+import moment from "moment-jalaali";
 import { useTranslations } from "next-intl";
 import { useContext, useEffect, useMemo, useState } from "react";
 import useSWR from "swr";
@@ -12,6 +12,7 @@ const DataTable = (props) => {
   const { reloadDataTable, setReloadDataTable } = useContext(
     ReloadDataTableContext
   );
+
   const fetcher = (...args) => {
     return axios
       .get(args, {
@@ -43,8 +44,9 @@ const DataTable = (props) => {
   const [sorting, setSorting] = useState([]);
   const [pagination, setPagination] = useState({ pageIndex: 0, pageSize: 10 });
   const [rowCount, setRowCount] = useState(0);
+  console.log(moment());
   const [updateTime, setupdateTime] = useState(
-    moment().locale(languageApp).format("LL (HH:mm:ss)")
+    moment().format("HH:mm | jYYYY/jM/jD")
   );
 
   const tableLocalization = useMemo(
@@ -97,7 +99,7 @@ const DataTable = (props) => {
   }, [reloadDataTable, setReloadDataTable]);
 
   useEffect(() => {
-    setupdateTime(moment().locale(languageApp).format("LL (HH:mm:ss)"));
+    setupdateTime(moment().format("HH:mm | jYYYY/jM/jD"));
   }, [isValidating, languageApp]);
 
   return (

src/core/utils/theme-rtl.jsx

@@ -4,7 +4,7 @@ import theme from "./theme";
 const themeRtl = createTheme({
   direction: "rtl",
   typography: {
-    fontFamily: `IRANSans, sans-serif`,
+    fontFamily: `IRANSansFaNum, sans-serif`,
   },
   ...theme,
 });