merge develop

Merge branch 'develop' of http://git.witel.ir/RMS/frontend into feature/machine_type_report
build and format
2026-06-14 11:50:40 +03:30 · 2026-06-14 11:48:59 +03:30 · 2026-06-14 11:48:34 +03:30 · 2026-06-14 11:47:24 +03:30 · 2026-06-14 06:35:03 +00:00 · 2026-06-14 09:49:13 +03:30
59 changed files with 2412 additions and 1334 deletions
--- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/driverReports/page.js
+++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/driverReports/page.js
@@ -0,0 +1,18 @@
+import WithPermission from "@/core/middlewares/withPermission";
+import DriverReportsPage from "@/components/dashboard/roadMissions/reports/diverReports";
+
+export const metadata = {
+    title: "کارتابل گزارش راننده",
+};
+
+export default function Page() {
+    return (
+        <WithPermission
+            permission_name={[
+                "all", // TODO : change permission
+            ]}
+        >
+            <DriverReportsPage />
+        </WithPermission>
+    );
+}
--- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machineTypeReports/page.js
+++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machineTypeReports/page.js
@@ -1,18 +1,18 @@
-import WithPermission from "@/core/middlewares/withPermission";
-import MachinesTypeReportsPage from "@/components/dashboard/roadMissions/reports/machinesTypeReports";
-
-export const metadata = {
-    title: "کارتابل گزارش نوع ماشین‌ها",
-};
-
-export default function Page() {
-    return (
-        <WithPermission
-            permission_name={[
-                "all", // TODO : change permission
-            ]}
-        >
-            <MachinesTypeReportsPage />
-        </WithPermission>
-    );
-}
+import WithPermission from "@/core/middlewares/withPermission";
+import MachinesTypeReportsPage from "@/components/dashboard/roadMissions/reports/machinesTypeReports";
+
+export const metadata = {
+    title: "کارتابل گزارش نوع ماشین‌ها",
+};
+
+export default function Page() {
+    return (
+        <WithPermission
+            permission_name={[
+                "all", // TODO : change permission
+            ]}
+        >
+            <MachinesTypeReportsPage />
+        </WithPermission>
+    );
+}
--- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machinesReports/page.js
+++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machinesReports/page.js
@@ -1,18 +1,18 @@
-import MachinesReportsPage from "@/components/dashboard/roadMissions/reports/machinesReports";
-import WithPermission from "@/core/middlewares/withPermission";
-
-export const metadata = {
-    title: "کارتابل گزارش ماشین‌ها",
-};
-
-export default function Page() {
-    return (
-        <WithPermission
-            permission_name={[
-                "all", // TODO : change permission
-            ]}
-        >
-            <MachinesReportsPage />
-        </WithPermission>
-    );
-}
+import MachinesReportsPage from "@/components/dashboard/roadMissions/reports/machinesReports";
+import WithPermission from "@/core/middlewares/withPermission";
+
+export const metadata = {
+    title: "کارتابل گزارش ماشین‌ها",
+};
+
+export default function Page() {
+    return (
+        <WithPermission
+            permission_name={[
+                "all", // TODO : change permission
+            ]}
+        >
+            <MachinesReportsPage />
+        </WithPermission>
+    );
+}
--- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/AlarmText.jsx
+++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/AlarmText.jsx
@@ -0,0 +1,28 @@
+import { Box, Typography } from "@mui/material";
+
+const AlarmText = ({ isSource }) => {
+    if (isSource) return null;
+    return (
+        <Box
+            sx={{
+                position: "absolute",
+                top: 5,
+                left: 5,
+                zIndex: 1000,
+                border: "1px solid #ed0f02",
+                backgroundColor: "#f19898",
+                py: 0.5,
+                px: 1,
+                borderRadius: 2,
+                opacity: 0.8,
+                boxShadow: "rgba(0, 0, 0, 0.35) 0px 5px 15px",
+            }}
+        >
+            <Typography variant="caption" sx={{ fontWeight: "bold" }} color="#ed0f02">
+                با کلیک بر روی مارکر موقعیت را انتخاب کنید
+            </Typography>
+        </Box>
+    );
+};
+
+export default AlarmText;
--- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/DataBox.jsx
+++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/DataBox.jsx
@@ -0,0 +1,53 @@
+import { Box, Button, TextField } from "@mui/material";
+
+const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => {
+    if (!isSource) return null;
+
+    return (
+        <Box
+            sx={{
+                position: "absolute",
+                bottom: 5,
+                left: 5,
+                zIndex: 1000,
+                backgroundColor: "white",
+                border: "1px solid #e1e1e1",
+                padding: 1,
+                borderRadius: 2,
+                opacity: 0.8,
+                gap: 1,
+                display: "flex",
+                flexDirection: "column",
+            }}
+        >
+            <div style={{ display: "flex", alignItems: "end", gap: 4 }}>
+                <TextField
+                    variant="outlined"
+                    size="small"
+                    readOnly
+                    value={sourcePosition ? `${sourcePosition.lat.toFixed(6)}, ${sourcePosition.lng.toFixed(6)}` : ""}
+                />
+                {isSource && isDest && (
+                    <Button variant="contained" color="success" size="small" onClick={onEditSource}>
+                        ویرایش مبدا
+                    </Button>
+                )}
+            </div>
+            {isDest && (
+                <div style={{ display: "flex", alignItems: "end", gap: 4 }}>
+                    <TextField
+                        size="small"
+                        variant="outlined"
+                        readOnly
+                        value={destPosition ? `${destPosition.lat.toFixed(6)}, ${destPosition.lng.toFixed(6)}` : ""}
+                    />
+                    <Button variant="contained" color="error" size="small" onClick={onEditDest}>
+                        ویرایش مقصد
+                    </Button>
+                </div>
+            )}
+        </Box>
+    );
+};
+
+export default DataBox;
--- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/ShowRoute.jsx
+++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/ShowRoute.jsx
@@ -0,0 +1,46 @@
+import { useEffect, useRef } from "react";
+import { Marker, Polyline, useMap } from "react-leaflet";
+import L from "leaflet";
+import polyline from "@mapbox/polyline";
+import SourceIcon from "@/assets/images/source-icon.svg";
+import DestIcon from "@/assets/images/destination-icon.svg";
+
+const ShowRoute = ({ area }) => {
+    const map = useMap();
+    const defaultIconSize = [35, 35];
+
+    const createCustomIcon = (size, iconUrl) => {
+        return L.icon({
+            iconUrl: iconUrl,
+            iconSize: size,
+            iconAnchor: [size[0] / 2, size[1]],
+            popupAnchor: [0, -size[1]],
+        });
+    };
+
+    useEffect(() => {
+        if (coords.length > 0) {
+            map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 });
+        }
+    }, [area]);
+    const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src);
+    const destIcon = createCustomIcon(defaultIconSize, DestIcon.src);
+
+    if (!area) return null;
+    const coords = polyline.decode(area, 6);
+
+    if (coords.length === 0) return null;
+
+    const sourcePosition = coords[0];
+    const destPosition = coords[coords.length - 1];
+
+    return (
+        <>
+            <Polyline positions={coords} color="#015688" weight={7} opacity={1} />
+            <Marker position={sourcePosition} icon={sourceIcon} />
+            <Marker position={destPosition} icon={destIcon} />
+        </>
+    );
+};
+
+export default ShowRoute;
--- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/index.jsx
+++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/index.jsx
@@ -0,0 +1,219 @@
+import { Marker, Polyline, useMapEvents } from "react-leaflet";
+import L from "leaflet";
+import polyline from "@mapbox/polyline";
+import SourceIcon from "@/assets/images/source-icon.svg";
+import PrevSourceIcon from "@/assets/images/prev-source-icon.svg";
+import PrevDestIcon from "@/assets/images/prev-destination-icon.svg";
+import DestIcon from "@/assets/images/destination-icon.svg";
+import { useEffect, useRef, useState } from "react";
+import DataBox from "./DataBox";
+import AlarmText from "./AlarmText";
+
+const Routing = ({ setArea, setLocations, locations, area }) => {
+    const mapPrevSourceMarker = useRef();
+    const mapPrevDestMarker = useRef();
+    const mapRef = useRef(null);
+    const defaultIconSize = [35, 35];
+    const [isSource, setIsSource] = useState(false);
+    const [sourcePosition, setSourcePosition] = useState(null);
+    const [isDest, setIsDest] = useState(false);
+    const [destPosition, setDestPosition] = useState(null);
+    const [routeCoords, setRouteCoords] = useState([]);
+    const [alternateCoords, setAlternateCoords] = useState([]);
+    const [editingTarget, setEditingTarget] = useState(null);
+    const [selectedRoute, setSelectedRoute] = useState(null);
+
+    const createCustomIcon = (size, iconUrl) => {
+        return L.icon({
+            iconUrl: iconUrl,
+            iconSize: size,
+            iconAnchor: [size[0] / 2, size[1]],
+            popupAnchor: [0, -size[1]],
+        });
+    };
+
+    const defaultIcon = createCustomIcon(
+        defaultIconSize,
+        isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src
+    );
+
+    const prevDestIcon = createCustomIcon(
+        defaultIconSize,
+        isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src
+    );
+
+    const isMovingSource = !isSource || editingTarget === "source";
+    const isMovingDest = isSource && (!isDest || editingTarget === "dest");
+
+    const map = useMapEvents({
+        move(e) {
+            if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter());
+            if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter());
+        },
+        movestart() {
+            if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src));
+            if (isMovingDest && mapPrevDestMarker.current)
+                mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src));
+        },
+        moveend() {
+            if (isMovingSource)
+                mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src));
+            if (isMovingDest && mapPrevDestMarker.current)
+                mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src));
+        },
+    });
+
+    useEffect(() => {
+        mapRef.current = map;
+    }, [map]);
+
+    useEffect(() => {
+        if (locations.length < 2) return;
+        const restoredSource = { lat: locations[0].lat, lng: locations[0].lon };
+        const restoredDest = { lat: locations[1].lat, lng: locations[1].lon };
+        setSourcePosition(restoredSource);
+        setDestPosition(restoredDest);
+        setIsSource(true);
+        setIsDest(true);
+        if (area) {
+            const decoded = polyline.decode(area, 6);
+            setRouteCoords(decoded);
+            setSelectedRoute({ index: "main", coords: decoded });
+            setTimeout(() => {
+                mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 });
+            }, 100);
+        } else {
+            fetchRoute(restoredSource, restoredDest);
+        }
+    }, []);
+
+    const fetchRoute = async (source, dest) => {
+        const locs = [
+            { lat: source.lat, lon: source.lng },
+            { lat: dest.lat, lon: dest.lng },
+        ];
+        try {
+            const response = await fetch("https://jouya.141.ir/api/router/drive", {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({ locations: locs }),
+            });
+            const data = await response.json();
+            const shape = data.trip.legs[0].shape;
+            setLocations(locs);
+            setArea(shape);
+            const decoded = polyline.decode(shape, 6);
+            setRouteCoords(decoded);
+            setSelectedRoute({ index: "main", coords: decoded });
+
+            if (data.alternates?.length > 0) {
+                const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6));
+                setAlternateCoords(decodedAlternates);
+            } else {
+                setAlternateCoords([]);
+            }
+            map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 });
+        } catch (error) {
+            console.error("Routing error:", error);
+        }
+    };
+
+    const handleMarkerClick = async () => {
+        if (!isSource || editingTarget === "source") {
+            const clickedPosition = mapPrevSourceMarker.current.getLatLng();
+            setSourcePosition(clickedPosition);
+            setIsSource(true);
+            setEditingTarget(null);
+            setRouteCoords([]);
+            setAlternateCoords([]);
+            setSelectedRoute(null);
+
+            if (editingTarget === "source" && destPosition) {
+                await fetchRoute(clickedPosition, destPosition);
+            }
+        }
+    };
+
+    const handleDestMarkerClick = async () => {
+        if (!isDest || editingTarget === "dest") {
+            const clickedPosition = mapPrevDestMarker.current.getLatLng();
+            setDestPosition(clickedPosition);
+            setIsDest(true);
+            setEditingTarget(null);
+
+            await fetchRoute(sourcePosition, clickedPosition);
+        }
+    };
+
+    const handleEditSource = () => {
+        setEditingTarget("source");
+        setRouteCoords([]);
+        setAlternateCoords([]);
+        setSelectedRoute(null);
+    };
+
+    const handleEditDest = () => {
+        setEditingTarget("dest");
+        setRouteCoords([]);
+        setAlternateCoords([]);
+        setSelectedRoute(null);
+    };
+
+    const handleSelectRoute = (index, coords) => {
+        setSelectedRoute({ index, coords });
+        const encoded = polyline.encode(coords, 6);
+        setArea(encoded);
+        map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 });
+    };
+
+    return (
+        <>
+            <DataBox
+                isSource={isSource}
+                isDest={isDest}
+                sourcePosition={sourcePosition}
+                destPosition={destPosition}
+                editingTarget={editingTarget}
+                onEditSource={handleEditSource}
+                onEditDest={handleEditDest}
+            />
+            <AlarmText isSource={isSource} />
+            <Marker
+                position={sourcePosition || map.getCenter()}
+                ref={mapPrevSourceMarker}
+                eventHandlers={{ click: handleMarkerClick }}
+                icon={defaultIcon}
+            />
+            {isSource && (
+                <Marker
+                    position={destPosition || map.getCenter()}
+                    ref={mapPrevDestMarker}
+                    eventHandlers={{ click: handleDestMarkerClick }}
+                    icon={prevDestIcon}
+                />
+            )}
+            {alternateCoords.map((coords, index) => (
+                <Polyline
+                    key={`alternate-${index}-${selectedRoute?.index === index}`}
+                    positions={coords}
+                    color={selectedRoute?.index === index ? "#015688" : "#91B2C6"}
+                    weight={selectedRoute?.index === index ? 7 : 6}
+                    opacity={selectedRoute?.index === index ? 1 : 0.7}
+                    eventHandlers={{ click: () => handleSelectRoute(index, coords) }}
+                />
+            ))}
+            {routeCoords.length > 0 && (
+                <Polyline
+                    key={`main-${selectedRoute?.index === "main"}`}
+                    positions={routeCoords}
+                    color={selectedRoute?.index === "main" ? "#015688" : "#91B2C6"}
+                    weight={selectedRoute?.index === "main" ? 7 : 6}
+                    opacity={selectedRoute?.index === "main" ? 1 : 0.7}
+                    eventHandlers={{ click: () => handleSelectRoute("main", routeCoords) }}
+                />
+            )}
+        </>
+    );
+};
+
+export default Routing;
--- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/index.jsx
+++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/index.jsx
@@ -2,41 +2,29 @@ import MapLoading from "@/core/components/MapLayer/Loading";
 import { Box, Button, DialogActions, DialogContent, Stack } from "@mui/material";
 import dynamic from "next/dynamic";
 import { useCallback, useState } from "react";
