Merge tag 'v1.9.2' into develop

v1.9.2

.env.example

@@ -1,5 +1,5 @@
 HOST="rms.witel.ir"
 HOST_RMTO="rms.rmto.ir"
-NEXT_PUBLIC_VERSION="1.9.1"
+NEXT_PUBLIC_VERSION="1.9.2"
 NEXT_PUBLIC_API_URL="https://rms.witel.ir"
 NEXT_PUBLIC_MAPTILE_ENDPOINT="https://rmsmap.rmto.ir/141map"

src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx

@@ -4,7 +4,7 @@ import ViolationsList from "./ViolationsList";
 
 const ViolationsDialog = ({ open, setOpen, mutate }) => {
     return (
-        <Dialog open={open} fullWidth maxWidth="xs">
+        <Dialog open={open} fullWidth maxWidth="sm">
             <IconButton
                 aria-label="close"
                 onClick={() => setOpen(false)}

src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx

@@ -116,6 +116,54 @@ const ViolationsList = ({ setOpen, mutate }) => {
                 },
                 Cell: ({ row }) => <>{row.original.city_name}</>,
             },
+            {
+                accessorKey: "enter_time",
+                header: "تاریخ و ساعت ورود",
+                id: "enter_time",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 140,
+                Cell: ({ cell }) => {
+                    const value = formatDateTime(cell.getValue());
+
+                    if (!value) return "-";
+
+                    return (
+                        <>
+                            <span className="font-medium">{value.date}</span>
+                            <span> - </span>
+                            <span className="text-xs text-muted-foreground">{value.time}</span>
+                        </>
+                    );
+                },
+            },
+            {
+                accessorKey: "exit_time",
+                header: "تاریخ و ساعت خروج",
+                id: "exit_time",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 140,
+                Cell: ({ cell }) => {
+                    const value = formatDateTime(cell.getValue());
+
+                    if (!value) return "-";
+
+                    return (
+                        <div className="flex flex-col leading-tight">
+                            <span className="font-medium">{value.date}</span>
+                            <span> - </span>
+                            <span className="text-xs text-muted-foreground">{value.time}</span>
+                        </div>
+                    );
+                },
+            },
         ];
     }, []);
 
@@ -139,3 +187,22 @@ const ViolationsList = ({ setOpen, mutate }) => {
     );
 };
 export default ViolationsList;
+
+const formatDateTime = (value) => {
+    if (!value) return null;
+
+    const date = new Date(value.replace(" ", "T"));
+
+    return {
+        date: new Intl.DateTimeFormat("fa-IR", {
+            year: "numeric",
+            month: "2-digit",
+            day: "2-digit",
+        }).format(date),
+
+        time: new Intl.DateTimeFormat("fa-IR", {
+            hour: "2-digit",
+            minute: "2-digit",
+        }).format(date),
+    };
+};

src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx

@@ -4,16 +4,19 @@ import { Box } from "@mui/material";
 import { useMemo } from "react";
 import Toolbar from "./Toolbar";
 import RowActions from "./RowActions";
+import { GET_DRIVERS_ACTIVITY_REPORT } from "@/core/utils/routes";
 
-const DriverReportsList = ({ data, specialFilter }) => {
+const DriverReportsList = ({ specialFilter }) => {
     const columns = useMemo(() => {
         return [
             {
                 accessorKey: "driver_id",
                 header: "کد یکتا",
                 id: "driver_id",
-                enableColumnFilter: false,
+                enableColumnFilter: true,
-                enableSorting: false,
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                enableSorting: true,
                 datatype: "numeric",
                 grow: false,
                 size: 50,
@@ -22,8 +25,10 @@ const DriverReportsList = ({ data, specialFilter }) => {
                 accessorKey: "driver_name",
                 header: "نام راننده",
                 id: "driver_name",
-                enableColumnFilter: false,
+                enableColumnFilter: true,
-                enableSorting: false,
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                enableSorting: true,
                 datatype: "text",
                 grow: false,
                 size: 50,
@@ -43,7 +48,7 @@ const DriverReportsList = ({ data, specialFilter }) => {
                 header: "تعداد ماموریت",
                 id: "missions",
                 enableColumnFilter: false,
-                enableSorting: false,
+                enableSorting: true,
                 datatype: "number",
                 grow: false,
                 size: 50,
@@ -56,8 +61,9 @@ const DriverReportsList = ({ data, specialFilter }) => {
         <Box sx={{ p: 1, border: 1, borderColor: "divider", borderRadius: 1 }}>
             <DataTableWithAuth
                 TableToolbar={Toolbar}
+                need_filter={true}
                 columns={columns}
-                data={data.data}
+                table_url={GET_DRIVERS_ACTIVITY_REPORT}
                 page_name={"driverReport"}
                 table_name={"driverReportList"}
                 enablePagination={false}

src/components/dashboard/roadMissions/reports/diverReports/ExcelPrint/index.jsx

@@ -1,8 +1,5 @@
 "use client";
-import {
+import { EXPORT_GET_DRIVER_ACTIVITY_REPORT } from "@/core/utils/routes";
-    EXPORT_GET_DRIVER_COUNTRY_ACTIVITY_REPORT,
-    EXPORT_GET_DRIVER_PROVINCE_ACTIVITY_REPORT,
-} from "@/core/utils/routes";
 import useRequest from "@/lib/hooks/useRequest";
 import { useTheme } from "@emotion/react";
 import DescriptionIcon from "@mui/icons-material/Description";
@@ -34,11 +31,7 @@ const PrintExcel = ({ table, filterData }) => {
 
     const clickHandler = () => {
         setLoading(true);
-        const CountryOrProvince = activeFilters.find((item) => item.id === "province_id");
+        const requestUrl = EXPORT_GET_DRIVER_ACTIVITY_REPORT;
-        const requestUrl =
-            CountryOrProvince.value === "-1"
-                ? EXPORT_GET_DRIVER_COUNTRY_ACTIVITY_REPORT
-                : EXPORT_GET_DRIVER_PROVINCE_ACTIVITY_REPORT;
         requestServer(`${requestUrl}?${filterParams}`, "get", {
             requestOptions: { responseType: "blob" },
         })
@@ -66,7 +59,7 @@ const PrintExcel = ({ table, filterData }) => {
                     disabled={loading}
                     sx={{ textTransform: "unset", alignSelf: "center" }}
                     startIcon={loading ? <CircularProgress size={18} color="inherit" /> : <DescriptionIcon />}
-                    onClick={clickHandler}
+                    // onClick={clickHandler}
                 >
                     خروجی اکسل
                 </Button>

src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/ExcelPrint/index.jsx

@@ -0,0 +1,79 @@
+"use client";
+import { EXPORT_GET_DRIVER_DETAILS_ACTIVITY_REPORT } from "@/core/utils/routes";
+import useRequest from "@/lib/hooks/useRequest";
+import { useTheme } from "@emotion/react";
+import DescriptionIcon from "@mui/icons-material/Description";
+import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material";
+import FileSaver from "file-saver";
+import moment from "jalali-moment";
+import { useMemo, useState } from "react";
+
+const PrintExcel = ({ table, filterData, specialFilterData }) => {
+    const theme = useTheme();
+    const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+    const [loading, setLoading] = useState(false);
+    const requestServer = useRequest({ notificationSuccess: true });
+    const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => {
+        if (filter.value) {
+            acc.push({ id: filter.id, value: filter.value });
+        }
+        return acc;
+    }, []);
+    const activeSpecialFilters = Object.entries(specialFilterData).reduce((acc, [key, filter]) => {
+        if (filter.value) {
+            acc.push({ id: filter.id, value: filter.value });
+        }
+        return acc;
+    }, []);
+    const filterParams = useMemo(() => {
+        const params = new URLSearchParams();
+        activeFilters.length > 0 &&
+            activeFilters.map((filter, index) => {
+                params.set(`${filter.id}`, filter.value);
+            });
+        activeSpecialFilters.length > 0 &&
+            activeSpecialFilters.map((filter, index) => {
+                params.set(`${filter.id}`, filter.value);
+            });
+        return params;
+    }, [activeFilters, activeSpecialFilters]);
+
+    const clickHandler = () => {
+        setLoading(true);
+        const requestUrl = EXPORT_GET_DRIVER_DETAILS_ACTIVITY_REPORT;
+        requestServer(`${requestUrl}?${filterParams}`, "get", {
+            requestOptions: { responseType: "blob" },
+        })
+            .then((response) => {
+                const filename = `خروجی کارتابل ریزگزارشات راننده تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
+                FileSaver.saveAs(response.data, filename);
+            })
+            .catch(() => {})
+            .finally(() => {
+                setLoading(false);
+            });
+    };
+
+    return (
+        <>
+            {isMobile ? (
+                <IconButton aria-label="خروجی اکسل" color="success" onClick={clickHandler}>
+                    <DescriptionIcon sx={{ fontSize: "25px" }} />
+                </IconButton>
+            ) : (
+                <Button
+                    color="success"
+                    variant="contained"
+                    size="small"
+                    disabled={loading}
+                    sx={{ textTransform: "unset", alignSelf: "center" }}
+                    startIcon={loading ? <CircularProgress size={18} color="inherit" /> : <DescriptionIcon />}
+                    // onClick={clickHandler}
+                >
+                    خروجی اکسل
+                </Button>
+            )}
+        </>
+    );
+};
+export default PrintExcel;

src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/Toolbar.jsx

@@ -0,0 +1,11 @@
+import { Box } from "@mui/material";
+import PrintExcel from "./ExcelPrint";
+
+const Toolbar = ({ table, filterData, specialFilterData, mutate }) => {
+    return (
+        <Box sx={{ display: "flex", gap: 1 }}>
+            <PrintExcel table={table} filterData={filterData} specialFilterData={specialFilterData} />
+        </Box>
+    );
+};
+export default Toolbar;

src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx

@@ -1,11 +1,52 @@
+import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency";
 import DataTableWithAuth from "@/core/components/DataTableWithAuth";
 import { GET_DRIVER_DETAILS } from "@/core/utils/routes";
+import useCities from "@/lib/hooks/useCities";
+import useProvinces from "@/lib/hooks/useProvince";
 import { Box } from "@mui/material";
 import { useMemo } from "react";
+import Toolbar from "./Toolbar";
 
 const DriverList = ({ row, specialFilter }) => {
-    const columns = useMemo(
+    const columns = useMemo(() => {
-        () => [
+        const dynamicColumns = {
+            header: "استان",
+            id: "province_id",
+            enableColumnFilter: true,
+            datatype: "numeric",
+            filterMode: "equals",
+            grow: false,
+            size: 130,
+            ColumnSelectComponent: (props) => {
+                const { provinces, errorProvinces, loadingProvinces } = useProvinces();
+                const getColumnSelectOptions = useMemo(() => {
+                    if (loadingProvinces) {
+                        return [{ value: "loading", label: "در حال بارگذاری..." }];
+                    }
+                    if (errorProvinces) {
+                        return [{ value: "error", label: "خطا در بارگذاری" }];
+                    }
+                    return [
+                        { value: "", label: "کل کشور" },
+                        ...provinces.map((province) => ({
+                            value: province.id,
+                            label: province.name_fa,
+                        })),
+                    ];
+                }, [provinces, errorProvinces, loadingProvinces]);
+                return (
+                    <CustomSelectByDependency
+                        {...props}
+                        value={loadingProvinces ? "loading" : props.filterParameters.value}
+                        columnSelectOption={getColumnSelectOptions}
+                    />
+                );
+            },
+            Cell: ({ renderedCellValue, row }) => {
+                return <>{row.original.province_name}</>;
+            },
+        };
+        return [
             {
                 accessorKey: "id",
                 header: "کد یکتا",
@@ -17,27 +58,52 @@ const DriverList = ({ row, specialFilter }) => {
                 grow: false,
                 size: 80,
             },
+            ...[dynamicColumns],
             {
-                accessorKey: "province_name",
-                header: "استان",
-                id: "province_name",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-            {
-                accessorKey: "city_name",
                 header: "شهر",
-                id: "city_name",
+                id: "city_id",
                 enableColumnFilter: true,
-                datatype: "text",
+                datatype: "numeric",
                 filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
+                dependencyId: "province_id",
                 grow: false,
-                size: 100,
+                size: 120,
+                ColumnSelectComponent: (props) => {
+                    const { cityList, loadingCityList, errorCityList } = useCities(props.dependencyFieldValue.value);
+
+                    const getColumnSelectOptions = useMemo(() => {
+                        if (props.dependencyFieldValue.value === "") {
+                            return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }];
+                        }
+                        if (loadingCityList) {
+                            return [{ value: "loading", label: "در حال بارگذاری..." }];
+                        }
+                        if (errorCityList) {
+                            return [{ value: "error", label: "خطا در بارگذاری" }];
+                        }
+                        return [
+                            { value: "", label: "کل ادارات" },
+                            ...cityList.map((edare) => ({
+                                value: edare.id,
+                                label: edare.name_fa,
+                            })),
+                        ];
+                    }, [cityList, loadingCityList, errorCityList]);
+                    return (
+                        <CustomSelectByDependency
+                            {...props}
+                            value={
+                                props.dependencyFieldValue?.value === ""
+                                    ? "empty"
+                                    : loadingCityList
+                                      ? "loading"
+                                      : props.filterParameters.value
+                            }
+                            columnSelectOption={getColumnSelectOptions}
+                        />
+                    );
+                },
+                Cell: ({ row }) => <>{row.original.city_name}</>,
             },
             {
                 accessorKey: "station_name",
@@ -83,19 +149,22 @@ const DriverList = ({ row, specialFilter }) => {
                 grow: false,
                 size: 100,
             },
-        ],
+        ];
-        []
+    }, []);
-    );
 
     return (
         <>
             <Box sx={{ mt: 3 }}>
                 <DataTableWithAuth
+                    TableToolbar={Toolbar}
                     need_filter={true}
                     columns={columns}
                     specialFilter={specialFilter}
+                    specialQueries={{
+                        driver_id: row.driver_id,
+                    }}
                     sorting={[{ id: "id", desc: true }]}
-                    table_url={`${GET_DRIVER_DETAILS}/${row.driver_id}`}
+                    table_url={GET_DRIVER_DETAILS}
                     page_name={"driverListReport"}
                     table_name={"driverList"}
                     positionActionsColumn={"first"}

src/components/dashboard/roadMissions/reports/diverReports/index.jsx

@@ -1,11 +1,9 @@
 "use client";
 import PageTitle from "@/core/components/PageTitle";
-import { GET_DRIVER_COUNTRY_ACTIVITY_REPORT, GET_DRIVER_PROVINCE_ACTIVITY_REPORT } from "@/core/utils/routes";
 import { useAuth } from "@/lib/contexts/auth";
 import { usePermissions } from "@/lib/hooks/usePermissions";
-import useRequest from "@/lib/hooks/useRequest";
 import { yupResolver } from "@hookform/resolvers/yup";
-import { LinearProgress, Stack } from "@mui/material";
+import { Stack } from "@mui/material";
 import moment from "jalali-moment";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
@@ -14,10 +12,8 @@ import DriverReportsList from "./DriverReportsList";
 import SearchReportList from "./Search";
 
 const DriverReportsPage = () => {
-    const [data, setData] = useState(null);
     const { data: userPermissions } = usePermissions();
     const { user } = useAuth();
-    const requestServer = useRequest();
     const hasProvincesPermission = userPermissions?.includes("mission-report-country");
 
     const defaultValues = {
@@ -32,38 +28,32 @@ const DriverReportsPage = () => {
     ];
     const [specialFilter, setSpecialFilter] = useState(defaultFilter);
 
-    const onSearchSubmit = async (data) => {
+    const onSearchSubmit = (data) => {
-        const params = new URLSearchParams();
+        const filters = [
-        params.set("from_date", `${data.from_date} 00:00:00`);
+            {
-        params.set("date_to", `${data.date_to} 23:59:59`);
+                value: `${data.from_date} 00:00:00`,
-        setSpecialFilter([
+                datatype: "date",
-            { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" },
+                id: "start_time",
-            { value: `${data.from_date} 00:00:00`, datatype: "date", id: "start_time", fn: "greaterThan" },
+                fn: "greaterThan",
-            { value: `${data.date_to} 23:59:59`, datatype: "date", id: "finish_time", fn: "lessThan" },
+            },
-        ]);
+            {
-        if (data.province_id === "-1") {
+                value: `${data.date_to} 23:59:59`,
-            try {
+                datatype: "date",
-                const response = await requestServer(`${GET_DRIVER_COUNTRY_ACTIVITY_REPORT}?${params}`);
+                id: "finish_time",
-                const result = response.data.data;
+                fn: "lessThan",
+            },
+        ];
 
-                setData({
+        if (data.province_id !== "-1") {
-                    data: result.activities,
+            filters.unshift({
-                    filters: data,
+                value: data.province_id,
+                datatype: "numeric",
+                id: "province_id",
+                fn: "equals",
             });
-            } catch (e) {}
-        } else {
-            try {
-                params.set("province_id", `${data.province_id}`);
-                const response = await requestServer(`${GET_DRIVER_PROVINCE_ACTIVITY_REPORT}?${params}`);
-
-                const result = response.data.data;
-
-                setData({
-                    data: result.activities,
-                    filters: data,
-                });
-            } catch (e) {}
         }
+
+        setSpecialFilter(filters);
     };
 
     useEffect(() => {
@@ -100,7 +90,7 @@ const DriverReportsPage = () => {
                 handleSubmit={handleSubmit}
                 onSearchSubmit={onSearchSubmit}
             />
-            {!data ? <LinearProgress /> : <DriverReportsList specialFilter={specialFilter} data={data} />}
+            <DriverReportsList specialFilter={specialFilter} />
         </Stack>
     );
 };

src/components/dashboard/roadMissions/reports/machinesReports/ExcelPrint/index.jsx

@@ -1,8 +1,5 @@
 "use client";
-import {
+import { EXPORT_GET_MACHINES_ACTIVITY_REPORT } from "@/core/utils/routes";
-    EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT,
-    EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT,
-} from "@/core/utils/routes";
 import useRequest from "@/lib/hooks/useRequest";
 import { useTheme } from "@emotion/react";
 import DescriptionIcon from "@mui/icons-material/Description";
@@ -34,16 +31,12 @@ const PrintExcel = ({ table, filterData }) => {
 
     const clickHandler = () => {
         setLoading(true);
-        const CountryOrProvince = activeFilters.find((item) => item.id === "province_id");
+        const requestUrl = EXPORT_GET_MACHINES_ACTIVITY_REPORT;
-        const requestUrl =
-            CountryOrProvince.value === "-1"
-                ? EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT
-                : EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT;
         requestServer(`${requestUrl}?${filterParams}`, "get", {
             requestOptions: { responseType: "blob" },
         })
             .then((response) => {
-                const filename = `خروجی کارتابل گزارشات گشت راهداری تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
+                const filename = `خروجی کارتابل گزارشات ماشین ها تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
                 FileSaver.saveAs(response.data, filename);
             })
             .catch(() => {})
@@ -66,7 +59,7 @@ const PrintExcel = ({ table, filterData }) => {
                     disabled={loading}
                     sx={{ textTransform: "unset", alignSelf: "center" }}
                     startIcon={loading ? <CircularProgress size={18} color="inherit" /> : <DescriptionIcon />}
-                    onClick={clickHandler}
+                    // onClick={clickHandler}
                 >
                     خروجی اکسل
                 </Button>

src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx

@@ -4,17 +4,24 @@ import { Box } from "@mui/material";
 import { useMemo } from "react";
 import Toolbar from "./Toolbar";
 import RowActions from "./RowActions";
+import {
+    GET_MACHINES_ACTIVITY_REPORT,
+    GET_MACHINES_COUNTRY_ACTIVITY_REPORT,
+    GET_MACHINES_PROVINCE_ACTIVITY_REPORT,
+} from "@/core/utils/routes";
 
-const MachinesReportsList = ({ data, specialFilter }) => {
+const MachinesReportsList = ({ specialFilter }) => {
     const columns = useMemo(() => {
         return [
             {
                 accessorKey: "machine_id",
                 header: "کد یکتا",
                 id: "machine_id",
-                enableColumnFilter: false,
+                enableColumnFilter: true,
-                enableSorting: false,
+                filterMode: "equals",
-                datatype: "numeric",
+                columnFilterModeOptions: ["equals", "contains"],
+                enableSorting: true,
+                datatype: "text",
                 grow: false,
                 size: 50,
             },
@@ -23,7 +30,9 @@ const MachinesReportsList = ({ data, specialFilter }) => {
                 header: "مدل ماشین",
                 id: "car_name",
                 enableColumnFilter: false,
-                enableSorting: false,
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                enableSorting: true,
                 datatype: "text",
                 grow: false,
                 size: 50,
@@ -32,7 +41,8 @@ const MachinesReportsList = ({ data, specialFilter }) => {
                 accessorKey: "machine_code",
                 header: "کد ماشین",
                 id: "machine_code",
-                enableColumnFilter: false,
+                enableColumnFilter: true,
+                columnFilterModeOptions: ["equals", "contains"],
                 enableSorting: false,
                 datatype: "text",
                 grow: false,
@@ -43,7 +53,8 @@ const MachinesReportsList = ({ data, specialFilter }) => {
                 header: "کارکرد",
                 id: "func",
                 enableColumnFilter: false,
-                enableSorting: false,
+                columnFilterModeOptions: ["equals", "contains"],
+                enableSorting: true,
                 datatype: "number",
                 grow: false,
                 size: 50,
@@ -53,7 +64,7 @@ const MachinesReportsList = ({ data, specialFilter }) => {
                 header: "تعداد ماموریت",
                 id: "missions",
                 enableColumnFilter: false,
-                enableSorting: false,
+                enableSorting: true,
                 datatype: "number",
                 grow: false,
                 size: 50,
@@ -67,11 +78,12 @@ const MachinesReportsList = ({ data, specialFilter }) => {
             <DataTableWithAuth
                 TableToolbar={Toolbar}
                 columns={columns}
-                data={data.data}
+                table_url={GET_MACHINES_ACTIVITY_REPORT}
                 page_name={"roadMissionReport"}
                 table_name={"roadMissionReportList"}
-                enablePagination={false}
+                enablePagination={true}
                 specialFilter={specialFilter}
+                need_filter={true}
                 enableRowActions
                 RowActions={RowActionsWithRowData}
             />

src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/ExcelPrint/index.jsx

@@ -0,0 +1,70 @@
+"use client";
+import { EXPORT_GET_MACHINES_ACTIVITY_REPORT } from "@/core/utils/routes";
+import useRequest from "@/lib/hooks/useRequest";
+import { useTheme } from "@emotion/react";
+import DescriptionIcon from "@mui/icons-material/Description";
+import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material";
+import FileSaver from "file-saver";
+import moment from "jalali-moment";
+import { useMemo, useState } from "react";
+
+const PrintExcel = ({ table, filterData }) => {
+    const theme = useTheme();
+    const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+    const [loading, setLoading] = useState(false);
+    const requestServer = useRequest({ notificationSuccess: true });
+    const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => {
+        if (filter.value) {
+            acc.push({ id: filter.id, value: filter.value });
+        }
+        return acc;
+    }, []);
+
+    const filterParams = useMemo(() => {
+        const params = new URLSearchParams();
+        activeFilters.length > 0 &&
+            activeFilters.map((filter, index) => {
+                params.set(`${filter.id}`, filter.value);
+            });
+        return params;
+    }, [activeFilters]);
+
+    const clickHandler = () => {
+        setLoading(true);
+        const requestUrl = EXPORT_GET_MACHINES_ACTIVITY_REPORT;
+        requestServer(`${requestUrl}?${filterParams}`, "get", {
+            requestOptions: { responseType: "blob" },
+        })
+            .then((response) => {
+                const filename = `خروجی کارتابل گزارشات ماشین ها تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
+                FileSaver.saveAs(response.data, filename);
+            })
+            .catch(() => {})
+            .finally(() => {
+                setLoading(false);
+            });
+    };
+
+    return (
+        <>
+            {isMobile ? (
+                <IconButton aria-label="خروجی اکسل" color="success" onClick={clickHandler}>
+                    <DescriptionIcon sx={{ fontSize: "25px" }} />
+                </IconButton>
+            ) : (
+                <Button
+                    color="success"
+                    variant="contained"
+                    size="small"
+                    disabled={loading}
+                    sx={{ textTransform: "unset", alignSelf: "center" }}
+                    startIcon={loading ? <CircularProgress size={18} color="inherit" /> : <DescriptionIcon />}
+                    // onClick={clickHandler}
+                >
+                    خروجی اکسل
+                </Button>
+            )}
+        </>
+    );
+};
+export default PrintExcel;

src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/Toolbar.jsx

@@ -0,0 +1,11 @@
+import { Box } from "@mui/material";
+import PrintExcel from "./ExcelPrint";
+
+const Toolbar = ({ table, filterData, mutate }) => {
+    return (
+        <Box sx={{ display: "flex", gap: 1 }}>
+            <PrintExcel table={table} filterData={filterData} />
+        </Box>
+    );
+};
+export default Toolbar;

src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx

@@ -1,11 +1,52 @@
+import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency";
 import DataTableWithAuth from "@/core/components/DataTableWithAuth";
 import { GET_MACHINE_MISSIONS_DETAILS } from "@/core/utils/routes";
+import useCities from "@/lib/hooks/useCities";
+import useProvinces from "@/lib/hooks/useProvince";
 import { Box } from "@mui/material";
 import { useMemo } from "react";
+import Toolbar from "./Toolbar";
 
 const MachineMissionsList = ({ row, specialFilter }) => {
-    const columns = useMemo(
+    const columns = useMemo(() => {
-        () => [
+        const dynamicColumns = {
+            header: "استان",
+            id: "province_id",
+            enableColumnFilter: true,
+            datatype: "numeric",
+            filterMode: "equals",
+            grow: false,
+            size: 130,
+            ColumnSelectComponent: (props) => {
+                const { provinces, errorProvinces, loadingProvinces } = useProvinces();
+                const getColumnSelectOptions = useMemo(() => {
+                    if (loadingProvinces) {
+                        return [{ value: "loading", label: "در حال بارگذاری..." }];
+                    }
+                    if (errorProvinces) {
+                        return [{ value: "error", label: "خطا در بارگذاری" }];
+                    }
+                    return [
+                        { value: "", label: "کل کشور" },
+                        ...provinces.map((province) => ({
+                            value: province.id,
+                            label: province.name_fa,
+                        })),
+                    ];
+                }, [provinces, errorProvinces, loadingProvinces]);
+                return (
+                    <CustomSelectByDependency
+                        {...props}
+                        value={loadingProvinces ? "loading" : props.filterParameters.value}
+                        columnSelectOption={getColumnSelectOptions}
+                    />
+                );
+            },
+            Cell: ({ renderedCellValue, row }) => {
+                return <>{row.original.province_name}</>;
+            },
+        };
+        return [
             {
                 accessorKey: "id",
                 header: "کد یکتا",
@@ -17,27 +58,52 @@ const MachineMissionsList = ({ row, specialFilter }) => {
                 grow: false,
                 size: 80,
             },
+            ...[dynamicColumns],
             {
-                accessorKey: "province_name",
-                header: "استان",
-                id: "province_name",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-            {
-                accessorKey: "city_name",
                 header: "شهر",
-                id: "city_name",
+                id: "city_id",
                 enableColumnFilter: true,
-                datatype: "text",
+                datatype: "numeric",
                 filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
+                dependencyId: "province_id",
                 grow: false,
-                size: 100,
+                size: 120,
+                ColumnSelectComponent: (props) => {
+                    const { cityList, loadingCityList, errorCityList } = useCities(props.dependencyFieldValue.value);
+
+                    const getColumnSelectOptions = useMemo(() => {
+                        if (props.dependencyFieldValue.value === "") {
+                            return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }];
+                        }
+                        if (loadingCityList) {
+                            return [{ value: "loading", label: "در حال بارگذاری..." }];
+                        }
+                        if (errorCityList) {
+                            return [{ value: "error", label: "خطا در بارگذاری" }];
+                        }
+                        return [
+                            { value: "", label: "کل ادارات" },
+                            ...cityList.map((edare) => ({
+                                value: edare.id,
+                                label: edare.name_fa,
+                            })),
+                        ];
+                    }, [cityList, loadingCityList, errorCityList]);
+                    return (
+                        <CustomSelectByDependency
+                            {...props}
+                            value={
+                                props.dependencyFieldValue?.value === ""
+                                    ? "empty"
+                                    : loadingCityList
+                                      ? "loading"
+                                      : props.filterParameters.value
+                            }
+                            columnSelectOption={getColumnSelectOptions}
+                        />
+                    );
+                },
+                Cell: ({ row }) => <>{row.original.city_name}</>,
             },
             {
                 accessorKey: "station_name",
@@ -83,15 +149,15 @@ const MachineMissionsList = ({ row, specialFilter }) => {
                 grow: false,
                 size: 100,
             },
-        ],
+        ];
-        []
+    }, []);
-    );
 
     return (
         <>
             <Box sx={{ mt: 3 }}>
                 <DataTableWithAuth
                     specialFilter={specialFilter}
+                    TableToolbar={Toolbar}
                     need_filter={true}
                     columns={columns}
                     sorting={[{ id: "id", desc: true }]}

src/components/dashboard/roadMissions/reports/machinesReports/index.jsx

@@ -1,11 +1,9 @@
 "use client";
 import PageTitle from "@/core/components/PageTitle";
-import { GET_MACHINES_COUNTRY_ACTIVITY_REPORT, GET_MACHINES_PROVINCE_ACTIVITY_REPORT } from "@/core/utils/routes";
 import { useAuth } from "@/lib/contexts/auth";
 import { usePermissions } from "@/lib/hooks/usePermissions";
-import useRequest from "@/lib/hooks/useRequest";
 import { yupResolver } from "@hookform/resolvers/yup";
-import { LinearProgress, Stack } from "@mui/material";
+import { Stack } from "@mui/material";
 import moment from "jalali-moment";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
@@ -14,10 +12,8 @@ import MachinesReportsList from "./MachinesReportsList";
 import SearchReportList from "./Search";
 
 const MachinesReportsPage = () => {
-    const [data, setData] = useState(null);
     const { data: userPermissions } = usePermissions();
     const { user } = useAuth();
-    const requestServer = useRequest();
     const hasProvincesPermission = userPermissions?.includes("mission-report-country");
 
     const defaultValues = {
@@ -32,38 +28,32 @@ const MachinesReportsPage = () => {
     ];
     const [specialFilter, setSpecialFilter] = useState(defaultFilter);
 
-    const onSearchSubmit = async (data) => {
+    const onSearchSubmit = (data) => {
-        const params = new URLSearchParams();
+        const filters = [
-        params.set("from_date", `${data.from_date} 00:00:00`);
+            {
-        params.set("date_to", `${data.date_to} 23:59:59`);
+                value: `${data.from_date} 00:00:00`,
-        setSpecialFilter([
+                datatype: "date",
-            { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" },
+                id: "start_time",
-            { value: `${data.from_date} 00:00:00`, datatype: "date", id: "start_time", fn: "greaterThan" },
+                fn: "greaterThan",
-            { value: `${data.date_to} 23:59:59`, datatype: "date", id: "finish_time", fn: "lessThan" },
+            },
-        ]);
+            {
-        if (data.province_id === "-1") {
+                value: `${data.date_to} 23:59:59`,
-            try {
+                datatype: "date",
-                const response = await requestServer(`${GET_MACHINES_COUNTRY_ACTIVITY_REPORT}?${params}`);
+                id: "finish_time",
-                const result = response.data.data;
+                fn: "lessThan",
+            },
+        ];
 
-                setData({
+        if (data.province_id !== "-1") {
-                    data: result.activities,
+            filters.unshift({
-                    filters: data,
+                value: data.province_id,
+                datatype: "numeric",
+                id: "province_id",
+                fn: "equals",
             });
-            } catch (e) {}
-        } else {
-            try {
-                params.set("province_id", `${data.province_id}`);
-                const response = await requestServer(`${GET_MACHINES_PROVINCE_ACTIVITY_REPORT}?${params}`);
-
-                const result = response.data.data;
-
-                setData({
-                    data: result.activities,
-                    filters: data,
-                });
-            } catch (e) {}
         }
+
+        setSpecialFilter(filters);
     };
 
     useEffect(() => {
@@ -100,7 +90,7 @@ const MachinesReportsPage = () => {
                 handleSubmit={handleSubmit}
                 onSearchSubmit={onSearchSubmit}
             />
-            {!data ? <LinearProgress /> : <MachinesReportsList specialFilter={specialFilter} data={data} />}
+            <MachinesReportsList specialFilter={specialFilter} />
         </Stack>
     );
 };

src/components/dashboard/roadMissions/reports/machinesTypeReports/ExcelPrint/index.jsx

@@ -1,10 +1,5 @@
 "use client";
-import {
+import { EXPORT_GET_MACHINES_TYPE_ACTIVITY_REPORT } from "@/core/utils/routes";
-    EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT,
-    EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT,
-    EXPORT_GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT,
-    EXPORT_GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT,
-} from "@/core/utils/routes";
 import useRequest from "@/lib/hooks/useRequest";
 import { useTheme } from "@emotion/react";
 import DescriptionIcon from "@mui/icons-material/Description";
@@ -36,16 +31,12 @@ const PrintExcel = ({ table, filterData }) => {
 
     const clickHandler = () => {
         setLoading(true);
-        const CountryOrProvince = activeFilters.find((item) => item.id === "province_id");
+        const requestUrl = EXPORT_GET_MACHINES_TYPE_ACTIVITY_REPORT;
-        const requestUrl =
-            CountryOrProvince.value === "-1"
-                ? EXPORT_GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT
-                : EXPORT_GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT;
         requestServer(`${requestUrl}?${filterParams}`, "get", {
             requestOptions: { responseType: "blob" },
         })
             .then((response) => {
-                const filename = `خروجی کارتابل گزارشات گشت راهداری تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
+                const filename = `خروجی کارتابل گزارشات نوع ماشین تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
                 FileSaver.saveAs(response.data, filename);
             })
             .catch(() => {})
@@ -68,7 +59,7 @@ const PrintExcel = ({ table, filterData }) => {
                     disabled={loading}
                     sx={{ textTransform: "unset", alignSelf: "center" }}
                     startIcon={loading ? <CircularProgress size={18} color="inherit" /> : <DescriptionIcon />}
-                    onClick={clickHandler}
+                    // onClick={clickHandler}
                 >
                     خروجی اکسل
                 </Button>

src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx

@@ -3,17 +3,20 @@ import DataTableWithAuth from "@/core/components/DataTableWithAuth";
 import { Box } from "@mui/material";
 import { useMemo } from "react";
 import Toolbar from "./Toolbar";
-// import RowActions from "./RowActions";
+import { GET_MACHINES_TYPE_ACTIVITY_REPORT } from "@/core/utils/routes";
+import RowActions from "./RowActions";
 
-const MachinesReportsList = ({ data, specialFilter }) => {
+const MachinesReportsList = ({ specialFilter }) => {
     const columns = useMemo(() => {
         return [
             {
                 accessorKey: "car_type",
                 header: "نوع ماشین",
                 id: "car_type",
-                enableColumnFilter: false,
+                enableColumnFilter: true,
-                enableSorting: false,
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                enableSorting: true,
                 datatype: "text",
                 grow: false,
                 size: 50,
@@ -23,7 +26,7 @@ const MachinesReportsList = ({ data, specialFilter }) => {
                 header: "کارکرد",
                 id: "func",
                 enableColumnFilter: false,
-                enableSorting: false,
+                enableSorting: true,
                 datatype: "number",
                 grow: false,
                 size: 50,
@@ -33,7 +36,7 @@ const MachinesReportsList = ({ data, specialFilter }) => {
                 header: "تعداد ماموریت",
                 id: "missions",
                 enableColumnFilter: false,
-                enableSorting: false,
+                enableSorting: true,
                 datatype: "number",
                 grow: false,
                 size: 50,
@@ -46,13 +49,14 @@ const MachinesReportsList = ({ data, specialFilter }) => {
             <DataTableWithAuth
                 TableToolbar={Toolbar}
                 columns={columns}
-                data={data.data}
+                table_url={GET_MACHINES_TYPE_ACTIVITY_REPORT}
                 page_name={"roadMissionReportMachineTypeReport"}
                 table_name={"roadMissionReportMachineTypeReportList"}
                 enablePagination={false}
                 specialFilter={specialFilter}
-                // enableRowActions
+                need_filter={true}
-                // RowActions={RowActions}
+                enableRowActions
+                RowActions={RowActions}
             />
         </Box>
     );

src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/ExcelPrint/index.jsx

@@ -0,0 +1,70 @@
+"use client";
+import { EXPORT_GET_MACHINES_TYPE_ACTIVITY_REPORT } from "@/core/utils/routes";
+import useRequest from "@/lib/hooks/useRequest";
+import { useTheme } from "@emotion/react";
+import DescriptionIcon from "@mui/icons-material/Description";
+import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material";
+import FileSaver from "file-saver";
+import moment from "jalali-moment";
+import { useMemo, useState } from "react";
+
+const PrintExcel = ({ table, filterData }) => {
+    const theme = useTheme();
+    const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+    const [loading, setLoading] = useState(false);
+    const requestServer = useRequest({ notificationSuccess: true });
+    const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => {
+        if (filter.value) {
+            acc.push({ id: filter.id, value: filter.value });
+        }
+        return acc;
+    }, []);
+
+    const filterParams = useMemo(() => {
+        const params = new URLSearchParams();
+        activeFilters.length > 0 &&
+            activeFilters.map((filter, index) => {
+                params.set(`${filter.id}`, filter.value);
+            });
+        return params;
+    }, [activeFilters]);
+
+    const clickHandler = () => {
+        setLoading(true);
+        const requestUrl = EXPORT_GET_MACHINES_TYPE_ACTIVITY_REPORT;
+        requestServer(`${requestUrl}?${filterParams}`, "get", {
+            requestOptions: { responseType: "blob" },
+        })
+            .then((response) => {
+                const filename = `خروجی کارتابل گزارشات نوع ماشین تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
+                FileSaver.saveAs(response.data, filename);
+            })
+            .catch(() => {})
+            .finally(() => {
+                setLoading(false);
+            });
+    };
+
+    return (
+        <>
+            {isMobile ? (
+                <IconButton aria-label="خروجی اکسل" color="success" onClick={clickHandler}>
+                    <DescriptionIcon sx={{ fontSize: "25px" }} />
+                </IconButton>
+            ) : (
+                <Button
+                    color="success"
+                    variant="contained"
+                    size="small"
+                    disabled={loading}
+                    sx={{ textTransform: "unset", alignSelf: "center" }}
+                    startIcon={loading ? <CircularProgress size={18} color="inherit" /> : <DescriptionIcon />}
+                    // onClick={clickHandler}
+                >
+                    خروجی اکسل
+                </Button>
+            )}
+        </>
+    );
+};
+export default PrintExcel;

src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/Toolbar.jsx

@@ -0,0 +1,11 @@
+import { Box } from "@mui/material";
+import PrintExcel from "./ExcelPrint";
+
+const Toolbar = ({ table, filterData, mutate }) => {
+    return (
+        <Box sx={{ display: "flex", gap: 1 }}>
+            <PrintExcel table={table} filterData={filterData} />
+        </Box>
+    );
+};
+export default Toolbar;

src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx

@@ -1,7 +1,8 @@
 import DataTableWithAuth from "@/core/components/DataTableWithAuth";
-import { GET_MACHINE_MISSIONS_DETAILS, GET_MACHINE_TYPE_MISSIONS_DETAILS } from "@/core/utils/routes";
+import { GET_MACHINE_TYPE_MISSIONS_DETAILS } from "@/core/utils/routes";
 import { Box } from "@mui/material";
 import { useMemo } from "react";
+import Toolbar from "./Toolbar";
 
 const MachineMissionsList = ({ row }) => {
     const columns = useMemo(
@@ -91,10 +92,14 @@ const MachineMissionsList = ({ row }) => {
         <>
             <Box sx={{ mt: 3 }}>
                 <DataTableWithAuth
+                    TableToolbar={Toolbar}
                     need_filter={true}
                     columns={columns}
+                    specialQueries={{
+                        car_type: row.car_type,
+                    }}
                     sorting={[{ id: "id", desc: true }]}
-                    table_url={`${GET_MACHINE_TYPE_MISSIONS_DETAILS}?car_type=${row.car_type}`}
+                    table_url={GET_MACHINE_TYPE_MISSIONS_DETAILS}
                     page_name={"roadMissionReportMachineType"}
                     table_name={"roadMissionReportMachineTypeList"}
                     positionActionsColumn={"first"}

src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/index.jsx

@@ -1,6 +1,10 @@
-// import MissionDetails from "./MissionDitails";
+import MissionDetails from "./MissionDitails";
 
 const RowActions = ({ row }) => {
-    return <>{/*<MissionDetails row={row} />*/}</>;
+    return (
+        <>
+            <MissionDetails row={row} />
+        </>
+    );
 };
 export default RowActions;

src/components/dashboard/roadMissions/reports/machinesTypeReports/index.jsx

@@ -1,14 +1,9 @@
 "use client";
 import PageTitle from "@/core/components/PageTitle";
-import {
-    GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT,
-    GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT,
-} from "@/core/utils/routes";
 import { useAuth } from "@/lib/contexts/auth";
 import { usePermissions } from "@/lib/hooks/usePermissions";
-import useRequest from "@/lib/hooks/useRequest";
 import { yupResolver } from "@hookform/resolvers/yup";
-import { LinearProgress, Stack } from "@mui/material";
+import { Stack } from "@mui/material";
 import moment from "jalali-moment";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
@@ -17,10 +12,8 @@ import MachinesReportsList from "./MachinesReportsList";
 import SearchReportList from "./Search";
 
 const MachinesTypeReportsPage = () => {
-    const [data, setData] = useState(null);
     const { data: userPermissions } = usePermissions();
     const { user } = useAuth();
-    const requestServer = useRequest();
     const hasProvincesPermission = userPermissions?.includes("mission-report-country");
 
     const defaultValues = {
@@ -30,43 +23,37 @@ const MachinesTypeReportsPage = () => {
     };
     const defaultFilter = [
         { value: `${defaultValues.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" },
-        { value: `${defaultValues.from_date}`, datatype: "date", id: "from_date", fn: "between" },
+        { value: `${defaultValues.from_date} 00:00:00`, datatype: "date", id: "start_time", fn: "greaterThan" },
-        { value: `${defaultValues.date_to}`, datatype: "date", id: "date_to", fn: "between" },
+        { value: `${defaultValues.date_to} 23:59:59`, datatype: "date", id: "finish_time", fn: "lessThan" },
     ];
     const [specialFilter, setSpecialFilter] = useState(defaultFilter);
 
-    const onSearchSubmit = async (data) => {
+    const onSearchSubmit = (data) => {
-        const params = new URLSearchParams();
+        const filters = [
-        params.set("from_date", `${data.from_date} 00:00:00`);
+            {
-        params.set("date_to", `${data.date_to} 23:59:59`);
+                value: `${data.from_date} 00:00:00`,
-        setSpecialFilter([
+                datatype: "date",
-            { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" },
+                id: "start_time",
-            { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" },
+                fn: "greaterThan",
-            { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" },
+            },
-        ]);
+            {
-        if (data.province_id === "-1") {
+                value: `${data.date_to} 23:59:59`,
-            try {
+                datatype: "date",
-                const response = await requestServer(`${GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT}?${params}`);
+                id: "finish_time",
-                const result = response.data.data;
+                fn: "lessThan",
+            },
+        ];
 
-                setData({
+        if (data.province_id !== "-1") {
-                    data: result.activities,
+            filters.unshift({
-                    filters: data,
+                value: data.province_id,
+                datatype: "numeric",
+                id: "province_id",
+                fn: "equals",
             });
-            } catch (e) {}
-        } else {
-            try {
-                params.set("province_id", `${data.province_id}`);
-                const response = await requestServer(`${GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT}?${params}`);
-
-                const result = response.data.data;
-
-                setData({
-                    data: result.activities,
-                    filters: data,
-                });
-            } catch (e) {}
         }
+
+        setSpecialFilter(filters);
     };
 
     useEffect(() => {
@@ -103,7 +90,7 @@ const MachinesTypeReportsPage = () => {
                 handleSubmit={handleSubmit}
                 onSearchSubmit={onSearchSubmit}
             />
-            {!data ? <LinearProgress /> : <MachinesReportsList specialFilter={specialFilter} data={data} />}
+            <MachinesReportsList specialFilter={specialFilter} />
         </Stack>
     );
 };

src/components/dashboard/roadMissions/violations/Actions/DeleteViolation/DeleteContent.jsx

@@ -0,0 +1,42 @@
+import { Button, DialogActions, DialogContent, Stack, Typography } from "@mui/material";
+import React, { useState } from "react";
+import useRequest from "@/lib/hooks/useRequest";
+import { DELETE_VIOLATION } from "@/core/utils/routes";
+
+const DeleteContent = ({ rowId, mutate, setOpenDeleteDialog }) => {
+    const [submitting, setSubmitting] = useState(false);
+    const requestServer = useRequest({ notificationSuccess: true });
+    const handleClick = () => {
+        setSubmitting(true);
+        requestServer(`${DELETE_VIOLATION}/${rowId}`, "delete", {
+            hasSidebarUpdate: true,
+        })
+            .then(() => {
+                mutate();
+                setOpenDeleteDialog(false);
+                setSubmitting(false);
+            })
+            .catch(() => {
+                setSubmitting(false);
+            });
+    };
+    return (
+        <>
+            <DialogContent>
+                <Stack alignItems="center" spacing={2}>
+                    <Typography mt={2}>آیا از حذف تخلف اطمینان دارید؟</Typography>
+                </Stack>
+            </DialogContent>
+            <DialogActions sx={{ justifyContent: "center", paddingBottom: 2, width: "100%" }}>
+                <Button onClick={() => setOpenDeleteDialog(false)} variant="outlined" color="secondary">
+                    خیر !
+                </Button>
+                <Button onClick={handleClick} variant="contained" color="error" disabled={submitting}>
+                    {submitting ? "درحال حذف..." : "بله اطمینان دارم"}
+                </Button>
+            </DialogActions>
+        </>
+    );
+};
+
+export default DeleteContent;

src/components/dashboard/roadMissions/violations/Actions/DeleteViolation/index.jsx

@@ -0,0 +1,33 @@
+import { useState } from "react";
+import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material";
+import DeleteIcon from "@mui/icons-material/Delete";
+import DeleteContent from "./DeleteContent";
+
+const DeleteViolation = ({ mutate, rowId }) => {
+    const [openDeleteDialog, setOpenDeleteDialog] = useState(false);
+
+    return (
+        <>
+            <Tooltip title="حذف">
+                <IconButton color="error" onClick={() => setOpenDeleteDialog(true)}>
+                    <DeleteIcon />
+                </IconButton>
+            </Tooltip>
+            <Dialog
+                open={openDeleteDialog}
+                onClose={() => setOpenDeleteDialog(false)}
+                PaperProps={{
+                    sx: {
+                        boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px",
+                    },
+                }}
+                dir="rtl"
+                maxWidth={"md"}
+            >
+                <DialogTitle>حذف تخلف</DialogTitle>
+                <DeleteContent rowId={rowId} mutate={mutate} setOpenDeleteDialog={setOpenDeleteDialog} />
+            </Dialog>
+        </>
+    );
+};
+export default DeleteViolation;

src/components/dashboard/roadMissions/violations/RowActions/index.jsx

@@ -1,5 +1,6 @@
 // import CreateWithoutProcess from "../Actions/CreateWithoutProcess";
 import EditViolation from "../Actions/EditViolation";
+import DeleteViolation from "../Actions/DeleteViolation";
 
 const RowActions = ({ row, mutate }) => {
     // const canEdit = row.original.status === 0 && row.original.type === 1;
@@ -7,6 +8,7 @@ const RowActions = ({ row, mutate }) => {
         <>
             {!row.original.mileage && <EditViolation row={row} mutate={mutate} rowId={row.getValue("id")} />}
             {/*{canEdit && <CreateWithoutProcess row={row} mutate={mutate} />}*/}
+            <DeleteViolation rowId={row.getValue("id")} mutate={mutate} />
         </>
     );
 };

src/components/dashboard/roadMissions/violations/ViolationsList.jsx

@@ -61,23 +61,6 @@ const ViolationsList = () => {
                 columnFilterModeOptions: ["equals", "contains"],
                 grow: false,
             },
-            {
-                accessorKey: "status",
-                header: "وضعیت",
-                id: "status",
-                enableColumnFilter: true,
-                datatype: "numeric",
-                filterMode: "equals",
-                sortDescFirst: true,
-                grow: false,
-                columnSelectOption: () => {
-                    return violationsCategoryStatus.map((category) => ({
-                        value: category.id,
-                        label: category.name_fa,
-                    }));
-                },
-                Cell: ({ row }) => (row.original.type === 1 ? "خروج بدون مجوز" : "عدم تحرک"),
-            },
             {
                 accessorKey: "machine_code",
                 header: "کد خودرو",
@@ -142,16 +125,6 @@ const ViolationsList = () => {
                 grow: false,
                 Cell: ({ row }) => row.original.machine?.car_name || "-",
             },
-            {
-                accessorKey: "mission_id",
-                header: "کد ماموریت",
-                id: "mission_id",
-                enableColumnFilter: false,
-                datatype: "numeric",
-                filterMode: "equals",
-                grow: false,
-                Cell: ({ row }) => row.original.mission_id || "-",
-            },
             {
                 accessorKey: "request_date",
                 header: "تاریخ تخلف",

src/core/components/DataTable/Main.js

@@ -38,6 +38,7 @@ const DataTable_Main = (props) => {
         RowActions,
         specific_data,
         specialFilter,
+        specialQueries,
     } = props;
     const flatColumns = flattenArrayOfObjects(columns, "columns");
     const [pagination, setPagination] = useState({ pageIndex: 0, pageSize: 10 });
@@ -70,8 +71,15 @@ const DataTable_Main = (props) => {
                 }))
             )
         );
+        if (specialQueries) {
+            Object.entries(specialQueries).forEach(([key, value]) => {
+                if (value !== undefined && value !== null && value !== "") {
+                    params.set(key, String(value));
+                }
+            });
+        }
         return `${table_url}?${params}`;
-    }, [table_url, filterData, pagination, sortData, specialFilter]);
+    }, [table_url, filterData, pagination, sortData, specialFilter, specialQueries]);
 
     const fetcher = async (url) => {
         try {
@@ -152,7 +160,12 @@ const DataTable_Main = (props) => {
         renderTopToolbarCustomActions: ({ table }) => (
             <>
                 {TableToolbar && (
-                    <TableToolbar table={table} mutate={mutate} filterData={specialFilter || filterData} />
+                    <TableToolbar
+                        table={table}
+                        mutate={mutate}
+                        filterData={specialFilter || filterData}
+                        specialFilterData={filterData}
+                    />
                 )}
             </>
         ),

src/core/utils/routes.js

@@ -249,24 +249,28 @@ export const FINISH_MISSION = api + "/api/v3/missions/control_unit/finish";
 export const GET_ROAD_MISSIONS_VIOLATIONS_LIST = api + "/api/v3/missions/violation_management";
 export const GET_MISSION_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/missions/report/country_activity";
 export const GET_MISSION_CITY_ACTIVITY_REPORT = api + "/api/v3/missions/report/country_activity";
-export const GET_MACHINES_COUNTRY_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/country_machines_activity";
+export const GET_MACHINES_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/machines_activity";
 export const GET_MACHINES_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/province_machines_activity";
 export const EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT =
     api + "/api/v3/missions/report_machine/country_machines_activity_excel";
+export const EXPORT_GET_MACHINES_TYPE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/machines_activity_excel";
 export const EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT =
     api + "/api/v3/missions/report_machine/province_machines_activity_excel";
+export const EXPORT_GET_MACHINES_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/machines_activity_excel";
 
-export const GET_DRIVER_COUNTRY_ACTIVITY_REPORT =
+export const GET_DRIVERS_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/machine_drivers_activity";
-    api + "/api/v3/missions/report_machine/country_machine_drivers_activity";
 export const GET_DRIVER_PROVINCE_ACTIVITY_REPORT =
     api + "/api/v3/missions/report_machine/province_machine_drivers_activity";
 export const EXPORT_GET_DRIVER_COUNTRY_ACTIVITY_REPORT =
     api + "/api/v3/missions/report_machine/country_machine_drivers_activity_excel";
+
+export const EXPORT_GET_DRIVER_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/machine_drivers_activity_excel";
+export const EXPORT_GET_DRIVER_DETAILS_ACTIVITY_REPORT =
+    api + "/api/v3/missions/report_machine/machine_driver_details_report_excel";
 export const EXPORT_GET_DRIVER_PROVINCE_ACTIVITY_REPORT =
     api + "/api/v3/missions/report_machine/province_machine_drivers_activity_excel";
 
-export const GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT =
+export const GET_MACHINES_TYPE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/machine_types_activity";
-    api + "/api/v3/missions/report_machine/country_machine_types_activity";
 export const GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT =
     api + "/api/v3/missions/report_machine/province_machine_types_activity";
 export const EXPORT_GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT =
@@ -275,6 +279,7 @@ export const EXPORT_GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT =
     api + "/api/v3/missions/report_machine/province_machine_types_activity_excel";
 export const CREATE_VIOLATION = api + "/api/v3/missions/violation_management";
 export const EDIT_VIOLATION = api + "/api/v3/missions/violation_management";
+export const DELETE_VIOLATION = api + "/api/v3/missions/violation_management";
 export const EXPORT_COUNTRY_ROAD_MISSIONS_REPORTS = api + "/api/v3/missions/report/country_excel_activity";
 export const EXPORT_PROVINCE_ROAD_MISSIONS_REPORTS = api + "/api/v3/missions/report/province_excel_activity";