-import MapControlPolygon from "./MapControlPolygon";
-import MapControlPolyline from "./MapControlPolyline";
-import SelectBoundType from "./SelectBoundType";
-import OldBoundLayer from "./OldBoundLayer";
+import Routing from "./Routing";
 const MapLayer = dynamic(() => import("@/core/components/MapLayer"), {
    loading: () => <MapLoading />,
    ssr: false,
 });

-const Area = ({ allData, setAllData, handlePrev, setTabState, oldBound }) => {
-    const [bound, setBound] = useState(allData.bound);
-    const [boundType, setBoundType] = useState(allData.bound_type);
+const Area = ({ allData, setAllData, handlePrev, setTabState }) => {
+    const [area, setArea] = useState(allData.area);
+    const [locations, setLocations] = useState(allData.locations);

    const handleNext = useCallback(() => {
-        setAllData({ bound: bound });
+        setAllData({ area: area });
+        setAllData({ locations: locations });
        setTabState((s) => s + 1);
-    }, [bound]);
+    }, [area]);
+
    return (
        <>
            <DialogContent dividers>
                <Stack spacing={2}>
-                    <SelectBoundType
-                        boundType={boundType}
-                        setBoundType={setBoundType}
-                        setBound={setBound}
-                        setAllData={setAllData}
-                    />
                    <Box sx={{ width: "100%", height: "400px" }}>
                        <MapLayer style={{ borderRadius: "4px" }}>
-                            {boundType == "polygon" ? (
-                                <MapControlPolygon bound={bound} setBound={setBound} boundType={boundType} />
-                            ) : (
-                                <MapControlPolyline bound={bound} setBound={setBound} boundType={boundType} />
-                            )}
-                            <OldBoundLayer bound={oldBound} />
+                            <Routing area={area} setArea={setArea} locations={locations} setLocations={setLocations} />
                        </MapLayer>
                    </Box>
                </Stack>
@@ -45,8 +33,8 @@ const Area = ({ allData, setAllData, handlePrev, setTabState, oldBound }) => {
                <Button onClick={handlePrev} variant="outlined" color="secondary" size="large">
                    {"مرحله قبلی"}
                </Button>
-                <Button variant="contained" size="large" disabled={!bound} onClick={handleNext}>
-                    {!bound ? "در انتظار ترسیم" : "مرحله بعد"}
+                <Button variant="contained" size="large" disabled={!area} onClick={handleNext}>
+                    {!area ? "در انتظار ترسیم" : "مرحله بعد"}
                </Button>
            </DialogActions>
        </>
--- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Verify/index.jsx
+++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Verify/index.jsx
@@ -5,7 +5,7 @@ import { Box, Button, Chip, DialogActions, DialogContent, Divider, Stack, Typogr
 import moment from "jalali-moment";
 import dynamic from "next/dynamic";
 import { useCallback } from "react";
-import ShowBound from "../../../../../../Actions/showBound";
+import ShowRoute from "../Area/Routing/ShowRoute";
 const MapLayer = dynamic(() => import("@/core/components/MapLayer"), {
    loading: () => <MapLoading />,
    ssr: false,
@@ -23,7 +23,7 @@ const Verify = ({ allData, handlePrev, submitForm, submitting }) => {
                    <Stack spacing={2}>
                        <Box sx={{ width: "100%", height: "200px" }}>
                            <MapLayer style={{ borderRadius: "4px" }}>
-                                <ShowBound bound={allData.bound} />
+                                <ShowRoute area={allData.area} />
                            </MapLayer>
                        </Box>
                        <Stack spacing={1}>
@@ -93,11 +93,11 @@ const Verify = ({ allData, handlePrev, submitForm, submitting }) => {
                                    label={`${allData.machine.machine_code} | ${allData.machine.car_name}`}
                                />
                            </Stack>
-                            <Stack direction={"row"} alignItems={"center"} spacing={1}>
+                            {/* <Stack direction={"row"} alignItems={"center"} spacing={1}>
                                <Typography variant="body2">راننده</Typography>
                                <Divider sx={{ flex: 1 }} />
                                <Chip size="small" label={`${allData.driver.code} | ${allData.driver.name}`} />
-                            </Stack>
+                            </Stack> */}
                        </Stack>
                        <Stack spacing={1}>
                            <Divider>
--- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/index.jsx
+++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/index.jsx
@@ -25,6 +25,8 @@ const reducer = (state, action) => {
 };

 const CreateForm = ({ defaultValues, submitForm, setOpen, submitting, oldBound }) => {
+    console.log("defaultValues", defaultValues);
+
    const [allData, dispatch] = useReducer(reducer, defaultValues);
    const [tabState, setTabState] = useState(0);
    const handleClose = () => {
@@ -84,7 +86,6 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting, oldBound }
            </TabPanel>
            <TabPanel value={tabState} index={2}>
                <Area
-                    oldBound={oldBound}
                    allData={allData}
                    setAllData={(data) => {
                        dispatch({ type: "changeData", data });
--- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/index.jsx
+++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/index.jsx
@@ -10,22 +10,12 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => {

    const submitForm = async (result) => {
        setSubmitting(true);
-        const bound = result.bound.getLatLngs();
-        let area =
-            result.bound_type === "polygon"
-                ? bound.map((ring) => ring.map((latlng) => [latlng.lng, latlng.lat]))[0]
-                : bound.map((latlng) => [latlng.lng, latlng.lat]);
-
-        // بستن polygon
-        if (result.bound_type === "polygon" && area.length > 0) {
-            const firstPoint = area[0];
-            area.push({ ...firstPoint });
-        }
        await requestServer(`${REQUEST_MISSION_CONTINUE_MISSION}/${row.original.id}`, "post", {
            data: {
                ...(result.rahdaran.length != 0 ? { rahdaran: result.rahdaran.map((r) => r.id) } : {}),
                machine_id: result.machine.id,
-                driver: result.driver.id,
+                encoded_route: result.area,
+                driver: row.original.driver_id,
                zone: result.region,
                type: result.type,
                ...(result.type == 1
@@ -36,10 +26,6 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => {
                          end_date: result.end_date,
                      }),
                end_point: result.end_point,
-                area: {
-                    type: result.bound_type,
-                    coordinates: area,
-                },
                category_id: result.category_id,
                explanation: result.explanation,
                ...(result.category_id == 3
@@ -65,7 +51,6 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => {
            defaultValues={{
                explanation: "",
                category_id: "",
-                bound: null,
                rahdaran: rahdaran.filter((r) => !r.is_driver),
                bound_type: "polyline",
                type: "",
@@ -74,7 +59,9 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => {
                end_point: "",
                region: "",
                machine: machine,
-                driver: rahdaran.find((r) => r.is_driver),
+                driver: row.original.driver_id,
+                area: null,
+                locations: [],
            }}
            oldBound={oldBound}
            submitForm={submitForm}
--- a/src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx
@@ -0,0 +1,71 @@
+"use client";
+import DataTableWithAuth from "@/core/components/DataTableWithAuth";
+import { Box } from "@mui/material";
+import { useMemo } from "react";
+import Toolbar from "./Toolbar";
+import RowActions from "./RowActions";
+
+const DriverReportsList = ({ data, specialFilter }) => {
+    const columns = useMemo(() => {
+        return [
+            {
+                accessorKey: "driver_id",
+                header: "کد یکتا",
+                id: "driver_id",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "numeric",
+                grow: false,
+                size: 50,
+            },
+            {
+                accessorKey: "driver_name",
+                header: "نام راننده",
+                id: "driver_name",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "text",
+                grow: false,
+                size: 50,
+            },
+            {
+                accessorKey: "func",
+                header: "کارکرد",
+                id: "func",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "number",
+                grow: false,
+                size: 50,
+            },
+            {
+                accessorKey: "missions",
+                header: "تعداد ماموریت",
+                id: "missions",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "number",
+                grow: false,
+                size: 50,
+            },
+        ];
+    }, []);
+
+    return (
+        <Box sx={{ p: 1, border: 1, borderColor: "divider", borderRadius: 1 }}>
+            <DataTableWithAuth
+                TableToolbar={Toolbar}
+                columns={columns}
+                data={data.data}
+                page_name={"driverReport"}
+                table_name={"driverReportList"}
+                enablePagination={false}
+                specialFilter={specialFilter}
+                enableRowActions
+                RowActions={RowActions}
+            />
+        </Box>
+    );
+};
+
+export default DriverReportsList;
--- a/src/components/dashboard/roadMissions/reports/diverReports/ExcelPrint/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/ExcelPrint/index.jsx
@@ -0,0 +1,77 @@
+"use client";
+import {
+    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";
+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 CountryOrProvince = activeFilters.find((item) => item.id === "province_id");
+        const requestUrl =
+            CountryOrProvince.value === "-1"
+                ? EXPORT_GET_DRIVER_COUNTRY_ACTIVITY_REPORT
+                : EXPORT_GET_DRIVER_PROVINCE_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;
--- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx
@@ -0,0 +1,106 @@
+import DataTableWithAuth from "@/core/components/DataTableWithAuth";
+import { GET_DRIVER_DETAILS } from "@/core/utils/routes";
+import { Box } from "@mui/material";
+import { useMemo } from "react";
+
+const DriverList = ({ row }) => {
+    const columns = useMemo(
+        () => [
+            {
+                accessorKey: "id",
+                header: "کد یکتا",
+                id: "id",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 80,
+            },
+            {
+                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",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "station_name",
+                header: "راهدارخانه",
+                id: "station_name",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "driver_name",
+                header: "راننده",
+                id: "driver_name",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "km",
+                header: "کیلومتر شروع",
+                id: "km",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "end_km",
+                header: "کیلومتر پایان",
+                id: "end_km",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+        ],
+        []
+    );
+
+    return (
+        <>
+            <Box sx={{ mt: 3 }}>
+                <DataTableWithAuth
+                    need_filter={true}
+                    columns={columns}
+                    sorting={[{ id: "id", desc: true }]}
+                    table_url={`${GET_DRIVER_DETAILS}/${row.driver_id}`}
+                    page_name={"driverListReport"}
+                    table_name={"driverList"}
+                    positionActionsColumn={"first"}
+                />
+            </Box>
+        </>
+    );
+};
+export default DriverList;
--- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/index.jsx
@@ -0,0 +1,27 @@
+import { Box, Button, DialogActions, DialogContent } from "@mui/material";
+import { Stack } from "@mui/system";
+import DriverList from "./DriverDetailsDialog/DriverList";
+
+const DriverDetailsTable = ({ row, setOpenDriverDetails }) => {
+    return (
+        <>
+            <DialogContent dividers>
+                <Box sx={{ flex: 1 }}>
+                    <Stack spacing={3}>
+                        <Stack spacing={2}>
+                            <DriverList row={row} />
+                        </Stack>
+                    </Stack>
+                </Box>
+            </DialogContent>
+            <DialogActions sx={{ display: "flex", justifyContent: "space-between" }}>
+                <Stack direction={"row"} spacing={1}>
+                    <Button onClick={() => setOpenDriverDetails(false)} variant="outlined" color="primary">
+                        بستن
+                    </Button>
+                </Stack>
+            </DialogActions>
+        </>
+    );
+};
+export default DriverDetailsTable;
--- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/index.jsx
@@ -0,0 +1,44 @@
+import { Close, RemoveRedEye } from "@mui/icons-material";
+import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material";
+import { useState } from "react";
+import DriverDetailsTable from "./Form";
+
+const DriverDetails = ({ row }) => {
+    const [openDriverDetails, setOpenDriverDetails] = useState(false);
+
+    return (
+        <>
+            <Tooltip title="ریزگزارشات" arrow placement="right">
+                <IconButton
+                    color="primary"
+                    sx={{ textTransform: "unset", alignSelf: "center" }}
+                    onClick={() => {
+                        setOpenDriverDetails(true);
+                    }}
+                >
+                    <RemoveRedEye />
+                </IconButton>
+            </Tooltip>
+            <Dialog open={openDriverDetails} fullWidth maxWidth="md">
+                <IconButton
+                    aria-label="close"
+                    onClick={() => setOpenDriverDetails(false)}
+                    sx={(theme) => ({
+                        position: "absolute",
+                        right: 8,
+                        top: 8,
+                        zIndex: 50,
+                        color: theme.palette.grey[500],
+                    })}
+                >
+                    <Close />
+                </IconButton>
+                <DialogTitle>ریز گزارشات راننده</DialogTitle>
+                {openDriverDetails && (
+                    <DriverDetailsTable row={row.original} setOpenDriverDetails={setOpenDriverDetails} />
+                )}
+            </Dialog>
+        </>
+    );
+};
+export default DriverDetails;
--- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/ShowRoute.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/ShowRoute.jsx
@@ -0,0 +1,46 @@
+import { useEffect, useRef } from "react";
+import { Marker, Polyline, useMap } from "react-leaflet";
+import L from "leaflet";
+import polyline from "@mapbox/polyline";
+import SourceIcon from "@/assets/images/source-icon.svg";
+import DestIcon from "@/assets/images/destination-icon.svg";
+
+const ShowRoute = ({ area }) => {
+    const map = useMap();
+    const defaultIconSize = [35, 35];
+
+    const createCustomIcon = (size, iconUrl) => {
+        return L.icon({
+            iconUrl: iconUrl,
+            iconSize: size,
+            iconAnchor: [size[0] / 2, size[1]],
+            popupAnchor: [0, -size[1]],
+        });
+    };
+
+    useEffect(() => {
+        if (coords.length > 0) {
+            map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 });
+        }
+    }, [area]);
+    const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src);
+    const destIcon = createCustomIcon(defaultIconSize, DestIcon.src);
+
+    if (!area) return null;
+    const coords = polyline.decode(area, 6);
+
+    if (coords.length === 0) return null;
+
+    const sourcePosition = coords[0];
+    const destPosition = coords[coords.length - 1];
+
+    return (
+        <>
+            <Polyline positions={coords} color="#015688" weight={7} opacity={1} />
+            <Marker position={sourcePosition} icon={sourceIcon} />
+            <Marker position={destPosition} icon={destIcon} />
+        </>
+    );
+};
+
+export default ShowRoute;
--- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/index.jsx
@@ -0,0 +1,57 @@
+import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material";
+import { useState } from "react";
+import MapIcon from "@mui/icons-material/Map";
+import MapLayer from "@/core/components/MapLayer";
+import ShowRoute from "./ShowRoute";
+
+const RouteDetail = ({ encoded_route }) => {
+    const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false);
+    return (
+        <>
+            <Tooltip title="مسیر انتخابی">
+                <IconButton color="primary" onClick={() => setOpenRouteDetailDialog(true)}>
+                    <MapIcon />
+                </IconButton>
+            </Tooltip>
+            <Dialog
+                fullWidth
+                open={openRouteDetailDialog}
+                onClose={() => setOpenRouteDetailDialog(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={"sm"}
+            >
+                <DialogTitle sx={{ fontSize: "large" }}>مسیر انتخابی</DialogTitle>
+                <Box sx={{ mx: 1, borderRadius: "5px" }}>
+                    <Box
+                        sx={{
+                            width: "100%",
+                            height: "300px",
+                            border: "1px solid #e1e1e1",
+                            borderRadius: "5px",
+                        }}
+                    >
+                        <MapLayer style={{ borderRadius: "4px" }}>
+                            <ShowRoute area={encoded_route} />
+                        </MapLayer>
+                    </Box>
+                </Box>
+                <DialogActions>
+                    <Button
+                        onClick={() => setOpenRouteDetailDialog(false)}
+                        variant="outlined"
+                        color="secondary"
+                        autoFocus
+                    >
+                        بستن
+                    </Button>
+                </DialogActions>
+            </Dialog>
+        </>
+    );
+};
+export default RouteDetail;
--- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/index.jsx
@@ -0,0 +1,6 @@
+import DriverDetails from "./DriverDetails";
+
+const RowActions = ({ row }) => {
+    return <DriverDetails row={row} />;
+};
+export default RowActions;
--- a/src/components/dashboard/roadMissions/reports/diverReports/Search/FromDateController.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/FromDateController.jsx
@@ -0,0 +1,27 @@
+import MuiDatePicker from "@/core/components/MuiDatePicker";
+import moment from "jalali-moment";
+import { Controller } from "react-hook-form";
+
+const FromDateController = ({ control }) => {
+    return (
+        <Controller
+            name="from_date"
+            control={control}
+            render={({ field: { onChange, value }, fieldState: { error } }) => (
+                <MuiDatePicker
+                    name="from_date"
+                    error={!!error}
+                    value={value}
+                    label={"تاریخ شروع (از تاریخ)"}
+                    placeholder={"از تاریخ"}
+                    setFieldValue={(name, newValue) => {
+                        const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
+                        onChange(formattedDate); // Update the field value in react-hook-form
+                    }}
+                    helperText={error ? error.message : null}
+                />
+            )}
+        />
+    );
+};
+export default FromDateController;
--- a/src/components/dashboard/roadMissions/reports/diverReports/Search/SearchReportField.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/SearchReportField.jsx
@@ -0,0 +1,44 @@
+import SearchIcon from "@mui/icons-material/Search";
+import { Button, Grid } from "@mui/material";
+import { Controller } from "react-hook-form";
+import FromDateController from "./FromDateController";
+import SelectProvince from "./SelectProvince";
+import ToDateController from "./ToDateController";
+
+const SearchReportField = ({ control, hasProvincesPermission }) => {
+    return (
+        <Grid container spacing={2} sx={{ py: 2 }}>
+            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
+                <FromDateController control={control} />
+            </Grid>
+            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
+                <ToDateController control={control} />
+            </Grid>
+            {hasProvincesPermission && (
+                <Grid item xs={12} md={3}>
+                    <SelectProvince control={control} />
+                </Grid>
+            )}
+            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
+                <Controller
+                    name="submitButton"
+                    control={control}
+                    render={({ field: { value, onChange }, formState: { isSubmitting } }) => (
+                        <Button
+                            variant="contained"
+                            size="medium"
+                            type="submit"
+                            disabled={isSubmitting}
+                            endIcon={<SearchIcon />}
+                            fullWidth
+                        >
+                            {isSubmitting ? "درحال دریافت اطلاعات" : "جستجو"}
+                        </Button>
+                    )}
+                />
+            </Grid>
+        </Grid>
+    );
+};
+
+export default SearchReportField;
--- a/src/components/dashboard/roadMissions/reports/diverReports/Search/SelectProvince.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/SelectProvince.jsx
@@ -0,0 +1,45 @@
+import useProvinces from "@/lib/hooks/useProvince";
+import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material";
+import { Controller } from "react-hook-form";
+
+const SelectProvince = ({ control }) => {
+    const { provinces, loadingProvinces, errorProvinces } = useProvinces();
+    return (
+        <Controller
+            name="province_id"
+            control={control}
+            render={({ field, fieldState: { error } }) => (
+                <FormControl error={!!error} size="small" fullWidth>
+                    <InputLabel id="demo-error-label">استان</InputLabel>
+                    <Select
+                        {...field}
+                        labelId="demo-error-label"
+                        id="province_id"
+                        value={loadingProvinces ? "loading" : field.value || ""}
+                        label="استان"
+                        onChange={field.onChange}
+                    >
+                        {loadingProvinces ? (
+                            <MenuItem value={"loading"}>در حال بارگذاری...</MenuItem>
+                        ) : errorProvinces ? (
+                            <MenuItem value={"error"}>خطا در بارگذاری</MenuItem>
+                        ) : (
+                            [
+                                <MenuItem key="-1" value={"-1"}>
+                                    کل کشور
+                                </MenuItem>,
+                                ...provinces.map((province) => (
+                                    <MenuItem key={province.id} value={province.id}>
+                                        {province.name_fa}
+                                    </MenuItem>
+                                )),
+                            ]
+                        )}
+                    </Select>
+                    {error && <FormHelperText>{error.message}</FormHelperText>}
+                </FormControl>
+            )}
+        />
+    );
+};
+export default SelectProvince;
--- a/src/components/dashboard/roadMissions/reports/diverReports/Search/ToDateController.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/ToDateController.jsx
@@ -0,0 +1,30 @@
+import MuiDatePicker from "@/core/components/MuiDatePicker";
+import moment from "jalali-moment";
+import { Controller, useWatch } from "react-hook-form";
+
+const ToDateController = ({ control }) => {
+    const minDate = useWatch({ control, name: "from_date" });
+    return (
+        <Controller
+            name="date_to"
+            control={control}
+            render={({ field: { onChange, value }, fieldState: { error } }) => (
+                <MuiDatePicker
+                    name="date_to"
+                    minDate={minDate}
+                    maxDate={new Date()}
+                    error={!!error}
+                    value={value}
+                    label={"تاریخ پایان (تا تاریخ)"}
+                    placeholder={"تا تاریخ"}
+                    setFieldValue={(name, newValue) => {
+                        const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
+                        onChange(formattedDate); // Update the field value in react-hook-form
+                    }}
+                    helperText={error ? error.message : null}
+                />
+            )}
+        />
+    );
+};
+export default ToDateController;
--- a/src/components/dashboard/roadMissions/reports/diverReports/Search/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/index.jsx
@@ -0,0 +1,13 @@
+import StyledForm from "@/core/components/StyledForm";
+import SearchReportField from "./SearchReportField";
+
+const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => {
+    return (
+        <>
+            <StyledForm onSubmit={handleSubmit(onSearchSubmit)}>
+                <SearchReportField control={control} hasProvincesPermission={hasProvincesPermission} />
+            </StyledForm>
+        </>
+    );
+};
+export default SearchReportList;
--- a/src/components/dashboard/roadMissions/reports/diverReports/Toolbar.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/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;
--- a/src/components/dashboard/roadMissions/reports/diverReports/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/index.jsx
@@ -0,0 +1,107 @@
+"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 moment from "jalali-moment";
+import { useEffect, useState } from "react";
+import { useForm } from "react-hook-form";
+import * as yup from "yup";
+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 = {
+        from_date: moment(new Date()).format("YYYY-MM-DD"),
+        date_to: moment(new Date()).format("YYYY-MM-DD"),
+        province_id: user.province_id || "-1",
+    };
+    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.date_to}`, datatype: "date", id: "date_to", fn: "between" },
+    ];
+    const [specialFilter, setSpecialFilter] = useState(defaultFilter);
+
+    const onSearchSubmit = async (data) => {
+        const params = new URLSearchParams();
+        params.set("from_date", `${data.from_date} 00:00:00`);
+        params.set("date_to", `${data.date_to} 23:59:59`);
+        setSpecialFilter([
+            { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" },
+            { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" },
+            { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" },
+        ]);
+        if (data.province_id === "-1") {
+            try {
+                const response = await requestServer(`${GET_DRIVER_COUNTRY_ACTIVITY_REPORT}?${params}`);
+                const result = response.data.data;
+
+                setData({
+                    data: result.activities,
+                    filters: data,
+                });
+            } 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) {}
+        }
+    };
+
+    useEffect(() => {
+        if (!userPermissions) return;
+        onSearchSubmit(defaultValues);
+    }, [userPermissions]);
+
+    const validationSchema = yup.object().shape({
+        from_date: yup
+            .string()
+            .required("تاریخ شروع الزامی است!")
+            .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ شروع الزامی است!")
+            .test("is-valid-date", "تاریخ شروع معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()),
+        date_to: yup
+            .string()
+            .required("تاریخ پایان الزامی است!")
+            .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ پایان الزامی است!")
+            .test("is-valid-date", "تاریخ پایان معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()),
+        province_id: yup.string().nullable(),
+    });
+
+    const { control, handleSubmit } = useForm({
+        defaultValues,
+        resolver: yupResolver(validationSchema),
+        mode: "all",
+    });
+
+    return (
+        <Stack spacing={1}>
+            <PageTitle title={"کارتابل گزارش راننده"} />
+            <SearchReportList
+                control={control}
+                hasProvincesPermission={hasProvincesPermission}
+                handleSubmit={handleSubmit}
+                onSearchSubmit={onSearchSubmit}
+            />
+            {!data ? <LinearProgress /> : <DriverReportsList specialFilter={specialFilter} data={data} />}
+        </Stack>
+    );
+};
+export default DriverReportsPage;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/ExcelPrint/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/ExcelPrint/index.jsx
@@ -1,77 +1,77 @@
-"use client";
-import {
-    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";
-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 CountryOrProvince = activeFilters.find((item) => item.id === "province_id");
-        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`;
-                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;
+"use client";
+import {
+    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";
+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 CountryOrProvince = activeFilters.find((item) => item.id === "province_id");
+        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`;
+                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;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx
@@ -1,81 +1,81 @@
-"use client";
-import DataTableWithAuth from "@/core/components/DataTableWithAuth";
-import { Box } from "@mui/material";
-import { useMemo } from "react";
-import Toolbar from "./Toolbar";
-import RowActions from "./RowActions";
-
-const MachinesReportsList = ({ data, specialFilter }) => {
-    const columns = useMemo(() => {
-        return [
-            {
-                accessorKey: "machine_id",
-                header: "کد یکتا",
-                id: "machine_id",
-                enableColumnFilter: false,
-                enableSorting: false,
-                datatype: "numeric",
-                grow: false,
-                size: 50,
-            },
-            {
-                accessorKey: "car_name",
-                header: "مدل ماشین",
-                id: "car_name",
-                enableColumnFilter: false,
-                enableSorting: false,
-                datatype: "text",
-                grow: false,
-                size: 50,
-            },
-            {
-                accessorKey: "machine_code",
-                header: "کد ماشین",
-                id: "machine_code",
-                enableColumnFilter: false,
-                enableSorting: false,
-                datatype: "text",
-                grow: false,
-                size: 50,
-            },
-            {
-                accessorKey: "func",
-                header: "کارکرد",
-                id: "func",
-                enableColumnFilter: false,
-                enableSorting: false,
-                datatype: "number",
-                grow: false,
-                size: 50,
-            },
-            {
-                accessorKey: "missions",
-                header: "تعداد ماموریت",
-                id: "missions",
-                enableColumnFilter: false,
-                enableSorting: false,
-                datatype: "number",
-                grow: false,
-                size: 50,
-            },
-        ];
-    }, []);
-
-    return (
-        <Box sx={{ p: 1, border: 1, borderColor: "divider", borderRadius: 1 }}>
-            <DataTableWithAuth
-                TableToolbar={Toolbar}
-                columns={columns}
-                data={data.data}
-                page_name={"roadMissionReport"}
-                table_name={"roadMissionReportList"}
-                enablePagination={false}
-                specialFilter={specialFilter}
-                enableRowActions
-                RowActions={RowActions}
-            />
-        </Box>
-    );
-};
-
-export default MachinesReportsList;
+"use client";
+import DataTableWithAuth from "@/core/components/DataTableWithAuth";
+import { Box } from "@mui/material";
+import { useMemo } from "react";
+import Toolbar from "./Toolbar";
+import RowActions from "./RowActions";
+
+const MachinesReportsList = ({ data, specialFilter }) => {
+    const columns = useMemo(() => {
+        return [
+            {
+                accessorKey: "machine_id",
+                header: "کد یکتا",
+                id: "machine_id",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "numeric",
+                grow: false,
+                size: 50,
+            },
+            {
+                accessorKey: "car_name",
+                header: "مدل ماشین",
+                id: "car_name",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "text",
+                grow: false,
+                size: 50,
+            },
+            {
+                accessorKey: "machine_code",
+                header: "کد ماشین",
+                id: "machine_code",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "text",
+                grow: false,
+                size: 50,
+            },
+            {
+                accessorKey: "func",
+                header: "کارکرد",
+                id: "func",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "number",
+                grow: false,
+                size: 50,
+            },
+            {
+                accessorKey: "missions",
+                header: "تعداد ماموریت",
+                id: "missions",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "number",
+                grow: false,
+                size: 50,
+            },
+        ];
+    }, []);
+
+    return (
+        <Box sx={{ p: 1, border: 1, borderColor: "divider", borderRadius: 1 }}>
+            <DataTableWithAuth
+                TableToolbar={Toolbar}
+                columns={columns}
+                data={data.data}
+                page_name={"roadMissionReport"}
+                table_name={"roadMissionReportList"}
+                enablePagination={false}
+                specialFilter={specialFilter}
+                enableRowActions
+                RowActions={RowActions}
+            />
+        </Box>
+    );
+};
+
+export default MachinesReportsList;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
@@ -1,106 +1,106 @@
-import DataTableWithAuth from "@/core/components/DataTableWithAuth";
-import { GET_MACHINE_MISSIONS_DETAILS } from "@/core/utils/routes";
-import { Box } from "@mui/material";
-import { useMemo } from "react";
-
-const MachineMissionsList = ({ row }) => {
-    const columns = useMemo(
-        () => [
-            {
-                accessorKey: "id",
-                header: "کد یکتا",
-                id: "id",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 80,
-            },
-            {
-                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",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-            {
-                accessorKey: "station_name",
-                header: "راهدارخانه",
-                id: "station_name",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-            {
-                accessorKey: "driver_name",
-                header: "راننده",
-                id: "driver_name",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-            {
-                accessorKey: "km",
-                header: "کیلومتر شروع",
-                id: "km",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-            {
-                accessorKey: "end_km",
-                header: "کیلومتر پایان",
-                id: "end_km",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-        ],
-        []
-    );
-
-    return (
-        <>
-            <Box sx={{ mt: 3 }}>
-                <DataTableWithAuth
-                    need_filter={true}
-                    columns={columns}
-                    sorting={[{ id: "id", desc: true }]}
-                    table_url={`${GET_MACHINE_MISSIONS_DETAILS}?machine_id=${row.machine_id}`}
-                    page_name={"roadMissionsTransportation"}
-                    table_name={"roadMissionsTransportationMachinesList"}
-                    positionActionsColumn={"first"}
-                />
-            </Box>
-        </>
-    );
-};
-export default MachineMissionsList;
+import DataTableWithAuth from "@/core/components/DataTableWithAuth";
+import { GET_MACHINE_MISSIONS_DETAILS } from "@/core/utils/routes";
+import { Box } from "@mui/material";
+import { useMemo } from "react";
+
+const MachineMissionsList = ({ row }) => {
+    const columns = useMemo(
+        () => [
+            {
+                accessorKey: "id",
+                header: "کد یکتا",
+                id: "id",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 80,
+            },
+            {
+                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",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "station_name",
+                header: "راهدارخانه",
+                id: "station_name",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "driver_name",
+                header: "راننده",
+                id: "driver_name",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "km",
+                header: "کیلومتر شروع",
+                id: "km",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "end_km",
+                header: "کیلومتر پایان",
+                id: "end_km",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+        ],
+        []
+    );
+
+    return (
+        <>
+            <Box sx={{ mt: 3 }}>
+                <DataTableWithAuth
+                    need_filter={true}
+                    columns={columns}
+                    sorting={[{ id: "id", desc: true }]}
+                    table_url={`${GET_MACHINE_MISSIONS_DETAILS}/${row.machine_id}`}
+                    page_name={"roadMissionsTransportation"}
+                    table_name={"roadMissionsTransportationMachinesList"}
+                    positionActionsColumn={"first"}
+                />
+            </Box>
+        </>
+    );
+};
+export default MachineMissionsList;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/index.jsx
@@ -1,27 +1,27 @@
-import { Box, Button, DialogActions, DialogContent } from "@mui/material";
-import { Stack } from "@mui/system";
-import MachineMissionsList from "./MachineMissionsDetailsDialog/MachineMissionsList";
-
-const MachineMissionsDetailsTable = ({ row, setOpenMachineMissionsDetails }) => {
-    return (
-        <>
-            <DialogContent dividers>
-                <Box sx={{ flex: 1 }}>
-                    <Stack spacing={3}>
-                        <Stack spacing={2}>
-                            <MachineMissionsList row={row} />
-                        </Stack>
-                    </Stack>
-                </Box>
-            </DialogContent>
-            <DialogActions sx={{ display: "flex", justifyContent: "space-between" }}>
-                <Stack direction={"row"} spacing={1}>
-                    <Button onClick={() => setOpenMachineMissionsDetails(false)} variant="outlined" color="primary">
-                        بستن
-                    </Button>
-                </Stack>
-            </DialogActions>
-        </>
-    );
-};
-export default MachineMissionsDetailsTable;
+import { Box, Button, DialogActions, DialogContent } from "@mui/material";
+import { Stack } from "@mui/system";
+import MachineMissionsList from "./MachineMissionsDetailsDialog/MachineMissionsList";
+
+const MachineMissionsDetailsTable = ({ row, setOpenMachineMissionsDetails }) => {
+    return (
+        <>
+            <DialogContent dividers>
+                <Box sx={{ flex: 1 }}>
+                    <Stack spacing={3}>
+                        <Stack spacing={2}>
+                            <MachineMissionsList row={row} />
+                        </Stack>
+                    </Stack>
+                </Box>
+            </DialogContent>
+            <DialogActions sx={{ display: "flex", justifyContent: "space-between" }}>
+                <Stack direction={"row"} spacing={1}>
+                    <Button onClick={() => setOpenMachineMissionsDetails(false)} variant="outlined" color="primary">
+                        بستن
+                    </Button>
+                </Stack>
+            </DialogActions>
+        </>
+    );
+};
+export default MachineMissionsDetailsTable;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/index.jsx
@@ -1,47 +1,47 @@
-import { Close, RemoveRedEye } from "@mui/icons-material";
-import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material";
-import { useState } from "react";
-import MachineMissionsDetailsTable from "./Form";
-
-const MissionDetails = ({ row }) => {
-    const [openMachineMissionsDetails, setOpenMachineMissionsDetails] = useState(false);
-
-    return (
-        <>
-            <Tooltip title="ریزگزارشات" arrow placement="right">
-                <IconButton
-                    color="primary"
-                    sx={{ textTransform: "unset", alignSelf: "center" }}
-                    onClick={() => {
-                        setOpenMachineMissionsDetails(true);
-                    }}
-                >
-                    <RemoveRedEye />
-                </IconButton>
-            </Tooltip>
-            <Dialog open={openMachineMissionsDetails} fullWidth maxWidth="md">
-                <IconButton
-                    aria-label="close"
-                    onClick={() => setOpenMachineMissionsDetails(false)}
-                    sx={(theme) => ({
-                        position: "absolute",
-                        right: 8,
-                        top: 8,
-                        zIndex: 50,
-                        color: theme.palette.grey[500],
-                    })}
-                >
-                    <Close />
-                </IconButton>
-                <DialogTitle>ریز گزارشات خودرو</DialogTitle>
-                {openMachineMissionsDetails && (
-                    <MachineMissionsDetailsTable
-                        row={row.original}
-                        setOpenMachineMissionsDetails={setOpenMachineMissionsDetails}
-                    />
-                )}
-            </Dialog>
-        </>
-    );
-};
-export default MissionDetails;
+import { Close, RemoveRedEye } from "@mui/icons-material";
+import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material";
+import { useState } from "react";
+import MachineMissionsDetailsTable from "./Form";
+
+const MissionDetails = ({ row }) => {
+    const [openMachineMissionsDetails, setOpenMachineMissionsDetails] = useState(false);
+
+    return (
+        <>
+            <Tooltip title="ریزگزارشات" arrow placement="right">
+                <IconButton
+                    color="primary"
+                    sx={{ textTransform: "unset", alignSelf: "center" }}
+                    onClick={() => {
+                        setOpenMachineMissionsDetails(true);
+                    }}
+                >
+                    <RemoveRedEye />
+                </IconButton>
+            </Tooltip>
+            <Dialog open={openMachineMissionsDetails} fullWidth maxWidth="md">
+                <IconButton
+                    aria-label="close"
+                    onClick={() => setOpenMachineMissionsDetails(false)}
+                    sx={(theme) => ({
+                        position: "absolute",
+                        right: 8,
+                        top: 8,
+                        zIndex: 50,
+                        color: theme.palette.grey[500],
+                    })}
+                >
+                    <Close />
+                </IconButton>
+                <DialogTitle>ریز گزارشات خودرو</DialogTitle>
+                {openMachineMissionsDetails && (
+                    <MachineMissionsDetailsTable
+                        row={row.original}
+                        setOpenMachineMissionsDetails={setOpenMachineMissionsDetails}
+                    />
+                )}
+            </Dialog>
+        </>
+    );
+};
+export default MissionDetails;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/ShowRoute.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/ShowRoute.jsx
@@ -1,46 +1,46 @@
-import { useEffect, useRef } from "react";
-import { Marker, Polyline, useMap } from "react-leaflet";
-import L from "leaflet";
-import polyline from "@mapbox/polyline";
-import SourceIcon from "@/assets/images/source-icon.svg";
-import DestIcon from "@/assets/images/destination-icon.svg";
-
-const ShowRoute = ({ area }) => {
-    const map = useMap();
-    const defaultIconSize = [35, 35];
-
-    const createCustomIcon = (size, iconUrl) => {
-        return L.icon({
-            iconUrl: iconUrl,
-            iconSize: size,
-            iconAnchor: [size[0] / 2, size[1]],
-            popupAnchor: [0, -size[1]],
-        });
-    };
-
-    useEffect(() => {
-        if (coords.length > 0) {
-            map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 });
-        }
-    }, [area]);
-    const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src);
-    const destIcon = createCustomIcon(defaultIconSize, DestIcon.src);
-
-    if (!area) return null;
-    const coords = polyline.decode(area, 6);
-
-    if (coords.length === 0) return null;
-
-    const sourcePosition = coords[0];
-    const destPosition = coords[coords.length - 1];
-
-    return (
-        <>
-            <Polyline positions={coords} color="#015688" weight={7} opacity={1} />
-            <Marker position={sourcePosition} icon={sourceIcon} />
-            <Marker position={destPosition} icon={destIcon} />
-        </>
-    );
-};
-
-export default ShowRoute;
+import { useEffect, useRef } from "react";
+import { Marker, Polyline, useMap } from "react-leaflet";
+import L from "leaflet";
+import polyline from "@mapbox/polyline";
+import SourceIcon from "@/assets/images/source-icon.svg";
+import DestIcon from "@/assets/images/destination-icon.svg";
+
+const ShowRoute = ({ area }) => {
+    const map = useMap();
+    const defaultIconSize = [35, 35];
+
+    const createCustomIcon = (size, iconUrl) => {
+        return L.icon({
+            iconUrl: iconUrl,
+            iconSize: size,
+            iconAnchor: [size[0] / 2, size[1]],
+            popupAnchor: [0, -size[1]],
+        });
+    };
+
+    useEffect(() => {
+        if (coords.length > 0) {
+            map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 });
+        }
+    }, [area]);
+    const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src);
+    const destIcon = createCustomIcon(defaultIconSize, DestIcon.src);
+
+    if (!area) return null;
+    const coords = polyline.decode(area, 6);
+
+    if (coords.length === 0) return null;
+
+    const sourcePosition = coords[0];
+    const destPosition = coords[coords.length - 1];
+
+    return (
+        <>
+            <Polyline positions={coords} color="#015688" weight={7} opacity={1} />
+            <Marker position={sourcePosition} icon={sourceIcon} />
+            <Marker position={destPosition} icon={destIcon} />
+        </>
+    );
+};
+
+export default ShowRoute;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/index.jsx
@@ -1,57 +1,57 @@
-import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material";
-import { useState } from "react";
-import MapIcon from "@mui/icons-material/Map";
-import MapLayer from "@/core/components/MapLayer";
-import ShowRoute from "./ShowRoute";
-
-const RouteDetail = ({ encoded_route }) => {
-    const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false);
-    return (
-        <>
-            <Tooltip title="مسیر انتخابی">
-                <IconButton color="primary" onClick={() => setOpenRouteDetailDialog(true)}>
-                    <MapIcon />
-                </IconButton>
-            </Tooltip>
-            <Dialog
-                fullWidth
-                open={openRouteDetailDialog}
-                onClose={() => setOpenRouteDetailDialog(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={"sm"}
-            >
-                <DialogTitle sx={{ fontSize: "large" }}>مسیر انتخابی</DialogTitle>
-                <Box sx={{ mx: 1, borderRadius: "5px" }}>
-                    <Box
-                        sx={{
-                            width: "100%",
-                            height: "300px",
-                            border: "1px solid #e1e1e1",
-                            borderRadius: "5px",
-                        }}
-                    >
-                        <MapLayer style={{ borderRadius: "4px" }}>
-                            <ShowRoute area={encoded_route} />
-                        </MapLayer>
-                    </Box>
-                </Box>
-                <DialogActions>
-                    <Button
-                        onClick={() => setOpenRouteDetailDialog(false)}
-                        variant="outlined"
-                        color="secondary"
-                        autoFocus
-                    >
-                        بستن
-                    </Button>
-                </DialogActions>
-            </Dialog>
-        </>
-    );
-};
-export default RouteDetail;
+import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material";
+import { useState } from "react";
+import MapIcon from "@mui/icons-material/Map";
+import MapLayer from "@/core/components/MapLayer";
+import ShowRoute from "./ShowRoute";
+
+const RouteDetail = ({ encoded_route }) => {
+    const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false);
+    return (
+        <>
+            <Tooltip title="مسیر انتخابی">
+                <IconButton color="primary" onClick={() => setOpenRouteDetailDialog(true)}>
+                    <MapIcon />
+                </IconButton>
+            </Tooltip>
+            <Dialog
+                fullWidth
+                open={openRouteDetailDialog}
+                onClose={() => setOpenRouteDetailDialog(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={"sm"}
+            >
+                <DialogTitle sx={{ fontSize: "large" }}>مسیر انتخابی</DialogTitle>
+                <Box sx={{ mx: 1, borderRadius: "5px" }}>
+                    <Box
+                        sx={{
+                            width: "100%",
+                            height: "300px",
+                            border: "1px solid #e1e1e1",
+                            borderRadius: "5px",
+                        }}
+                    >
+                        <MapLayer style={{ borderRadius: "4px" }}>
+                            <ShowRoute area={encoded_route} />
+                        </MapLayer>
+                    </Box>
+                </Box>
+                <DialogActions>
+                    <Button
+                        onClick={() => setOpenRouteDetailDialog(false)}
+                        variant="outlined"
+                        color="secondary"
+                        autoFocus
+                    >
+                        بستن
+                    </Button>
+                </DialogActions>
+            </Dialog>
+        </>
+    );
+};
+export default RouteDetail;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/index.jsx
@@ -1,6 +1,6 @@
-import MissionDetails from "./MissionDitails";
-
-const RowActions = ({ row }) => {
-    return <MissionDetails row={row} />;
-};
-export default RowActions;
+import MissionDetails from "./MissionDitails";
+
+const RowActions = ({ row }) => {
+    return <MissionDetails row={row} />;
+};
+export default RowActions;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/Search/FromDateController.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/Search/FromDateController.jsx
@@ -1,27 +1,27 @@
-import MuiDatePicker from "@/core/components/MuiDatePicker";
-import moment from "jalali-moment";
-import { Controller } from "react-hook-form";
-
-const FromDateController = ({ control }) => {
-    return (
-        <Controller
-            name="from_date"
-            control={control}
-            render={({ field: { onChange, value }, fieldState: { error } }) => (
-                <MuiDatePicker
-                    name="from_date"
-                    error={!!error}
-                    value={value}
-                    label={"تاریخ شروع (از تاریخ)"}
-                    placeholder={"از تاریخ"}
-                    setFieldValue={(name, newValue) => {
-                        const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
-                        onChange(formattedDate); // Update the field value in react-hook-form
-                    }}
-                    helperText={error ? error.message : null}
-                />
-            )}
-        />
-    );
-};
-export default FromDateController;
+import MuiDatePicker from "@/core/components/MuiDatePicker";
+import moment from "jalali-moment";
+import { Controller } from "react-hook-form";
+
+const FromDateController = ({ control }) => {
+    return (
+        <Controller
+            name="from_date"
+            control={control}
+            render={({ field: { onChange, value }, fieldState: { error } }) => (
+                <MuiDatePicker
+                    name="from_date"
+                    error={!!error}
+                    value={value}
+                    label={"تاریخ شروع (از تاریخ)"}
+                    placeholder={"از تاریخ"}
+                    setFieldValue={(name, newValue) => {
+                        const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
+                        onChange(formattedDate); // Update the field value in react-hook-form
+                    }}
+                    helperText={error ? error.message : null}
+                />
+            )}
+        />
+    );
+};
+export default FromDateController;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/Search/SearchReportField.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/Search/SearchReportField.jsx
@@ -1,44 +1,44 @@
-import SearchIcon from "@mui/icons-material/Search";
-import { Button, Grid } from "@mui/material";
-import { Controller } from "react-hook-form";
-import FromDateController from "./FromDateController";
-import SelectProvince from "./SelectProvince";
-import ToDateController from "./ToDateController";
-
-const SearchReportField = ({ control, hasProvincesPermission }) => {
-    return (
-        <Grid container spacing={2} sx={{ py: 2 }}>
-            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
-                <FromDateController control={control} />
-            </Grid>
-            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
-                <ToDateController control={control} />
-            </Grid>
-            {hasProvincesPermission && (
-                <Grid item xs={12} md={3}>
-                    <SelectProvince control={control} />
-                </Grid>
-            )}
-            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
-                <Controller
-                    name="submitButton"
-                    control={control}
-                    render={({ field: { value, onChange }, formState: { isSubmitting } }) => (
-                        <Button
-                            variant="contained"
-                            size="medium"
-                            type="submit"
-                            disabled={isSubmitting}
-                            endIcon={<SearchIcon />}
-                            fullWidth
-                        >
-                            {isSubmitting ? "درحال دریافت اطلاعات" : "جستجو"}
-                        </Button>
-                    )}
-                />
-            </Grid>
-        </Grid>
-    );
-};
-
-export default SearchReportField;
+import SearchIcon from "@mui/icons-material/Search";
+import { Button, Grid } from "@mui/material";
+import { Controller } from "react-hook-form";
+import FromDateController from "./FromDateController";
+import SelectProvince from "./SelectProvince";
+import ToDateController from "./ToDateController";
+
+const SearchReportField = ({ control, hasProvincesPermission }) => {
+    return (
+        <Grid container spacing={2} sx={{ py: 2 }}>
+            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
+                <FromDateController control={control} />
+            </Grid>
+            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
+                <ToDateController control={control} />
+            </Grid>
+            {hasProvincesPermission && (
+                <Grid item xs={12} md={3}>
+                    <SelectProvince control={control} />
+                </Grid>
+            )}
+            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
+                <Controller
+                    name="submitButton"
+                    control={control}
+                    render={({ field: { value, onChange }, formState: { isSubmitting } }) => (
+                        <Button
+                            variant="contained"
+                            size="medium"
+                            type="submit"
+                            disabled={isSubmitting}
+                            endIcon={<SearchIcon />}
+                            fullWidth
+                        >
+                            {isSubmitting ? "درحال دریافت اطلاعات" : "جستجو"}
+                        </Button>
+                    )}
+                />
+            </Grid>
+        </Grid>
+    );
+};
+
+export default SearchReportField;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/Search/SelectProvince.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/Search/SelectProvince.jsx
@@ -1,45 +1,45 @@
-import useProvinces from "@/lib/hooks/useProvince";
-import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material";
-import { Controller } from "react-hook-form";
-
-const SelectProvince = ({ control }) => {
-    const { provinces, loadingProvinces, errorProvinces } = useProvinces();
-    return (
-        <Controller
-            name="province_id"
-            control={control}
-            render={({ field, fieldState: { error } }) => (
-                <FormControl error={!!error} size="small" fullWidth>
-                    <InputLabel id="demo-error-label">استان</InputLabel>
-                    <Select
-                        {...field}
-                        labelId="demo-error-label"
-                        id="province_id"
-                        value={loadingProvinces ? "loading" : field.value || ""}
-                        label="استان"
-                        onChange={field.onChange}
-                    >
-                        {loadingProvinces ? (
-                            <MenuItem value={"loading"}>در حال بارگذاری...</MenuItem>
-                        ) : errorProvinces ? (
-                            <MenuItem value={"error"}>خطا در بارگذاری</MenuItem>
-                        ) : (
-                            [
-                                <MenuItem key="-1" value={"-1"}>
-                                    کل کشور
-                                </MenuItem>,
-                                ...provinces.map((province) => (
-                                    <MenuItem key={province.id} value={province.id}>
-                                        {province.name_fa}
-                                    </MenuItem>
-                                )),
-                            ]
-                        )}
-                    </Select>
-                    {error && <FormHelperText>{error.message}</FormHelperText>}
-                </FormControl>
-            )}
-        />
-    );
-};
-export default SelectProvince;
+import useProvinces from "@/lib/hooks/useProvince";
+import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material";
+import { Controller } from "react-hook-form";
+
+const SelectProvince = ({ control }) => {
+    const { provinces, loadingProvinces, errorProvinces } = useProvinces();
+    return (
+        <Controller
+            name="province_id"
+            control={control}
+            render={({ field, fieldState: { error } }) => (
+                <FormControl error={!!error} size="small" fullWidth>
+                    <InputLabel id="demo-error-label">استان</InputLabel>
+                    <Select
+                        {...field}
+                        labelId="demo-error-label"
+                        id="province_id"
+                        value={loadingProvinces ? "loading" : field.value || ""}
+                        label="استان"
+                        onChange={field.onChange}
+                    >
+                        {loadingProvinces ? (
+                            <MenuItem value={"loading"}>در حال بارگذاری...</MenuItem>
+                        ) : errorProvinces ? (
+                            <MenuItem value={"error"}>خطا در بارگذاری</MenuItem>
+                        ) : (
+                            [
+                                <MenuItem key="-1" value={"-1"}>
+                                    کل کشور
+                                </MenuItem>,
+                                ...provinces.map((province) => (
+                                    <MenuItem key={province.id} value={province.id}>
+                                        {province.name_fa}
+                                    </MenuItem>
+                                )),
+                            ]
+                        )}
+                    </Select>
+                    {error && <FormHelperText>{error.message}</FormHelperText>}
+                </FormControl>
+            )}
+        />
+    );
+};
+export default SelectProvince;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/Search/ToDateController.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/Search/ToDateController.jsx
@@ -1,30 +1,30 @@
-import MuiDatePicker from "@/core/components/MuiDatePicker";
-import moment from "jalali-moment";
-import { Controller, useWatch } from "react-hook-form";
-
-const ToDateController = ({ control }) => {
-    const minDate = useWatch({ control, name: "from_date" });
-    return (
-        <Controller
-            name="date_to"
-            control={control}
-            render={({ field: { onChange, value }, fieldState: { error } }) => (
-                <MuiDatePicker
-                    name="date_to"
-                    minDate={minDate}
-                    maxDate={new Date()}
-                    error={!!error}
-                    value={value}
-                    label={"تاریخ پایان (تا تاریخ)"}
-                    placeholder={"تا تاریخ"}
-                    setFieldValue={(name, newValue) => {
-                        const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
-                        onChange(formattedDate); // Update the field value in react-hook-form
-                    }}
-                    helperText={error ? error.message : null}
-                />
-            )}
-        />
-    );
-};
-export default ToDateController;
+import MuiDatePicker from "@/core/components/MuiDatePicker";
+import moment from "jalali-moment";
+import { Controller, useWatch } from "react-hook-form";
+
+const ToDateController = ({ control }) => {
+    const minDate = useWatch({ control, name: "from_date" });
+    return (
+        <Controller
+            name="date_to"
+            control={control}
+            render={({ field: { onChange, value }, fieldState: { error } }) => (
+                <MuiDatePicker
+                    name="date_to"
+                    minDate={minDate}
+                    maxDate={new Date()}
+                    error={!!error}
+                    value={value}
+                    label={"تاریخ پایان (تا تاریخ)"}
+                    placeholder={"تا تاریخ"}
+                    setFieldValue={(name, newValue) => {
+                        const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
+                        onChange(formattedDate); // Update the field value in react-hook-form
+                    }}
+                    helperText={error ? error.message : null}
+                />
+            )}
+        />
+    );
+};
+export default ToDateController;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/Search/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/Search/index.jsx
@@ -1,13 +1,13 @@
-import StyledForm from "@/core/components/StyledForm";
-import SearchReportField from "./SearchReportField";
-
-const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => {
-    return (
-        <>
-            <StyledForm onSubmit={handleSubmit(onSearchSubmit)}>
-                <SearchReportField control={control} hasProvincesPermission={hasProvincesPermission} />
-            </StyledForm>
-        </>
-    );
-};
-export default SearchReportList;
+import StyledForm from "@/core/components/StyledForm";
+import SearchReportField from "./SearchReportField";
+
+const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => {
+    return (
+        <>
+            <StyledForm onSubmit={handleSubmit(onSearchSubmit)}>
+                <SearchReportField control={control} hasProvincesPermission={hasProvincesPermission} />
+            </StyledForm>
+        </>
+    );
+};
+export default SearchReportList;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/Toolbar.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/Toolbar.jsx
@@ -1,11 +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;
+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;
--- a/src/components/dashboard/roadMissions/reports/machinesReports/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/index.jsx
@@ -1,107 +1,107 @@
-"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 moment from "jalali-moment";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import * as yup from "yup";
-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 = {
-        from_date: moment(new Date()).format("YYYY-MM-DD"),
-        date_to: moment(new Date()).format("YYYY-MM-DD"),
-        province_id: user.province_id || "-1",
-    };
-    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.date_to}`, datatype: "date", id: "date_to", fn: "between" },
-    ];
-    const [specialFilter, setSpecialFilter] = useState(defaultFilter);
-
-    const onSearchSubmit = async (data) => {
-        const params = new URLSearchParams();
-        params.set("from_date", `${data.from_date} 00:00:00`);
-        params.set("date_to", `${data.date_to} 23:59:59`);
-        setSpecialFilter([
-            { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" },
-            { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" },
-            { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" },
-        ]);
-        if (data.province_id === "-1") {
-            try {
-                const response = await requestServer(`${GET_MACHINES_COUNTRY_ACTIVITY_REPORT}?${params}`);
-                const result = response.data.data;
-
-                setData({
-                    data: result.activities,
-                    filters: data,
-                });
-            } 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) {}
-        }
-    };
-
-    useEffect(() => {
-        if (!userPermissions) return;
-        onSearchSubmit(defaultValues);
-    }, [userPermissions]);
-
-    const validationSchema = yup.object().shape({
-        from_date: yup
-            .string()
-            .required("تاریخ شروع الزامی است!")
-            .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ شروع الزامی است!")
-            .test("is-valid-date", "تاریخ شروع معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()),
-        date_to: yup
-            .string()
-            .required("تاریخ پایان الزامی است!")
-            .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ پایان الزامی است!")
-            .test("is-valid-date", "تاریخ پایان معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()),
-        province_id: yup.string().nullable(),
-    });
-
-    const { control, handleSubmit } = useForm({
-        defaultValues,
-        resolver: yupResolver(validationSchema),
-        mode: "all",
-    });
-
-    return (
-        <Stack spacing={1}>
-            <PageTitle title={"کارتابل گزارش ماشین‌ها"} />
-            <SearchReportList
-                control={control}
-                hasProvincesPermission={hasProvincesPermission}
-                handleSubmit={handleSubmit}
-                onSearchSubmit={onSearchSubmit}
-            />
-            {!data ? <LinearProgress /> : <MachinesReportsList specialFilter={specialFilter} data={data} />}
-        </Stack>
-    );
-};
-export default MachinesReportsPage;
+"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 moment from "jalali-moment";
+import { useEffect, useState } from "react";
+import { useForm } from "react-hook-form";
+import * as yup from "yup";
+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 = {
+        from_date: moment(new Date()).format("YYYY-MM-DD"),
+        date_to: moment(new Date()).format("YYYY-MM-DD"),
+        province_id: user.province_id || "-1",
+    };
+    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.date_to}`, datatype: "date", id: "date_to", fn: "between" },
+    ];
+    const [specialFilter, setSpecialFilter] = useState(defaultFilter);
+
+    const onSearchSubmit = async (data) => {
+        const params = new URLSearchParams();
+        params.set("from_date", `${data.from_date} 00:00:00`);
+        params.set("date_to", `${data.date_to} 23:59:59`);
+        setSpecialFilter([
+            { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" },
+            { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" },
+            { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" },
+        ]);
+        if (data.province_id === "-1") {
+            try {
+                const response = await requestServer(`${GET_MACHINES_COUNTRY_ACTIVITY_REPORT}?${params}`);
+                const result = response.data.data;
+
+                setData({
+                    data: result.activities,
+                    filters: data,
+                });
+            } 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) {}
+        }
+    };
+
+    useEffect(() => {
+        if (!userPermissions) return;
+        onSearchSubmit(defaultValues);
+    }, [userPermissions]);
+
+    const validationSchema = yup.object().shape({
+        from_date: yup
+            .string()
+            .required("تاریخ شروع الزامی است!")
+            .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ شروع الزامی است!")
+            .test("is-valid-date", "تاریخ شروع معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()),
+        date_to: yup
+            .string()
+            .required("تاریخ پایان الزامی است!")
+            .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ پایان الزامی است!")
+            .test("is-valid-date", "تاریخ پایان معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()),
+        province_id: yup.string().nullable(),
+    });
+
+    const { control, handleSubmit } = useForm({
+        defaultValues,
+        resolver: yupResolver(validationSchema),
+        mode: "all",
+    });
+
+    return (
+        <Stack spacing={1}>
+            <PageTitle title={"کارتابل گزارش ماشین‌ها"} />
+            <SearchReportList
+                control={control}
+                hasProvincesPermission={hasProvincesPermission}
+                handleSubmit={handleSubmit}
+                onSearchSubmit={onSearchSubmit}
+            />
+            {!data ? <LinearProgress /> : <MachinesReportsList specialFilter={specialFilter} data={data} />}
+        </Stack>
+    );
+};
+export default MachinesReportsPage;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx
@@ -1,61 +1,61 @@
-"use client";
-import DataTableWithAuth from "@/core/components/DataTableWithAuth";
-import { Box } from "@mui/material";
-import { useMemo } from "react";
-import Toolbar from "./Toolbar";
-// import RowActions from "./RowActions";
-
-const MachinesReportsList = ({ data, specialFilter }) => {
-    const columns = useMemo(() => {
-        return [
-            {
-                accessorKey: "car_type",
-                header: "نوع ماشین",
-                id: "car_type",
-                enableColumnFilter: false,
-                enableSorting: false,
-                datatype: "text",
-                grow: false,
-                size: 50,
-            },
-            {
-                accessorKey: "func",
-                header: "کارکرد",
-                id: "func",
-                enableColumnFilter: false,
-                enableSorting: false,
-                datatype: "number",
-                grow: false,
-                size: 50,
-            },
-            {
-                accessorKey: "missions",
-                header: "تعداد ماموریت",
-                id: "missions",
-                enableColumnFilter: false,
-                enableSorting: false,
-                datatype: "number",
-                grow: false,
-                size: 50,
-            },
-        ];
-    }, []);
-
-    return (
-        <Box sx={{ p: 1, border: 1, borderColor: "divider", borderRadius: 1 }}>
-            <DataTableWithAuth
-                TableToolbar={Toolbar}
-                columns={columns}
-                data={data.data}
-                page_name={"roadMissionReportMachineTypeReport"}
-                table_name={"roadMissionReportMachineTypeReportList"}
-                enablePagination={false}
-                specialFilter={specialFilter}
-                // enableRowActions
-                // RowActions={RowActions}
-            />
-        </Box>
-    );
-};
-
-export default MachinesReportsList;
+"use client";
+import DataTableWithAuth from "@/core/components/DataTableWithAuth";
+import { Box } from "@mui/material";
+import { useMemo } from "react";
+import Toolbar from "./Toolbar";
+// import RowActions from "./RowActions";
+
+const MachinesReportsList = ({ data, specialFilter }) => {
+    const columns = useMemo(() => {
+        return [
+            {
+                accessorKey: "car_type",
+                header: "نوع ماشین",
+                id: "car_type",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "text",
+                grow: false,
+                size: 50,
+            },
+            {
+                accessorKey: "func",
+                header: "کارکرد",
+                id: "func",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "number",
+                grow: false,
+                size: 50,
+            },
+            {
+                accessorKey: "missions",
+                header: "تعداد ماموریت",
+                id: "missions",
+                enableColumnFilter: false,
+                enableSorting: false,
+                datatype: "number",
+                grow: false,
+                size: 50,
+            },
+        ];
+    }, []);
+
+    return (
+        <Box sx={{ p: 1, border: 1, borderColor: "divider", borderRadius: 1 }}>
+            <DataTableWithAuth
+                TableToolbar={Toolbar}
+                columns={columns}
+                data={data.data}
+                page_name={"roadMissionReportMachineTypeReport"}
+                table_name={"roadMissionReportMachineTypeReportList"}
+                enablePagination={false}
+                specialFilter={specialFilter}
+                // enableRowActions
+                // RowActions={RowActions}
+            />
+        </Box>
+    );
+};
+
+export default MachinesReportsList;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
@@ -1,106 +1,106 @@
-import DataTableWithAuth from "@/core/components/DataTableWithAuth";
-import { GET_MACHINE_MISSIONS_DETAILS, GET_MACHINE_TYPE_MISSIONS_DETAILS } from "@/core/utils/routes";
-import { Box } from "@mui/material";
-import { useMemo } from "react";
-
-const MachineMissionsList = ({ row }) => {
-    const columns = useMemo(
-        () => [
-            {
-                accessorKey: "id",
-                header: "کد یکتا",
-                id: "id",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 80,
-            },
-            {
-                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",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-            {
-                accessorKey: "station_name",
-                header: "راهدارخانه",
-                id: "station_name",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-            {
-                accessorKey: "driver_name",
-                header: "راننده",
-                id: "driver_name",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-            {
-                accessorKey: "km",
-                header: "کیلومتر شروع",
-                id: "km",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-            {
-                accessorKey: "end_km",
-                header: "کیلومتر پایان",
-                id: "end_km",
-                enableColumnFilter: true,
-                datatype: "text",
-                filterMode: "equals",
-                columnFilterModeOptions: ["equals", "contains"],
-                grow: false,
-                size: 100,
-            },
-        ],
-        []
-    );
-
-    return (
-        <>
-            <Box sx={{ mt: 3 }}>
-                <DataTableWithAuth
-                    need_filter={true}
-                    columns={columns}
-                    sorting={[{ id: "id", desc: true }]}
-                    table_url={`${GET_MACHINE_TYPE_MISSIONS_DETAILS}?car_type=${row.car_type}`}
-                    page_name={"roadMissionReportMachineType"}
-                    table_name={"roadMissionReportMachineTypeList"}
-                    positionActionsColumn={"first"}
-                />
-            </Box>
-        </>
-    );
-};
-export default MachineMissionsList;
+import DataTableWithAuth from "@/core/components/DataTableWithAuth";
+import { GET_MACHINE_MISSIONS_DETAILS, GET_MACHINE_TYPE_MISSIONS_DETAILS } from "@/core/utils/routes";
+import { Box } from "@mui/material";
+import { useMemo } from "react";
+
+const MachineMissionsList = ({ row }) => {
+    const columns = useMemo(
+        () => [
+            {
+                accessorKey: "id",
+                header: "کد یکتا",
+                id: "id",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 80,
+            },
+            {
+                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",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "station_name",
+                header: "راهدارخانه",
+                id: "station_name",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "driver_name",
+                header: "راننده",
+                id: "driver_name",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "km",
+                header: "کیلومتر شروع",
+                id: "km",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+            {
+                accessorKey: "end_km",
+                header: "کیلومتر پایان",
+                id: "end_km",
+                enableColumnFilter: true,
+                datatype: "text",
+                filterMode: "equals",
+                columnFilterModeOptions: ["equals", "contains"],
+                grow: false,
+                size: 100,
+            },
+        ],
+        []
+    );
+
+    return (
+        <>
+            <Box sx={{ mt: 3 }}>
+                <DataTableWithAuth
+                    need_filter={true}
+                    columns={columns}
+                    sorting={[{ id: "id", desc: true }]}
+                    table_url={`${GET_MACHINE_TYPE_MISSIONS_DETAILS}?car_type=${row.car_type}`}
+                    page_name={"roadMissionReportMachineType"}
+                    table_name={"roadMissionReportMachineTypeList"}
+                    positionActionsColumn={"first"}
+                />
+            </Box>
+        </>
+    );
+};
+export default MachineMissionsList;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/index.jsx
@@ -1,27 +1,27 @@
-import { Box, Button, DialogActions, DialogContent } from "@mui/material";
-import { Stack } from "@mui/system";
-import MachineMissionsList from "./MachineMissionsDetailsDialog/MachineMissionsList";
-
-const MachineMissionsDetailsTable = ({ row, setOpenMachineMissionsDetails }) => {
-    return (
-        <>
-            <DialogContent dividers>
-                <Box sx={{ flex: 1 }}>
-                    <Stack spacing={3}>
-                        <Stack spacing={2}>
-                            <MachineMissionsList row={row} />
-                        </Stack>
-                    </Stack>
-                </Box>
-            </DialogContent>
-            <DialogActions sx={{ display: "flex", justifyContent: "space-between" }}>
-                <Stack direction={"row"} spacing={1}>
-                    <Button onClick={() => setOpenMachineMissionsDetails(false)} variant="outlined" color="primary">
-                        بستن
-                    </Button>
-                </Stack>
-            </DialogActions>
-        </>
-    );
-};
-export default MachineMissionsDetailsTable;
+import { Box, Button, DialogActions, DialogContent } from "@mui/material";
+import { Stack } from "@mui/system";
+import MachineMissionsList from "./MachineMissionsDetailsDialog/MachineMissionsList";
+
+const MachineMissionsDetailsTable = ({ row, setOpenMachineMissionsDetails }) => {
+    return (
+        <>
+            <DialogContent dividers>
+                <Box sx={{ flex: 1 }}>
+                    <Stack spacing={3}>
+                        <Stack spacing={2}>
+                            <MachineMissionsList row={row} />
+                        </Stack>
+                    </Stack>
+                </Box>
+            </DialogContent>
+            <DialogActions sx={{ display: "flex", justifyContent: "space-between" }}>
+                <Stack direction={"row"} spacing={1}>
+                    <Button onClick={() => setOpenMachineMissionsDetails(false)} variant="outlined" color="primary">
+                        بستن
+                    </Button>
+                </Stack>
+            </DialogActions>
+        </>
+    );
+};
+export default MachineMissionsDetailsTable;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/index.jsx
@@ -1,47 +1,47 @@
-import { Close, RemoveRedEye } from "@mui/icons-material";
-import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material";
-import { useState } from "react";
-import MachineMissionsDetailsTable from "./Form";
-
-const MissionDetails = ({ row }) => {
-    const [openMachineMissionsDetails, setOpenMachineMissionsDetails] = useState(false);
-
-    return (
-        <>
-            <Tooltip title="ریزگزارشات" arrow placement="right">
-                <IconButton
-                    color="primary"
-                    sx={{ textTransform: "unset", alignSelf: "center" }}
-                    onClick={() => {
-                        setOpenMachineMissionsDetails(true);
-                    }}
-                >
-                    <RemoveRedEye />
-                </IconButton>
-            </Tooltip>
-            <Dialog open={openMachineMissionsDetails} fullWidth maxWidth="md">
-                <IconButton
-                    aria-label="close"
-                    onClick={() => setOpenMachineMissionsDetails(false)}
-                    sx={(theme) => ({
-                        position: "absolute",
-                        right: 8,
-                        top: 8,
-                        zIndex: 50,
-                        color: theme.palette.grey[500],
-                    })}
-                >
-                    <Close />
-                </IconButton>
-                <DialogTitle>ریز گزارشات نوع خودرو</DialogTitle>
-                {openMachineMissionsDetails && (
-                    <MachineMissionsDetailsTable
-                        row={row.original}
-                        setOpenMachineMissionsDetails={setOpenMachineMissionsDetails}
-                    />
-                )}
-            </Dialog>
-        </>
-    );
-};
-export default MissionDetails;
+import { Close, RemoveRedEye } from "@mui/icons-material";
+import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material";
+import { useState } from "react";
+import MachineMissionsDetailsTable from "./Form";
+
+const MissionDetails = ({ row }) => {
+    const [openMachineMissionsDetails, setOpenMachineMissionsDetails] = useState(false);
+
+    return (
+        <>
+            <Tooltip title="ریزگزارشات" arrow placement="right">
+                <IconButton
+                    color="primary"
+                    sx={{ textTransform: "unset", alignSelf: "center" }}
+                    onClick={() => {
+                        setOpenMachineMissionsDetails(true);
+                    }}
+                >
+                    <RemoveRedEye />
+                </IconButton>
+            </Tooltip>
+            <Dialog open={openMachineMissionsDetails} fullWidth maxWidth="md">
+                <IconButton
+                    aria-label="close"
+                    onClick={() => setOpenMachineMissionsDetails(false)}
+                    sx={(theme) => ({
+                        position: "absolute",
+                        right: 8,
+                        top: 8,
+                        zIndex: 50,
+                        color: theme.palette.grey[500],
+                    })}
+                >
+                    <Close />
+                </IconButton>
+                <DialogTitle>ریز گزارشات نوع خودرو</DialogTitle>
+                {openMachineMissionsDetails && (
+                    <MachineMissionsDetailsTable
+                        row={row.original}
+                        setOpenMachineMissionsDetails={setOpenMachineMissionsDetails}
+                    />
+                )}
+            </Dialog>
+        </>
+    );
+};
+export default MissionDetails;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/ShowRoute.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/ShowRoute.jsx
@@ -1,46 +1,46 @@
-import { useEffect, useRef } from "react";
-import { Marker, Polyline, useMap } from "react-leaflet";
-import L from "leaflet";
-import polyline from "@mapbox/polyline";
-import SourceIcon from "@/assets/images/source-icon.svg";
-import DestIcon from "@/assets/images/destination-icon.svg";
-
-const ShowRoute = ({ area }) => {
-    const map = useMap();
-    const defaultIconSize = [35, 35];
-
-    const createCustomIcon = (size, iconUrl) => {
-        return L.icon({
-            iconUrl: iconUrl,
-            iconSize: size,
-            iconAnchor: [size[0] / 2, size[1]],
-            popupAnchor: [0, -size[1]],
-        });
-    };
-
-    useEffect(() => {
-        if (coords.length > 0) {
-            map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 });
-        }
-    }, [area]);
-    const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src);
-    const destIcon = createCustomIcon(defaultIconSize, DestIcon.src);
-
-    if (!area) return null;
-    const coords = polyline.decode(area, 6);
-
-    if (coords.length === 0) return null;
-
-    const sourcePosition = coords[0];
-    const destPosition = coords[coords.length - 1];
-
-    return (
-        <>
-            <Polyline positions={coords} color="#015688" weight={7} opacity={1} />
-            <Marker position={sourcePosition} icon={sourceIcon} />
-            <Marker position={destPosition} icon={destIcon} />
-        </>
-    );
-};
-
-export default ShowRoute;
+import { useEffect, useRef } from "react";
+import { Marker, Polyline, useMap } from "react-leaflet";
+import L from "leaflet";
+import polyline from "@mapbox/polyline";
+import SourceIcon from "@/assets/images/source-icon.svg";
+import DestIcon from "@/assets/images/destination-icon.svg";
+
+const ShowRoute = ({ area }) => {
+    const map = useMap();
+    const defaultIconSize = [35, 35];
+
+    const createCustomIcon = (size, iconUrl) => {
+        return L.icon({
+            iconUrl: iconUrl,
+            iconSize: size,
+            iconAnchor: [size[0] / 2, size[1]],
+            popupAnchor: [0, -size[1]],
+        });
+    };
+
+    useEffect(() => {
+        if (coords.length > 0) {
+            map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 });
+        }
+    }, [area]);
+    const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src);
+    const destIcon = createCustomIcon(defaultIconSize, DestIcon.src);
+
+    if (!area) return null;
+    const coords = polyline.decode(area, 6);
+
+    if (coords.length === 0) return null;
+
+    const sourcePosition = coords[0];
+    const destPosition = coords[coords.length - 1];
+
+    return (
+        <>
+            <Polyline positions={coords} color="#015688" weight={7} opacity={1} />
+            <Marker position={sourcePosition} icon={sourceIcon} />
+            <Marker position={destPosition} icon={destIcon} />
+        </>
+    );
+};
+
+export default ShowRoute;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/index.jsx
@@ -1,57 +1,57 @@
-import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material";
-import { useState } from "react";
-import MapIcon from "@mui/icons-material/Map";
-import MapLayer from "@/core/components/MapLayer";
-import ShowRoute from "./ShowRoute";
-
-const RouteDetail = ({ encoded_route }) => {
-    const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false);
-    return (
-        <>
-            <Tooltip title="مسیر انتخابی">
-                <IconButton color="primary" onClick={() => setOpenRouteDetailDialog(true)}>
-                    <MapIcon />
-                </IconButton>
-            </Tooltip>
-            <Dialog
-                fullWidth
-                open={openRouteDetailDialog}
-                onClose={() => setOpenRouteDetailDialog(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={"sm"}
-            >
-                <DialogTitle sx={{ fontSize: "large" }}>مسیر انتخابی</DialogTitle>
-                <Box sx={{ mx: 1, borderRadius: "5px" }}>
-                    <Box
-                        sx={{
-                            width: "100%",
-                            height: "300px",
-                            border: "1px solid #e1e1e1",
-                            borderRadius: "5px",
-                        }}
-                    >
-                        <MapLayer style={{ borderRadius: "4px" }}>
-                            <ShowRoute area={encoded_route} />
-                        </MapLayer>
-                    </Box>
-                </Box>
-                <DialogActions>
-                    <Button
-                        onClick={() => setOpenRouteDetailDialog(false)}
-                        variant="outlined"
-                        color="secondary"
-                        autoFocus
-                    >
-                        بستن
-                    </Button>
-                </DialogActions>
-            </Dialog>
-        </>
-    );
-};
-export default RouteDetail;
+import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material";
+import { useState } from "react";
+import MapIcon from "@mui/icons-material/Map";
+import MapLayer from "@/core/components/MapLayer";
+import ShowRoute from "./ShowRoute";
+
+const RouteDetail = ({ encoded_route }) => {
+    const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false);
+    return (
+        <>
+            <Tooltip title="مسیر انتخابی">
+                <IconButton color="primary" onClick={() => setOpenRouteDetailDialog(true)}>
+                    <MapIcon />
+                </IconButton>
+            </Tooltip>
+            <Dialog
+                fullWidth
+                open={openRouteDetailDialog}
+                onClose={() => setOpenRouteDetailDialog(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={"sm"}
+            >
+                <DialogTitle sx={{ fontSize: "large" }}>مسیر انتخابی</DialogTitle>
+                <Box sx={{ mx: 1, borderRadius: "5px" }}>
+                    <Box
+                        sx={{
+                            width: "100%",
+                            height: "300px",
+                            border: "1px solid #e1e1e1",
+                            borderRadius: "5px",
+                        }}
+                    >
+                        <MapLayer style={{ borderRadius: "4px" }}>
+                            <ShowRoute area={encoded_route} />
+                        </MapLayer>
+                    </Box>
+                </Box>
+                <DialogActions>
+                    <Button
+                        onClick={() => setOpenRouteDetailDialog(false)}
+                        variant="outlined"
+                        color="secondary"
+                        autoFocus
+                    >
+                        بستن
+                    </Button>
+                </DialogActions>
+            </Dialog>
+        </>
+    );
+};
+export default RouteDetail;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/index.jsx
@@ -1,10 +1,6 @@
-// import MissionDetails from "./MissionDitails";
-
-const RowActions = ({ row }) => {
-    return (
-        <>
-        {/*<MissionDetails row={row} />*/}
-        </>
-    );
-};
-export default RowActions;
+// import MissionDetails from "./MissionDitails";
+
+const RowActions = ({ row }) => {
+    return <>{/*<MissionDetails row={row} />*/}</>;
+};
+export default RowActions;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/FromDateController.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/FromDateController.jsx
@@ -1,27 +1,27 @@
-import MuiDatePicker from "@/core/components/MuiDatePicker";
-import moment from "jalali-moment";
-import { Controller } from "react-hook-form";
-
-const FromDateController = ({ control }) => {
-    return (
-        <Controller
-            name="from_date"
-            control={control}
-            render={({ field: { onChange, value }, fieldState: { error } }) => (
-                <MuiDatePicker
-                    name="from_date"
-                    error={!!error}
-                    value={value}
-                    label={"تاریخ شروع (از تاریخ)"}
-                    placeholder={"از تاریخ"}
-                    setFieldValue={(name, newValue) => {
-                        const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
-                        onChange(formattedDate); // Update the field value in react-hook-form
-                    }}
-                    helperText={error ? error.message : null}
-                />
-            )}
-        />
-    );
-};
-export default FromDateController;
+import MuiDatePicker from "@/core/components/MuiDatePicker";
+import moment from "jalali-moment";
+import { Controller } from "react-hook-form";
+
+const FromDateController = ({ control }) => {
+    return (
+        <Controller
+            name="from_date"
+            control={control}
+            render={({ field: { onChange, value }, fieldState: { error } }) => (
+                <MuiDatePicker
+                    name="from_date"
+                    error={!!error}
+                    value={value}
+                    label={"تاریخ شروع (از تاریخ)"}
+                    placeholder={"از تاریخ"}
+                    setFieldValue={(name, newValue) => {
+                        const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
+                        onChange(formattedDate); // Update the field value in react-hook-form
+                    }}
+                    helperText={error ? error.message : null}
+                />
+            )}
+        />
+    );
+};
+export default FromDateController;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SearchReportField.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SearchReportField.jsx
@@ -1,44 +1,44 @@
-import SearchIcon from "@mui/icons-material/Search";
-import { Button, Grid } from "@mui/material";
-import { Controller } from "react-hook-form";
-import FromDateController from "./FromDateController";
-import SelectProvince from "./SelectProvince";
-import ToDateController from "./ToDateController";
-
-const SearchReportField = ({ control, hasProvincesPermission }) => {
-    return (
-        <Grid container spacing={2} sx={{ py: 2 }}>
-            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
-                <FromDateController control={control} />
-            </Grid>
-            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
-                <ToDateController control={control} />
-            </Grid>
-            {hasProvincesPermission && (
-                <Grid item xs={12} md={3}>
-                    <SelectProvince control={control} />
-                </Grid>
-            )}
-            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
-                <Controller
-                    name="submitButton"
-                    control={control}
-                    render={({ field: { value, onChange }, formState: { isSubmitting } }) => (
-                        <Button
-                            variant="contained"
-                            size="medium"
-                            type="submit"
-                            disabled={isSubmitting}
-                            endIcon={<SearchIcon />}
-                            fullWidth
-                        >
-                            {isSubmitting ? "درحال دریافت اطلاعات" : "جستجو"}
-                        </Button>
-                    )}
-                />
-            </Grid>
-        </Grid>
-    );
-};
-
-export default SearchReportField;
+import SearchIcon from "@mui/icons-material/Search";
+import { Button, Grid } from "@mui/material";
+import { Controller } from "react-hook-form";
+import FromDateController from "./FromDateController";
+import SelectProvince from "./SelectProvince";
+import ToDateController from "./ToDateController";
+
+const SearchReportField = ({ control, hasProvincesPermission }) => {
+    return (
+        <Grid container spacing={2} sx={{ py: 2 }}>
+            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
+                <FromDateController control={control} />
+            </Grid>
+            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
+                <ToDateController control={control} />
+            </Grid>
+            {hasProvincesPermission && (
+                <Grid item xs={12} md={3}>
+                    <SelectProvince control={control} />
+                </Grid>
+            )}
+            <Grid item xs={12} md={hasProvincesPermission ? 3 : 4}>
+                <Controller
+                    name="submitButton"
+                    control={control}
+                    render={({ field: { value, onChange }, formState: { isSubmitting } }) => (
+                        <Button
+                            variant="contained"
+                            size="medium"
+                            type="submit"
+                            disabled={isSubmitting}
+                            endIcon={<SearchIcon />}
+                            fullWidth
+                        >
+                            {isSubmitting ? "درحال دریافت اطلاعات" : "جستجو"}
+                        </Button>
+                    )}
+                />
+            </Grid>
+        </Grid>
+    );
+};
+
+export default SearchReportField;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SelectProvince.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SelectProvince.jsx
@@ -1,45 +1,45 @@
-import useProvinces from "@/lib/hooks/useProvince";
-import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material";
-import { Controller } from "react-hook-form";
-
-const SelectProvince = ({ control }) => {
-    const { provinces, loadingProvinces, errorProvinces } = useProvinces();
-    return (
-        <Controller
-            name="province_id"
-            control={control}
-            render={({ field, fieldState: { error } }) => (
-                <FormControl error={!!error} size="small" fullWidth>
-                    <InputLabel id="demo-error-label">استان</InputLabel>
-                    <Select
-                        {...field}
-                        labelId="demo-error-label"
-                        id="province_id"
-                        value={loadingProvinces ? "loading" : field.value || ""}
-                        label="استان"
-                        onChange={field.onChange}
-                    >
-                        {loadingProvinces ? (
-                            <MenuItem value={"loading"}>در حال بارگذاری...</MenuItem>
-                        ) : errorProvinces ? (
-                            <MenuItem value={"error"}>خطا در بارگذاری</MenuItem>
-                        ) : (
-                            [
-                                <MenuItem key="-1" value={"-1"}>
-                                    کل کشور
-                                </MenuItem>,
-                                ...provinces.map((province) => (
-                                    <MenuItem key={province.id} value={province.id}>
-                                        {province.name_fa}
-                                    </MenuItem>
-                                )),
-                            ]
-                        )}
-                    </Select>
-                    {error && <FormHelperText>{error.message}</FormHelperText>}
-                </FormControl>
-            )}
-        />
-    );
-};
-export default SelectProvince;
+import useProvinces from "@/lib/hooks/useProvince";
+import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material";
+import { Controller } from "react-hook-form";
+
+const SelectProvince = ({ control }) => {
+    const { provinces, loadingProvinces, errorProvinces } = useProvinces();
+    return (
+        <Controller
+            name="province_id"
+            control={control}
+            render={({ field, fieldState: { error } }) => (
+                <FormControl error={!!error} size="small" fullWidth>
+                    <InputLabel id="demo-error-label">استان</InputLabel>
+                    <Select
+                        {...field}
+                        labelId="demo-error-label"
+                        id="province_id"
+                        value={loadingProvinces ? "loading" : field.value || ""}
+                        label="استان"
+                        onChange={field.onChange}
+                    >
+                        {loadingProvinces ? (
+                            <MenuItem value={"loading"}>در حال بارگذاری...</MenuItem>
+                        ) : errorProvinces ? (
+                            <MenuItem value={"error"}>خطا در بارگذاری</MenuItem>
+                        ) : (
+                            [
+                                <MenuItem key="-1" value={"-1"}>
+                                    کل کشور
+                                </MenuItem>,
+                                ...provinces.map((province) => (
+                                    <MenuItem key={province.id} value={province.id}>
+                                        {province.name_fa}
+                                    </MenuItem>
+                                )),
+                            ]
+                        )}
+                    </Select>
+                    {error && <FormHelperText>{error.message}</FormHelperText>}
+                </FormControl>
+            )}
+        />
+    );
+};
+export default SelectProvince;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/ToDateController.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/ToDateController.jsx
@@ -1,30 +1,30 @@
-import MuiDatePicker from "@/core/components/MuiDatePicker";
-import moment from "jalali-moment";
-import { Controller, useWatch } from "react-hook-form";
-
-const ToDateController = ({ control }) => {
-    const minDate = useWatch({ control, name: "from_date" });
-    return (
-        <Controller
-            name="date_to"
-            control={control}
-            render={({ field: { onChange, value }, fieldState: { error } }) => (
-                <MuiDatePicker
-                    name="date_to"
-                    minDate={minDate}
-                    maxDate={new Date()}
-                    error={!!error}
-                    value={value}
-                    label={"تاریخ پایان (تا تاریخ)"}
-                    placeholder={"تا تاریخ"}
-                    setFieldValue={(name, newValue) => {
-                        const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
-                        onChange(formattedDate); // Update the field value in react-hook-form
-                    }}
-                    helperText={error ? error.message : null}
-                />
-            )}
-        />
-    );
-};
-export default ToDateController;
+import MuiDatePicker from "@/core/components/MuiDatePicker";
+import moment from "jalali-moment";
+import { Controller, useWatch } from "react-hook-form";
+
+const ToDateController = ({ control }) => {
+    const minDate = useWatch({ control, name: "from_date" });
+    return (
+        <Controller
+            name="date_to"
+            control={control}
+            render={({ field: { onChange, value }, fieldState: { error } }) => (
+                <MuiDatePicker
+                    name="date_to"
+                    minDate={minDate}
+                    maxDate={new Date()}
+                    error={!!error}
+                    value={value}
+                    label={"تاریخ پایان (تا تاریخ)"}
+                    placeholder={"تا تاریخ"}
+                    setFieldValue={(name, newValue) => {
+                        const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
+                        onChange(formattedDate); // Update the field value in react-hook-form
+                    }}
+                    helperText={error ? error.message : null}
+                />
+            )}
+        />
+    );
+};
+export default ToDateController;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/index.jsx
@@ -1,13 +1,13 @@
-import StyledForm from "@/core/components/StyledForm";
-import SearchReportField from "./SearchReportField";
-
-const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => {
-    return (
-        <>
-            <StyledForm onSubmit={handleSubmit(onSearchSubmit)}>
-                <SearchReportField control={control} hasProvincesPermission={hasProvincesPermission} />
-            </StyledForm>
-        </>
-    );
-};
-export default SearchReportList;
+import StyledForm from "@/core/components/StyledForm";
+import SearchReportField from "./SearchReportField";
+
+const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => {
+    return (
+        <>
+            <StyledForm onSubmit={handleSubmit(onSearchSubmit)}>
+                <SearchReportField control={control} hasProvincesPermission={hasProvincesPermission} />
+            </StyledForm>
+        </>
+    );
+};
+export default SearchReportList;
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Toolbar.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Toolbar.jsx
@@ -1,11 +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;
+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;
--- a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx
+++ b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx
@@ -20,7 +20,7 @@ const ViolationForm = ({ setOpenMachinesDialog, mutate, openMachinesDialog }) =>
            data: {
                machine_code: result.machinesId.machine_code,
                km: result.km,
-                exit_station: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`,
+                exit_time: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`,
            },
        })
            .then((response) => {
--- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx
+++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx
@@ -11,13 +11,13 @@ const EditController = ({ rowId, mutate, setOpen, row }) => {

    const defaultData = {
        end_date: endDate,
-        end_time: row?.original?.enter_station ? new Date(row.original.enter_station) : null,
+        end_time: row?.original?.enter_time ? new Date(row.original.enter_time) : null,
    };
    const handleSubmit = async (result) => {
        const payload = {};

        if (result.end_date && result.end_time) {
-            payload.enter_station = `${result.end_date} ${moment(result.end_time).format("HH:mm")}`;
+            payload.enter_time = `${result.end_date} ${moment(result.end_time).format("HH:mm")}`;
        }

        await requestServer(`${EDIT_VIOLATION}/${rowId}`, "post", {
--- a/src/core/utils/pageMenu.js
+++ b/src/core/utils/pageMenu.js
@@ -35,6 +35,7 @@ import SpaceDashboardIcon from "@mui/icons-material/SpaceDashboard";
 import SpeedIcon from "@mui/icons-material/Speed";
 import SupervisedUserCircleIcon from "@mui/icons-material/SupervisedUserCircle";
 import TaxiAlertIcon from "@mui/icons-material/TaxiAlert";
+import AirlineSeatReclineNormalIcon from "@mui/icons-material/AirlineSeatReclineNormal";

 export const pageMenu = [
    {
@@ -211,6 +212,15 @@ export const pageMenu = [
                        badges: [{ key: "mission.request_portal" }],
                        permissions: ["all"],
                    },
+                    {
+                        id: "driverReports",
+                        label: "راننده",
+                        icon: <AirlineSeatReclineNormalIcon sx={{ width: "inherit", height: "inherit" }} />,
+                        type: "page",
+                        route: "/dashboard/road-missions/reports/driverReports",
+                        badges: [{ key: "mission.request_portal" }],
+                        permissions: ["all"],
+                    },
                ],
            },
        ],
--- a/src/core/utils/pageMenuDev.js
+++ b/src/core/utils/pageMenuDev.js
@@ -33,6 +33,7 @@ import SpaceDashboardIcon from "@mui/icons-material/SpaceDashboard";
 import SpeedIcon from "@mui/icons-material/Speed";
 import TaxiAlertIcon from "@mui/icons-material/TaxiAlert";
 import SupervisedUserCircleIcon from "@mui/icons-material/SupervisedUserCircle";
+import AirlineSeatReclineNormalIcon from "@mui/icons-material/AirlineSeatReclineNormal";

 export const pageMenuDev = [
    {
@@ -209,6 +210,15 @@ export const pageMenuDev = [
                        badges: [{ key: "mission.request_portal" }],
                        permissions: ["all"],
                    },
+                    {
+                        id: "driverReports",
+                        label: "راننده",
+                        icon: <AirlineSeatReclineNormalIcon sx={{ width: "inherit", height: "inherit" }} />,
+                        type: "page",
+                        route: "/dashboard/road-missions/reports/driverReports",
+                        badges: [{ key: "mission.request_portal" }],
+                        permissions: ["all"],
+                    },
                ],
            },
        ],
--- a/src/core/utils/routes.js
+++ b/src/core/utils/routes.js
@@ -256,9 +256,19 @@ export const EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT =
 export const EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT =
    api + "/api/v3/missions/report_machine/province_machines_activity_excel";

+export const GET_DRIVER_COUNTRY_ACTIVITY_REPORT =
+    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_PROVINCE_ACTIVITY_REPORT =
+    api + "/api/v3/missions/report_machine/province_machine_drivers_activity_excel";
+
 export const GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT =
    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 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 =
    api + "/api/v3/missions/report_machine/country_machine_types_activity_excel";
 export const EXPORT_GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT =
@@ -304,3 +314,4 @@ export const GET_STATIONS_LIST = api + "/api/v3/road_maintenance_station";
 export const UPDATE_MACHINE_STATUS_AND_LOCATION = api + "/api/v3/cmms_machines";
 export const GET_MACHINE_MISSIONS_DETAILS = api + "/api/v3/missions/report_machine/machine_details_report";
 export const GET_MACHINE_TYPE_MISSIONS_DETAILS = api + "/api/v3/missions/report_machine/machine_type_details_report";
+export const GET_DRIVER_DETAILS = api + "/api/v3/missions/report_machine/machine_driver_details_report";
Author	SHA1	Message	Date
AminGhasempoor	241f583572	merge develop	2026-06-14 11:50:40 +03:30
AminGhasempoor	3ea5c940c0	Merge branch 'develop' of http://git.witel.ir/RMS/frontend into feature/machine_type_report	2026-06-14 11:48:59 +03:30
AminGhasempoor	806854327a	build and format	2026-06-14 11:48:34 +03:30
AminGhasempoor	a80e35a510	driver reports completed	2026-06-14 11:47:24 +03:30
aminghasempoor	cb85157cf7	Merge pull request 'add map to new mission on rowAction of operators' (#7 ) from feature/routing into develop Reviewed-on: #7	2026-06-14 06:35:03 +00:00
mhmjalali	a9a996e1e8	add map to new mission on rowAction of operators	2026-06-14 09:49:13 +03:30