Merge pull request 'feature/missions_table_updates' (#13) from feature/missions_table_updates into develop

Reviewed-on: #13

.env.example

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

src/assets/images/prev-waypoint-icon.svg

@@ -0,0 +1,20 @@
+<svg width="30" height="35" viewBox="0 0 30 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M14.4453 1.5127C24.4711 1.08082 31.4173 11.6767 27.2842 20.9209L27.0752 21.3672C25.9614 23.6466 24.4616 25.0302 23.0117 26.2031C21.6264 27.3238 20.4204 28.1673 19.3184 29.4482L19.0986 29.71C18.9038 29.9504 18.5282 30.5355 18.0273 31.2695C17.8006 31.6018 17.5566 31.95 17.332 32.2393C17.2202 32.3833 17.0974 32.5329 16.9727 32.666C16.8723 32.7731 16.6754 32.9748 16.4141 33.124L16.4131 33.123C15.7088 33.5252 14.941 33.6027 14.2256 33.3691C13.5676 33.1543 13.0766 32.7195 12.7383 32.3145V32.3135C12.3056 31.795 11.9245 31.2168 11.5986 30.7314C11.3403 30.3467 11.107 30.0062 10.8682 29.7012L10.626 29.4072C9.78615 28.4447 8.79047 27.6829 7.65723 26.7939C6.63272 25.9903 5.49745 25.0829 4.54102 23.9053L4.35254 23.666C-2.23923 15.0669 3.27657 2.37649 13.958 1.54199L14.4453 1.5127ZM14.4834 10.8291H14.4795C11.4118 11.1538 9.65384 14.8452 11.3496 17.6201L11.5254 17.8857L11.6885 18.1016C13.3725 20.1841 16.6502 20.1828 18.334 18.1006L18.4961 17.8857C20.762 14.6868 18.2266 10.4356 14.4834 10.8291Z" stroke="white" stroke-width="3"/>
+    <foreignObject x="-62" y="-62" width="154" height="159"></foreignObject><g filter="url(#filter0_d_225_89)">
+    <path d="M14.0746 3.0373C23.3145 2.3154 29.8796 12.2097 25.7277 20.7091C23.782 24.6909 20.5139 25.583 17.9337 28.7657C17.4406 29.3741 16.126 31.5614 15.6708 31.8213C14.974 32.2197 14.3495 31.903 13.8898 31.3525C13.1462 30.4615 12.5552 29.3355 11.756 28.4207C9.85145 26.2379 7.27127 25.0075 5.54262 22.7533C-0.347943 15.0689 4.61651 3.77623 14.0746 3.0373ZM14.325 9.33689C9.9238 9.79999 7.70872 15.095 10.3011 18.7534C12.5786 21.9678 17.444 21.9644 19.7203 18.7534C22.7123 14.5298 19.3874 8.80455 14.3261 9.33689H14.325Z" fill="#FFC107"/>
+</g>
+    <defs>
+        <filter id="filter0_d_225_89" x="-62" y="-62" width="154" height="159" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+            <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+            <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+            <feOffset dy="1"/>
+            <feGaussianBlur stdDeviation="1"/>
+            <feComposite in2="hardAlpha" operator="out"/>
+            <feColorMatrix type="matrix" values="0 0 0 0 0.235294 0 0 0 0 0.25098 0 0 0 0 0.262745 0 0 0 0.3 0"/>
+            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_225_89"/>
+            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_225_89" result="shape"/>
+        </filter>
+        <clipPath id="bgblur_0_225_89_clip_path" transform="translate(62 62)"><path d="M14.0746 3.0373C23.3145 2.3154 29.8796 12.2097 25.7277 20.7091C23.782 24.6909 20.5139 25.583 17.9337 28.7657C17.4406 29.3741 16.126 31.5614 15.6708 31.8213C14.974 32.2197 14.3495 31.903 13.8898 31.3525C13.1462 30.4615 12.5552 29.3355 11.756 28.4207C9.85145 26.2379 7.27127 25.0075 5.54262 22.7533C-0.347943 15.0689 4.61651 3.77623 14.0746 3.0373ZM14.325 9.33689C9.9238 9.79999 7.70872 15.095 10.3011 18.7534C12.5786 21.9678 17.444 21.9644 19.7203 18.7534C22.7123 14.5298 19.3874 8.80455 14.3261 9.33689H14.325Z"/>
+        </clipPath>
+    </defs>
+</svg>

src/assets/images/waypoint-icon.svg

@@ -0,0 +1,21 @@
+<svg width="42" height="66" viewBox="0 0 42 66" fill="#FFC107" xmlns="http://www.w3.org/2000/svg">
+    <path opacity="0.3" d="M21 66C23.7614 66 26 64.8807 26 63.5C26 62.1193 23.7614 61 21 61C18.2386 61 16 62.1193 16 63.5C16 64.8807 18.2386 66 21 66Z" fill="#FFC107"/>
+    <path clip-rule="evenodd" d="M21 0C32.598 0 42 9.40202 42 21C42 31.9234 33.6599 40.8989 23 41.906V62C23 63.1046 22.1046 64 21 64C19.8954 64 19 63.1046 19 62V41.906C8.34014 40.8989 0 31.9234 0 21C0 9.40202 9.40202 0 21 0Z" fill="#FFC107"/>
+    <foreignObject x="-61" y="-61" width="164" height="164"></foreignObject><g filter="url(#filter0_d_173_69)">
+    <path d="M38 21C38 11.6112 30.3888 4 21 4C11.6112 4 4 11.6112 4 21C4 30.3888 11.6112 38 21 38C30.3888 38 38 30.3888 38 21Z" fill="#FFC107"/>
+</g>
+    <path d="M28 21C28 17.134 24.866 14 21 14C17.134 14 14 17.134 14 21C14 24.866 17.134 28 21 28C24.866 28 28 24.866 28 21Z" fill="white"/>
+    <defs>
+        <filter id="filter0_d_173_69" x="-61" y="-61" width="164" height="164" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+            <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+            <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+            <feOffset dy="1"/>
+            <feGaussianBlur stdDeviation="1"/>
+            <feComposite in2="hardAlpha" operator="out"/>
+            <feColorMatrix type="matrix" values="0 0 0 0 0.235294 0 0 0 0 0.25098 0 0 0 0 0.262745 0 0 0 0.3 0"/>
+            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_173_69"/>
+            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_173_69" result="shape"/>
+        </filter>
+        <clipPath id="bgblur_0_173_69_clip_path" transform="translate(61 61)"><path d="M38 21C38 11.6112 30.3888 4 21 4C11.6112 4 4 11.6112 4 21C4 30.3888 11.6112 38 21 38C30.3888 38 38 30.3888 38 21Z"/>
+        </clipPath></defs>
+</svg>

src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx

@@ -1,50 +1,135 @@
-import { Box, Button, TextField } from "@mui/material";
+import { Box, Stack, IconButton, Typography, Divider } from "@mui/material";
+import EditIcon from "@mui/icons-material/Edit";
+import CloseIcon from "@mui/icons-material/Close";
+import AddIcon from "@mui/icons-material/Add";
 
-const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => {
+const ROW_COLORS = {
+    source: "#0EA37A", // سبز
+    waypoint: "#F5A623", // زرد/نارنجی
+    dest: "#E53935", // قرمز
+};
+
+const formatCoord = (pos) => (pos ? `${pos.lat.toFixed(2)}, ${pos.lng.toFixed(2)}` : null);
+
+const Row = ({ color, label, value, onEdit, onRemove, placeholder = "در حال انتخاب..." }) => (
+    <Stack direction="row" alignItems="center" spacing={1} sx={{ py: 0.5 }}>
+        <Box
+            sx={{
+                width: 8,
+                height: 8,
+                borderRadius: "50%",
+                backgroundColor: color,
+                flexShrink: 0,
+            }}
+        />
+        <Box sx={{ minWidth: 0, flex: 1 }}>
+            <Typography variant="caption" sx={{ color: "#8A8A8A", lineHeight: 1, display: "block" }}>
+                {label}
+            </Typography>
+            <Typography
+                variant="body2"
+                sx={{
+                    fontFamily: "monospace",
+                    fontSize: 12,
+                    color: value ? "#1f1f1f" : "#bdbdbd",
+                    whiteSpace: "nowrap",
+                    overflow: "hidden",
+                    textOverflow: "ellipsis",
+                }}
+            >
+                {value || placeholder}
+            </Typography>
+        </Box>
+        {onEdit && (
+            <IconButton size="small" onClick={onEdit} sx={{ p: 0.5 }}>
+                <EditIcon sx={{ fontSize: 16, color: "#757575" }} />
+            </IconButton>
+        )}
+        {onRemove && (
+            <IconButton size="small" onClick={onRemove} sx={{ p: 0.5 }}>
+                <CloseIcon sx={{ fontSize: 16, color: "#E53935" }} />
+            </IconButton>
+        )}
+    </Stack>
+);
+
+const DataBox = ({
+    isSource,
+    isDest,
+    sourcePosition,
+    destPosition,
+    editingTarget,
+    onEditSource,
+    onEditDest,
+    waypoints = [],
+    onEditWaypoint,
+    onAddWaypoint,
+    onRemoveWaypoint,
+    canAddWaypoint,
+}) => {
     if (!isSource) return null;
 
     return (
         <Box
             sx={{
                 position: "absolute",
-                bottom: 5,
+                bottom: 12,
-                left: 5,
+                left: 12,
                 zIndex: 1000,
-                backgroundColor: "white",
+                backgroundColor: "rgba(255,255,255,0.95)",
-                border: "1px solid #e1e1e1",
+                backdropFilter: "blur(6px)",
-                padding: 1,
+                border: "1px solid #ececec",
                 borderRadius: 2,
-                opacity: 0.8,
+                boxShadow: "0 2px 10px rgba(0,0,0,0.12)",
-                gap: 1,
+                px: 1.25,
-                display: "flex",
+                py: 0.75,
-                flexDirection: "column",
+                width: 230,
+                maxWidth: "70vw",
             }}
         >
-            <div style={{ display: "flex", alignItems: "end", gap: 4 }}>
+            <Row
-                <TextField
+                color={ROW_COLORS.source}
-                    variant="outlined"
+                label="مبدا"
-                    size="small"
+                value={formatCoord(sourcePosition)}
-                    readOnly
+                onEdit={isSource && isDest ? onEditSource : null}
-                    value={sourcePosition ? `${sourcePosition.lat.toFixed(6)}, ${sourcePosition.lng.toFixed(6)}` : ""}
+            />
+
+            {waypoints.map((wp, index) => (
+                <Row
+                    key={`waypoint-${index}`}
+                    color={ROW_COLORS.waypoint}
+                    label={`نقطه میانی ${index + 1}`}
+                    value={formatCoord(wp.position)}
+                    onEdit={wp.confirmed && editingTarget !== `waypoint-${index}` ? () => onEditWaypoint(index) : null}
+                    onRemove={() => onRemoveWaypoint(index)}
                 />
-                {isSource && isDest && (
+            ))}
-                    <Button variant="contained" color="success" size="small" onClick={onEditSource}>
+
-                        ویرایش مبدا
-                    </Button>
-                )}
-            </div>
             {isDest && (
-                <div style={{ display: "flex", alignItems: "end", gap: 4 }}>
+                <Row color={ROW_COLORS.dest} label="مقصد" value={formatCoord(destPosition)} onEdit={onEditDest} />
-                    <TextField
+            )}
-                        size="small"
+
-                        variant="outlined"
+            {canAddWaypoint && (
-                        readOnly
+                <>
-                        value={destPosition ? `${destPosition.lat.toFixed(6)}, ${destPosition.lng.toFixed(6)}` : ""}
+                    <Divider sx={{ my: 0.5 }} />
-                    />
+                    <Stack
-                    <Button variant="contained" color="error" size="small" onClick={onEditDest}>
+                        direction="row"
-                        ویرایش مقصد
+                        alignItems="center"
-                    </Button>
+                        spacing={0.5}
-                </div>
+                        onClick={onAddWaypoint}
+                        sx={{
+                            cursor: "pointer",
+                            color: ROW_COLORS.waypoint,
+                            py: 0.25,
+                            "&:hover": { opacity: 0.75 },
+                        }}
+                    >
+                        <AddIcon sx={{ fontSize: 16 }} />
+                        <Typography variant="caption" sx={{ fontWeight: 600 }}>
+                            افزودن نقطه میانی
+                        </Typography>
+                    </Stack>
+                </>
             )}
         </Box>
     );

src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/ShowRoute.jsx

@@ -55,3 +55,74 @@ const ShowRoute = ({ area }) => {
 };
 
 export default ShowRoute;
+
+// import { useEffect, useState } 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";
+// import WaypointIcon from "@/assets/images/waypoint-icon.svg";
+//
+// 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]],
+//     });
+// };
+//
+// const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src);
+// const destIcon = createCustomIcon(defaultIconSize, DestIcon.src);
+// const waypointIcon = createCustomIcon(defaultIconSize, WaypointIcon.src);
+//
+// // locations: آرایه اختیاری [{lat, lon}, ...] شامل مبدا، نقاط میانی و مقصد به همون ترتیبی که برای روتینگ فرستاده شده
+// const ShowRoute = ({ area, locations = [] }) => {
+//     const map = useMap();
+//     const [showRoute, setShowRoute] = useState(false);
+//
+//     const coords = area ? polyline.decode(area, 6) : [];
+//
+//     useEffect(() => {
+//         if (!coords.length) return;
+//
+//         setShowRoute(false);
+//
+//         map.flyToBounds(coords, {
+//             padding: [50, 50],
+//             duration: 1.5,
+//         });
+//
+//         map.once("moveend", () => {
+//             setShowRoute(true);
+//         });
+//         // eslint-disable-next-line react-hooks/exhaustive-deps
+//     }, [area]);
+//
+//     if (!area || coords.length === 0) return null;
+//
+//     const sourcePosition = coords[0];
+//     const destPosition = coords[coords.length - 1];
+//
+//     // نقاط میانی فقط از روی locations قابل استخراج‌ان (بین اولی و آخری)
+//     const middleWaypoints = locations.length > 2 ? locations.slice(1, -1) : [];
+//
+//     return (
+//         <>
+//             {showRoute && <Polyline positions={coords} color="#015688" weight={7} />}
+//
+//             <Marker position={sourcePosition} icon={sourceIcon} />
+//
+//             {middleWaypoints.map((wp, index) => (
+//                 <Marker key={`waypoint-${index}`} position={[wp.lat, wp.lon]} icon={waypointIcon} />
+//             ))}
+//
+//             <Marker position={destPosition} icon={destIcon} />
+//         </>
+//     );
+// };
+//
+// export default ShowRoute;

src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx

@@ -5,19 +5,29 @@ 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 WaypointIcon from "@/assets/images/prev-waypoint-icon.svg";
+import PrevWaypointIcon from "@/assets/images/waypoint-icon.svg";
 import { useEffect, useRef, useState } from "react";
 import DataBox from "./DataBox";
 import AlarmText from "./AlarmText";
 
+const MAX_WAYPOINTS = 2;
+
 const Routing = ({ setArea, setLocations, locations, area }) => {
     const mapPrevSourceMarker = useRef();
     const mapPrevDestMarker = useRef();
+    const mapPrevWaypointMarkers = useRef([]); // ref array, یکی به‌ازای هر waypoint
     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 [waypoints, setWaypoints] = useState([]);
+
     const [routeCoords, setRouteCoords] = useState([]);
     const [alternateCoords, setAlternateCoords] = useState([]);
     const [editingTarget, setEditingTarget] = useState(null);
@@ -42,24 +52,55 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
         isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src
     );
 
-    const isMovingSource = !isSource || editingTarget === "source";
+    const getWaypointIcon = (index) => {
-    const isMovingDest = isSource && (!isDest || editingTarget === "dest");
+        const wp = waypoints[index];
+        const isConfirmed = wp?.confirmed && editingTarget !== `waypoint-${index}`;
+        return createCustomIcon(defaultIconSize, isConfirmed ? WaypointIcon.src : PrevWaypointIcon.src);
+    };
+
+    const getActiveTarget = () => {
+        if (editingTarget) return editingTarget;
+        if (!isSource) return "source";
+        const pendingWaypointIndex = waypoints.findIndex((wp) => !wp.confirmed);
+        if (pendingWaypointIndex !== -1) return `waypoint-${pendingWaypointIndex}`;
+        if (!isDest) return "dest";
+        return null;
+    };
 
     const map = useMapEvents({
         move(e) {
-            if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter());
+            const target = getActiveTarget();
-            if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter());
+            const center = e.target.getCenter();
+            if (target === "source") {
+                mapPrevSourceMarker.current?.setLatLng(center);
+            } else if (target === "dest") {
+                mapPrevDestMarker.current?.setLatLng(center);
+            } else if (target?.startsWith("waypoint-")) {
+                const idx = Number(target.split("-")[1]);
+                mapPrevWaypointMarkers.current[idx]?.setLatLng(center);
+            }
         },
         movestart() {
-            if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src));
+            const target = getActiveTarget();
-            if (isMovingDest && mapPrevDestMarker.current)
+            if (target === "source") {
-                mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src));
+                mapPrevSourceMarker.current?.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src));
+            } else if (target === "dest") {
+                mapPrevDestMarker.current?.setIcon(createCustomIcon([45, 45], PrevDestIcon.src));
+            } else if (target?.startsWith("waypoint-")) {
+                const idx = Number(target.split("-")[1]);
+                mapPrevWaypointMarkers.current[idx]?.setIcon(createCustomIcon([45, 45], PrevWaypointIcon.src));
+            }
         },
         moveend() {
-            if (isMovingSource)
+            const target = getActiveTarget();
-                mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src));
+            if (target === "source") {
-            if (isMovingDest && mapPrevDestMarker.current)
+                mapPrevSourceMarker.current?.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src));
-                mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src));
+            } else if (target === "dest") {
+                mapPrevDestMarker.current?.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src));
+            } else if (target?.startsWith("waypoint-")) {
+                const idx = Number(target.split("-")[1]);
+                mapPrevWaypointMarkers.current[idx]?.setIcon(createCustomIcon(defaultIconSize, PrevWaypointIcon.src));
+            }
         },
     });
 
@@ -69,12 +110,19 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
 
     useEffect(() => {
         if (locations.length < 2) return;
-        const restoredSource = { lat: locations[0].lat, lng: locations[0].lon };
+        const first = { lat: locations[0].lat, lng: locations[0].lon };
-        const restoredDest = { lat: locations[1].lat, lng: locations[1].lon };
+        const last = { lat: locations[locations.length - 1].lat, lng: locations[locations.length - 1].lon };
-        setSourcePosition(restoredSource);
+        const middle = locations.slice(1, -1).map((loc) => ({
-        setDestPosition(restoredDest);
+            position: { lat: loc.lat, lng: loc.lon },
+            confirmed: true,
+        }));
+
+        setSourcePosition(first);
+        setDestPosition(last);
+        setWaypoints(middle);
         setIsSource(true);
         setIsDest(true);
+
         if (area) {
             const decoded = polyline.decode(area, 6);
             setRouteCoords(decoded);
@@ -83,13 +131,15 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
                 mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 });
             }, 100);
         } else {
-            fetchRoute(restoredSource, restoredDest);
+            fetchRoute(first, last, middle);
         }
     }, []);
 
-    const fetchRoute = async (source, dest) => {
+    const fetchRoute = async (source, dest, waypointsList = waypoints) => {
+        const confirmedWaypoints = waypointsList.filter((wp) => wp.confirmed && wp.position);
         const locs = [
             { lat: source.lat, lon: source.lng },
+            ...confirmedWaypoints.map((wp) => ({ lat: wp.position.lat, lon: wp.position.lng })),
             { lat: dest.lat, lon: dest.lng },
         ];
         try {
@@ -118,18 +168,23 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
         }
     };
 
+    const resetRoute = () => {
+        setRouteCoords([]);
+        setAlternateCoords([]);
+        setSelectedRoute(null);
+    };
+
     const handleMarkerClick = async () => {
         if (!isSource || editingTarget === "source") {
             const clickedPosition = mapPrevSourceMarker.current.getLatLng();
             setSourcePosition(clickedPosition);
             setIsSource(true);
+            const wasEditing = editingTarget === "source";
             setEditingTarget(null);
-            setRouteCoords([]);
+            resetRoute();
-            setAlternateCoords([]);
-            setSelectedRoute(null);
 
-            if (editingTarget === "source" && destPosition) {
+            if (wasEditing && destPosition) {
-                await fetchRoute(clickedPosition, destPosition);
+                await fetchRoute(clickedPosition, destPosition, waypoints);
             }
         }
     };
@@ -140,23 +195,65 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
             setDestPosition(clickedPosition);
             setIsDest(true);
             setEditingTarget(null);
+            resetRoute();
 
-            await fetchRoute(sourcePosition, clickedPosition);
+            await fetchRoute(sourcePosition, clickedPosition, waypoints);
+        }
+    };
+
+    const handleWaypointMarkerClick = async (index) => {
+        const wp = waypoints[index];
+        if (!wp || wp.confirmed) return; // فقط روی نقطه‌ی تأیید‌نشده کلیک معتبره (یا حالت ادیت)
+
+        const clickedPosition = mapPrevWaypointMarkers.current[index]?.getLatLng();
+        const updated = waypoints.map((w, i) => (i === index ? { position: clickedPosition, confirmed: true } : w));
+        setWaypoints(updated);
+        const wasEditing = editingTarget === `waypoint-${index}`;
+        setEditingTarget(null);
+        resetRoute();
+
+        if (sourcePosition && destPosition) {
+            await fetchRoute(sourcePosition, destPosition, updated);
         }
     };
 
     const handleEditSource = () => {
         setEditingTarget("source");
-        setRouteCoords([]);
+        resetRoute();
-        setAlternateCoords([]);
-        setSelectedRoute(null);
     };
 
     const handleEditDest = () => {
         setEditingTarget("dest");
-        setRouteCoords([]);
+        resetRoute();
-        setAlternateCoords([]);
+    };
-        setSelectedRoute(null);
+
+    const handleEditWaypoint = (index) => {
+        // برای ادیت یک waypoint تأییدشده، موقتاً unconfirmed می‌کنیم تا با حرکت نقشه جابه‌جا بشه
+        setWaypoints((prev) => prev.map((w, i) => (i === index ? { ...w, confirmed: false } : w)));
+        setEditingTarget(`waypoint-${index}`);
+        resetRoute();
+    };
+
+    // اضافه کردن یک نقطه میانی جدید (حداکثر MAX_WAYPOINTS)
+    const handleAddWaypoint = () => {
+        if (waypoints.length >= MAX_WAYPOINTS) return;
+        if (!isSource) return; // قبل از انتخاب مبدا معنی نداره
+        setWaypoints((prev) => [...prev, { position: null, confirmed: false }]);
+        setEditingTarget(`waypoint-${waypoints.length}`);
+        resetRoute();
+    };
+
+    // حذف یک نقطه میانی
+    const handleRemoveWaypoint = async (index) => {
+        const updated = waypoints.filter((_, i) => i !== index);
+        setWaypoints(updated);
+        mapPrevWaypointMarkers.current = mapPrevWaypointMarkers.current.filter((_, i) => i !== index);
+        if (editingTarget === `waypoint-${index}`) setEditingTarget(null);
+        resetRoute();
+
+        if (sourcePosition && destPosition) {
+            await fetchRoute(sourcePosition, destPosition, updated);
+        }
     };
 
     const handleSelectRoute = (index, coords) => {
@@ -176,14 +273,31 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
                 editingTarget={editingTarget}
                 onEditSource={handleEditSource}
                 onEditDest={handleEditDest}
+                waypoints={waypoints}
+                onEditWaypoint={handleEditWaypoint}
+                onAddWaypoint={handleAddWaypoint}
+                onRemoveWaypoint={handleRemoveWaypoint}
+                canAddWaypoint={isSource && waypoints.length < MAX_WAYPOINTS}
             />
             <AlarmText isSource={isSource} />
+
             <Marker
                 position={sourcePosition || map.getCenter()}
                 ref={mapPrevSourceMarker}
                 eventHandlers={{ click: handleMarkerClick }}
                 icon={defaultIcon}
             />
+
+            {waypoints.map((wp, index) => (
+                <Marker
+                    key={`waypoint-${index}`}
+                    position={wp.position || map.getCenter()}
+                    ref={(el) => (mapPrevWaypointMarkers.current[index] = el)}
+                    eventHandlers={{ click: () => handleWaypointMarkerClick(index) }}
+                    icon={getWaypointIcon(index)}
+                />
+            ))}
+
             {isSource && (
                 <Marker
                     position={destPosition || map.getCenter()}
@@ -192,6 +306,7 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
                     icon={prevDestIcon}
                 />
             )}
+
             {alternateCoords.map((coords, index) => (
                 <Polyline
                     key={`alternate-${index}-${selectedRoute?.index === index}`}

src/components/dashboard/roadMissions/operator/Actions/Create/Form/GetItemInfo/ItemSelectField.jsx

@@ -0,0 +1,34 @@
+import useRoadItemGetItems from "@/lib/hooks/useRoadItemGetItems";
+import { Controller } from "react-hook-form";
+import SelectBox from "@/core/components/SelectBox";
+
+const ItemSelectField = ({ control, setValue }) => {
+    const { itemsList, loadingItemsList, errorItemsList } = useRoadItemGetItems();
+    function getItemName(val) {
+        return itemsList.find((item) => item.id === val)?.name;
+    }
+
+    return (
+        <Controller
+            control={control}
+            name={"item_id"}
+            render={({ field, fieldState: { error } }) => (
+                <SelectBox
+                    value={field.value}
+                    label="موضوع"
+                    selectors={itemsList}
+                    isLoading={loadingItemsList}
+                    schema={{ name: "name", value: "id" }}
+                    error={errorItemsList}
+                    helperText={error?.message}
+                    onChange={(value) => {
+                        field.onChange(value);
+                        setValue("explanation", getItemName(value));
+                        setValue("sub_item_id", "");
+                    }}
+                />
+            )}
+        />
+    );
+};
+export default ItemSelectField;

src/components/dashboard/roadMissions/operator/Actions/Create/Form/GetItemInfo/SubItemSelectField.jsx

@@ -0,0 +1,37 @@
+import useRoadItemGetSubItems from "@/lib/hooks/useRoadItemGetISubtems";
+import { Controller } from "react-hook-form";
+import SelectBox from "@/core/components/SelectBox";
+
+const SubItemSelectField = ({ control, watch, setValue, getValues }) => {
+    const itemId = watch("item_id");
+    const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetSubItems(itemId);
+
+    function createExplanation(val) {
+        const currentExplanation = getValues("explanation");
+        const selectedItem = subItemsList.find((item) => item.id === val)?.name;
+        return `${currentExplanation}-${selectedItem}`;
+    }
+
+    return (
+        <Controller
+            control={control}
+            name={"sub_item_id"}
+            render={({ field, fieldState: { error } }) => (
+                <SelectBox
+                    value={field.value}
+                    label="اقدام انجام شده"
+                    selectors={subItemsList}
+                    isLoading={loadingSubItemsList}
+                    schema={{ name: "name", value: "id" }}
+                    error={errorSubItemsList}
+                    helperText={error?.message}
+                    onChange={(val) => {
+                        field.onChange(val);
+                        setValue("explanation", createExplanation(val));
+                    }}
+                />
+            )}
+        />
+    );
+};
+export default SubItemSelectField;

src/components/dashboard/roadMissions/operator/Actions/Create/Form/GetItemInfo/index.jsx

@@ -9,12 +9,15 @@ import { ExitToApp } from "@mui/icons-material";
 import { Box, Button, DialogActions, DialogContent, Grid, Stack } from "@mui/material";
 import { Controller, useForm } from "react-hook-form";
 import { array, object, string } from "yup";
+import ItemSelectField from "./ItemSelectField";
+import SubItemSelectField from "./SubItemSelectField";
 
 const validationSchema = object({
-    explanation: string().required("موضوع را مشخص کنید!"),
     end_point: string().required("مقصد را مشخص کنید!"),
     region: string().required("محور ماموریت را مشخص کنید!"),
     category_id: string().required("نوع ماموریت را مشخص کنید!"),
+    item_id: string().required("موضوع را مشخص کنید!"),
+    sub_item_id: string().required("اقدام انجام شده را مشخص کنید!"),
     requested_machines: array().min(1, "نوع خودرو را مشخص کنید!").required("نوع خودرو را مشخص کنید!"),
     road_observed_id: string().when("category_id", {
         is: "3",
@@ -25,6 +28,8 @@ const validationSchema = object({
 
 const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => {
     const defaultValues = {
+        item_id: allData.item_id,
+        sub_item_id: allData.sub_item_id,
         explanation: allData.explanation,
         end_point: allData.end_point,
         region: allData.region,
@@ -33,7 +38,7 @@ const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => {
         road_observed_id: allData.road_observed_id,
     };
 
-    const { control, handleSubmit } = useForm({
+    const { control, handleSubmit, watch, setValue, getValues } = useForm({
         defaultValues,
         resolver: yupResolver(validationSchema),
         mode: "all",
@@ -51,24 +56,14 @@ const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => {
                     <Stack>
                         <Grid container spacing={2}>
                             <Grid item xs={12} sm={6}>
-                                <Controller
+                                <ItemSelectField control={control} watch={watch} setValue={setValue} />
+                            </Grid>
+                            <Grid item xs={12} sm={6}>
+                                <SubItemSelectField
                                     control={control}
-                                    name={"explanation"}
+                                    watch={watch}
-                                    render={({ field, fieldState: { error } }) => (
+                                    setValue={setValue}
-                                        <PersianTextField
+                                    getValues={getValues}
-                                            value={field.value}
-                                            variant="outlined"
-                                            name="explanation"
-                                            onChange={field.onChange}
-                                            label="موضوع"
-                                            placeholder={"موضوع را وارد کنید"}
-                                            fullWidth
-                                            size="small"
-                                            error={error}
-                                            helperText={error?.message}
-                                            InputLabelProps={{ shrink: true }}
-                                        />
-                                    )}
                                 />
                             </Grid>
                             <Grid item xs={12} sm={6}>

src/components/dashboard/roadMissions/operator/Actions/Create/index.jsx

@@ -44,6 +44,8 @@ const Create = ({ mutate }) => {
                           start_date: result.start_date,
                           end_date: result.end_date,
                       }),
+                item_id: result.item_id,
+                sub_item_id: result.sub_item_id,
             },
             hasSidebarUpdate: true,
         })
@@ -93,6 +95,8 @@ const Create = ({ mutate }) => {
                         defaultValues={{
                             explanation: "",
                             category_id: "",
+                            item_id: null,
+                            sub_item_id: null,
                             road_observed_id: "",
                             rahdaran: [],
                             requested_machines: [],

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

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

src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/DataBox.jsx

@@ -1,50 +1,135 @@
-import { Box, Button, TextField } from "@mui/material";
+import { Box, Stack, IconButton, Typography, Divider } from "@mui/material";
+import EditIcon from "@mui/icons-material/Edit";
+import CloseIcon from "@mui/icons-material/Close";
+import AddIcon from "@mui/icons-material/Add";
 
-const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => {
+const ROW_COLORS = {
+    source: "#0EA37A", // سبز
+    waypoint: "#F5A623", // زرد/نارنجی
+    dest: "#E53935", // قرمز
+};
+
+const formatCoord = (pos) => (pos ? `${pos.lat.toFixed(2)}, ${pos.lng.toFixed(2)}` : null);
+
+const Row = ({ color, label, value, onEdit, onRemove, placeholder = "در حال انتخاب..." }) => (
+    <Stack direction="row" alignItems="center" spacing={1} sx={{ py: 0.5 }}>
+        <Box
+            sx={{
+                width: 8,
+                height: 8,
+                borderRadius: "50%",
+                backgroundColor: color,
+                flexShrink: 0,
+            }}
+        />
+        <Box sx={{ minWidth: 0, flex: 1 }}>
+            <Typography variant="caption" sx={{ color: "#8A8A8A", lineHeight: 1, display: "block" }}>
+                {label}
+            </Typography>
+            <Typography
+                variant="body2"
+                sx={{
+                    fontFamily: "monospace",
+                    fontSize: 12,
+                    color: value ? "#1f1f1f" : "#bdbdbd",
+                    whiteSpace: "nowrap",
+                    overflow: "hidden",
+                    textOverflow: "ellipsis",
+                }}
+            >
+                {value || placeholder}
+            </Typography>
+        </Box>
+        {onEdit && (
+            <IconButton size="small" onClick={onEdit} sx={{ p: 0.5 }}>
+                <EditIcon sx={{ fontSize: 16, color: "#757575" }} />
+            </IconButton>
+        )}
+        {onRemove && (
+            <IconButton size="small" onClick={onRemove} sx={{ p: 0.5 }}>
+                <CloseIcon sx={{ fontSize: 16, color: "#E53935" }} />
+            </IconButton>
+        )}
+    </Stack>
+);
+
+const DataBox = ({
+    isSource,
+    isDest,
+    sourcePosition,
+    destPosition,
+    editingTarget,
+    onEditSource,
+    onEditDest,
+    waypoints = [],
+    onEditWaypoint,
+    onAddWaypoint,
+    onRemoveWaypoint,
+    canAddWaypoint,
+}) => {
     if (!isSource) return null;
 
     return (
         <Box
             sx={{
                 position: "absolute",
-                bottom: 5,
+                bottom: 12,
-                left: 5,
+                left: 12,
                 zIndex: 1000,
-                backgroundColor: "white",
+                backgroundColor: "rgba(255,255,255,0.95)",
-                border: "1px solid #e1e1e1",
+                backdropFilter: "blur(6px)",
-                padding: 1,
+                border: "1px solid #ececec",
                 borderRadius: 2,
-                opacity: 0.8,
+                boxShadow: "0 2px 10px rgba(0,0,0,0.12)",
-                gap: 1,
+                px: 1.25,
-                display: "flex",
+                py: 0.75,
-                flexDirection: "column",
+                width: 230,
+                maxWidth: "70vw",
             }}
         >
-            <div style={{ display: "flex", alignItems: "end", gap: 4 }}>
+            <Row
-                <TextField
+                color={ROW_COLORS.source}
-                    variant="outlined"
+                label="مبدا"
-                    size="small"
+                value={formatCoord(sourcePosition)}
-                    readOnly
+                onEdit={isSource && isDest ? onEditSource : null}
-                    value={sourcePosition ? `${sourcePosition.lat.toFixed(6)}, ${sourcePosition.lng.toFixed(6)}` : ""}
+            />
+
+            {waypoints.map((wp, index) => (
+                <Row
+                    key={`waypoint-${index}`}
+                    color={ROW_COLORS.waypoint}
+                    label={`نقطه میانی ${index + 1}`}
+                    value={formatCoord(wp.position)}
+                    onEdit={wp.confirmed && editingTarget !== `waypoint-${index}` ? () => onEditWaypoint(index) : null}
+                    onRemove={() => onRemoveWaypoint(index)}
                 />
-                {isSource && isDest && (
+            ))}
-                    <Button variant="contained" color="success" size="small" onClick={onEditSource}>
+
-                        ویرایش مبدا
-                    </Button>
-                )}
-            </div>
             {isDest && (
-                <div style={{ display: "flex", alignItems: "end", gap: 4 }}>
+                <Row color={ROW_COLORS.dest} label="مقصد" value={formatCoord(destPosition)} onEdit={onEditDest} />
-                    <TextField
+            )}
-                        size="small"
+
-                        variant="outlined"
+            {canAddWaypoint && (
-                        readOnly
+                <>
-                        value={destPosition ? `${destPosition.lat.toFixed(6)}, ${destPosition.lng.toFixed(6)}` : ""}
+                    <Divider sx={{ my: 0.5 }} />
-                    />
+                    <Stack
-                    <Button variant="contained" color="error" size="small" onClick={onEditDest}>
+                        direction="row"
-                        ویرایش مقصد
+                        alignItems="center"
-                    </Button>
+                        spacing={0.5}
-                </div>
+                        onClick={onAddWaypoint}
+                        sx={{
+                            cursor: "pointer",
+                            color: ROW_COLORS.waypoint,
+                            py: 0.25,
+                            "&:hover": { opacity: 0.75 },
+                        }}
+                    >
+                        <AddIcon sx={{ fontSize: 16 }} />
+                        <Typography variant="caption" sx={{ fontWeight: 600 }}>
+                            افزودن نقطه میانی
+                        </Typography>
+                    </Stack>
+                </>
             )}
         </Box>
     );

src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/ShowRoute.jsx

@@ -1,4 +1,4 @@
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Marker, Polyline, useMap } from "react-leaflet";
 import L from "leaflet";
 import polyline from "@mapbox/polyline";
@@ -20,12 +20,22 @@ const ShowRoute = ({ area }) => {
 
     const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src);
     const destIcon = createCustomIcon(defaultIconSize, DestIcon.src);
-    useEffect(() => {
+    const [showRoute, setShowRoute] = useState(false);
-        if (coords.length > 0) {
-            map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 });
-        }
-    }, [area]);
 
+    useEffect(() => {
+        if (!coords.length) return;
+
+        setShowRoute(false);
+
+        map.flyToBounds(coords, {
+            padding: [50, 50],
+            duration: 1.5,
+        });
+
+        map.once("moveend", () => {
+            setShowRoute(true);
+        });
+    }, [area]);
     if (!area) return null;
     const coords = polyline.decode(area, 6);
 
@@ -36,7 +46,8 @@ const ShowRoute = ({ area }) => {
 
     return (
         <>
-            <Polyline positions={coords} color="#015688" weight={7} opacity={1} />
+            {showRoute && <Polyline positions={coords} color="#015688" weight={7} />}
+
             <Marker position={sourcePosition} icon={sourceIcon} />
             <Marker position={destPosition} icon={destIcon} />
         </>
@@ -44,3 +55,74 @@ const ShowRoute = ({ area }) => {
 };
 
 export default ShowRoute;
+
+// import { useEffect, useState } 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";
+// import WaypointIcon from "@/assets/images/waypoint-icon.svg";
+//
+// 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]],
+//     });
+// };
+//
+// const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src);
+// const destIcon = createCustomIcon(defaultIconSize, DestIcon.src);
+// const waypointIcon = createCustomIcon(defaultIconSize, WaypointIcon.src);
+//
+// // locations: آرایه اختیاری [{lat, lon}, ...] شامل مبدا، نقاط میانی و مقصد به همون ترتیبی که برای روتینگ فرستاده شده
+// const ShowRoute = ({ area, locations = [] }) => {
+//     const map = useMap();
+//     const [showRoute, setShowRoute] = useState(false);
+//
+//     const coords = area ? polyline.decode(area, 6) : [];
+//
+//     useEffect(() => {
+//         if (!coords.length) return;
+//
+//         setShowRoute(false);
+//
+//         map.flyToBounds(coords, {
+//             padding: [50, 50],
+//             duration: 1.5,
+//         });
+//
+//         map.once("moveend", () => {
+//             setShowRoute(true);
+//         });
+//         // eslint-disable-next-line react-hooks/exhaustive-deps
+//     }, [area]);
+//
+//     if (!area || coords.length === 0) return null;
+//
+//     const sourcePosition = coords[0];
+//     const destPosition = coords[coords.length - 1];
+//
+//     // نقاط میانی فقط از روی locations قابل استخراج‌ان (بین اولی و آخری)
+//     const middleWaypoints = locations.length > 2 ? locations.slice(1, -1) : [];
+//
+//     return (
+//         <>
+//             {showRoute && <Polyline positions={coords} color="#015688" weight={7} />}
+//
+//             <Marker position={sourcePosition} icon={sourceIcon} />
+//
+//             {middleWaypoints.map((wp, index) => (
+//                 <Marker key={`waypoint-${index}`} position={[wp.lat, wp.lon]} icon={waypointIcon} />
+//             ))}
+//
+//             <Marker position={destPosition} icon={destIcon} />
+//         </>
+//     );
+// };
+//
+// export default ShowRoute;

src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/index.jsx

@@ -5,19 +5,29 @@ 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 WaypointIcon from "@/assets/images/prev-waypoint-icon.svg";
+import PrevWaypointIcon from "@/assets/images/waypoint-icon.svg";
 import { useEffect, useRef, useState } from "react";
 import DataBox from "./DataBox";
 import AlarmText from "./AlarmText";
 
+const MAX_WAYPOINTS = 2;
+
 const Routing = ({ setArea, setLocations, locations, area }) => {
     const mapPrevSourceMarker = useRef();
     const mapPrevDestMarker = useRef();
+    const mapPrevWaypointMarkers = useRef([]); // ref array, یکی به‌ازای هر waypoint
     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 [waypoints, setWaypoints] = useState([]);
+
     const [routeCoords, setRouteCoords] = useState([]);
     const [alternateCoords, setAlternateCoords] = useState([]);
     const [editingTarget, setEditingTarget] = useState(null);
@@ -42,24 +52,55 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
         isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src
     );
 
-    const isMovingSource = !isSource || editingTarget === "source";
+    const getWaypointIcon = (index) => {
-    const isMovingDest = isSource && (!isDest || editingTarget === "dest");
+        const wp = waypoints[index];
+        const isConfirmed = wp?.confirmed && editingTarget !== `waypoint-${index}`;
+        return createCustomIcon(defaultIconSize, isConfirmed ? WaypointIcon.src : PrevWaypointIcon.src);
+    };
+
+    const getActiveTarget = () => {
+        if (editingTarget) return editingTarget;
+        if (!isSource) return "source";
+        const pendingWaypointIndex = waypoints.findIndex((wp) => !wp.confirmed);
+        if (pendingWaypointIndex !== -1) return `waypoint-${pendingWaypointIndex}`;
+        if (!isDest) return "dest";
+        return null;
+    };
 
     const map = useMapEvents({
         move(e) {
-            if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter());
+            const target = getActiveTarget();
-            if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter());
+            const center = e.target.getCenter();
+            if (target === "source") {
+                mapPrevSourceMarker.current?.setLatLng(center);
+            } else if (target === "dest") {
+                mapPrevDestMarker.current?.setLatLng(center);
+            } else if (target?.startsWith("waypoint-")) {
+                const idx = Number(target.split("-")[1]);
+                mapPrevWaypointMarkers.current[idx]?.setLatLng(center);
+            }
         },
         movestart() {
-            if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src));
+            const target = getActiveTarget();
-            if (isMovingDest && mapPrevDestMarker.current)
+            if (target === "source") {
-                mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src));
+                mapPrevSourceMarker.current?.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src));
+            } else if (target === "dest") {
+                mapPrevDestMarker.current?.setIcon(createCustomIcon([45, 45], PrevDestIcon.src));
+            } else if (target?.startsWith("waypoint-")) {
+                const idx = Number(target.split("-")[1]);
+                mapPrevWaypointMarkers.current[idx]?.setIcon(createCustomIcon([45, 45], PrevWaypointIcon.src));
+            }
         },
         moveend() {
-            if (isMovingSource)
+            const target = getActiveTarget();
-                mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src));
+            if (target === "source") {
-            if (isMovingDest && mapPrevDestMarker.current)
+                mapPrevSourceMarker.current?.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src));
-                mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src));
+            } else if (target === "dest") {
+                mapPrevDestMarker.current?.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src));
+            } else if (target?.startsWith("waypoint-")) {
+                const idx = Number(target.split("-")[1]);
+                mapPrevWaypointMarkers.current[idx]?.setIcon(createCustomIcon(defaultIconSize, PrevWaypointIcon.src));
+            }
         },
     });
 
@@ -69,12 +110,19 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
 
     useEffect(() => {
         if (locations.length < 2) return;
-        const restoredSource = { lat: locations[0].lat, lng: locations[0].lon };
+        const first = { lat: locations[0].lat, lng: locations[0].lon };
-        const restoredDest = { lat: locations[1].lat, lng: locations[1].lon };
+        const last = { lat: locations[locations.length - 1].lat, lng: locations[locations.length - 1].lon };
-        setSourcePosition(restoredSource);
+        const middle = locations.slice(1, -1).map((loc) => ({
-        setDestPosition(restoredDest);
+            position: { lat: loc.lat, lng: loc.lon },
+            confirmed: true,
+        }));
+
+        setSourcePosition(first);
+        setDestPosition(last);
+        setWaypoints(middle);
         setIsSource(true);
         setIsDest(true);
+
         if (area) {
             const decoded = polyline.decode(area, 6);
             setRouteCoords(decoded);
@@ -83,13 +131,15 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
                 mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 });
             }, 100);
         } else {
-            fetchRoute(restoredSource, restoredDest);
+            fetchRoute(first, last, middle);
         }
     }, []);
 
-    const fetchRoute = async (source, dest) => {
+    const fetchRoute = async (source, dest, waypointsList = waypoints) => {
+        const confirmedWaypoints = waypointsList.filter((wp) => wp.confirmed && wp.position);
         const locs = [
             { lat: source.lat, lon: source.lng },
+            ...confirmedWaypoints.map((wp) => ({ lat: wp.position.lat, lon: wp.position.lng })),
             { lat: dest.lat, lon: dest.lng },
         ];
         try {
@@ -118,18 +168,23 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
         }
     };
 
+    const resetRoute = () => {
+        setRouteCoords([]);
+        setAlternateCoords([]);
+        setSelectedRoute(null);
+    };
+
     const handleMarkerClick = async () => {
         if (!isSource || editingTarget === "source") {
             const clickedPosition = mapPrevSourceMarker.current.getLatLng();
             setSourcePosition(clickedPosition);
             setIsSource(true);
+            const wasEditing = editingTarget === "source";
             setEditingTarget(null);
-            setRouteCoords([]);
+            resetRoute();
-            setAlternateCoords([]);
-            setSelectedRoute(null);
 
-            if (editingTarget === "source" && destPosition) {
+            if (wasEditing && destPosition) {
-                await fetchRoute(clickedPosition, destPosition);
+                await fetchRoute(clickedPosition, destPosition, waypoints);
             }
         }
     };
@@ -140,23 +195,65 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
             setDestPosition(clickedPosition);
             setIsDest(true);
             setEditingTarget(null);
+            resetRoute();
 
-            await fetchRoute(sourcePosition, clickedPosition);
+            await fetchRoute(sourcePosition, clickedPosition, waypoints);
+        }
+    };
+
+    const handleWaypointMarkerClick = async (index) => {
+        const wp = waypoints[index];
+        if (!wp || wp.confirmed) return; // فقط روی نقطه‌ی تأیید‌نشده کلیک معتبره (یا حالت ادیت)
+
+        const clickedPosition = mapPrevWaypointMarkers.current[index]?.getLatLng();
+        const updated = waypoints.map((w, i) => (i === index ? { position: clickedPosition, confirmed: true } : w));
+        setWaypoints(updated);
+        const wasEditing = editingTarget === `waypoint-${index}`;
+        setEditingTarget(null);
+        resetRoute();
+
+        if (sourcePosition && destPosition) {
+            await fetchRoute(sourcePosition, destPosition, updated);
         }
     };
 
     const handleEditSource = () => {
         setEditingTarget("source");
-        setRouteCoords([]);
+        resetRoute();
-        setAlternateCoords([]);
-        setSelectedRoute(null);
     };
 
     const handleEditDest = () => {
         setEditingTarget("dest");
-        setRouteCoords([]);
+        resetRoute();
-        setAlternateCoords([]);
+    };
-        setSelectedRoute(null);
+
+    const handleEditWaypoint = (index) => {
+        // برای ادیت یک waypoint تأییدشده، موقتاً unconfirmed می‌کنیم تا با حرکت نقشه جابه‌جا بشه
+        setWaypoints((prev) => prev.map((w, i) => (i === index ? { ...w, confirmed: false } : w)));
+        setEditingTarget(`waypoint-${index}`);
+        resetRoute();
+    };
+
+    // اضافه کردن یک نقطه میانی جدید (حداکثر MAX_WAYPOINTS)
+    const handleAddWaypoint = () => {
+        if (waypoints.length >= MAX_WAYPOINTS) return;
+        if (!isSource) return; // قبل از انتخاب مبدا معنی نداره
+        setWaypoints((prev) => [...prev, { position: null, confirmed: false }]);
+        setEditingTarget(`waypoint-${waypoints.length}`);
+        resetRoute();
+    };
+
+    // حذف یک نقطه میانی
+    const handleRemoveWaypoint = async (index) => {
+        const updated = waypoints.filter((_, i) => i !== index);
+        setWaypoints(updated);
+        mapPrevWaypointMarkers.current = mapPrevWaypointMarkers.current.filter((_, i) => i !== index);
+        if (editingTarget === `waypoint-${index}`) setEditingTarget(null);
+        resetRoute();
+
+        if (sourcePosition && destPosition) {
+            await fetchRoute(sourcePosition, destPosition, updated);
+        }
     };
 
     const handleSelectRoute = (index, coords) => {
@@ -176,14 +273,31 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
                 editingTarget={editingTarget}
                 onEditSource={handleEditSource}
                 onEditDest={handleEditDest}
+                waypoints={waypoints}
+                onEditWaypoint={handleEditWaypoint}
+                onAddWaypoint={handleAddWaypoint}
+                onRemoveWaypoint={handleRemoveWaypoint}
+                canAddWaypoint={isSource && waypoints.length < MAX_WAYPOINTS}
             />
             <AlarmText isSource={isSource} />
+
             <Marker
                 position={sourcePosition || map.getCenter()}
                 ref={mapPrevSourceMarker}
                 eventHandlers={{ click: handleMarkerClick }}
                 icon={defaultIcon}
             />
+
+            {waypoints.map((wp, index) => (
+                <Marker
+                    key={`waypoint-${index}`}
+                    position={wp.position || map.getCenter()}
+                    ref={(el) => (mapPrevWaypointMarkers.current[index] = el)}
+                    eventHandlers={{ click: () => handleWaypointMarkerClick(index) }}
+                    icon={getWaypointIcon(index)}
+                />
+            ))}
+
             {isSource && (
                 <Marker
                     position={destPosition || map.getCenter()}
@@ -192,6 +306,7 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
                     icon={prevDestIcon}
                 />
             )}
+
             {alternateCoords.map((coords, index) => (
                 <Polyline
                     key={`alternate-${index}-${selectedRoute?.index === index}`}

src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/ItemSelectField.jsx

@@ -0,0 +1,34 @@
+import useRoadItemGetItems from "@/lib/hooks/useRoadItemGetItems";
+import { Controller } from "react-hook-form";
+import SelectBox from "@/core/components/SelectBox";
+
+const ItemSelectField = ({ control, setValue }) => {
+    const { itemsList, loadingItemsList, errorItemsList } = useRoadItemGetItems();
+    function getItemName(val) {
+        return itemsList.find((item) => item.id === val)?.name;
+    }
+
+    return (
+        <Controller
+            control={control}
+            name={"item_id"}
+            render={({ field, fieldState: { error } }) => (
+                <SelectBox
+                    value={field.value}
+                    label="موضوع"
+                    selectors={itemsList}
+                    isLoading={loadingItemsList}
+                    schema={{ name: "name", value: "id" }}
+                    error={errorItemsList}
+                    helperText={error?.message}
+                    onChange={(value) => {
+                        field.onChange(value);
+                        setValue("explanation", getItemName(value));
+                        setValue("sub_item_id", "");
+                    }}
+                />
+            )}
+        />
+    );
+};
+export default ItemSelectField;

src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/SubItemSelectField.jsx

@@ -0,0 +1,37 @@
+import useRoadItemGetSubItems from "@/lib/hooks/useRoadItemGetISubtems";
+import { Controller } from "react-hook-form";
+import SelectBox from "@/core/components/SelectBox";
+
+const SubItemSelectField = ({ control, watch, setValue, getValues }) => {
+    const itemId = watch("item_id");
+    const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetSubItems(itemId);
+
+    function createExplanation(val) {
+        const currentExplanation = getValues("explanation");
+        const selectedItem = subItemsList.find((item) => item.id === val)?.name;
+        return `${currentExplanation}-${selectedItem}`;
+    }
+
+    return (
+        <Controller
+            control={control}
+            name={"sub_item_id"}
+            render={({ field, fieldState: { error } }) => (
+                <SelectBox
+                    value={field.value}
+                    label="اقدام انجام شده"
+                    selectors={subItemsList}
+                    isLoading={loadingSubItemsList}
+                    schema={{ name: "name", value: "id" }}
+                    error={errorSubItemsList}
+                    helperText={error?.message}
+                    onChange={(val) => {
+                        field.onChange(val);
+                        setValue("explanation", createExplanation(val));
+                    }}
+                />
+            )}
+        />
+    );
+};
+export default SubItemSelectField;

src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/index.jsx

@@ -8,10 +8,12 @@ import { ExitToApp } from "@mui/icons-material";
 import { Box, Button, DialogActions, DialogContent, Grid, Stack } from "@mui/material";
 import { Controller, useForm } from "react-hook-form";
 import { object, string } from "yup";
-import FastReactCode from "./FastReactCode";
+import ItemSelectField from "./ItemSelectField";
+import SubItemSelectField from "./SubItemSelectField";
 
 const validationSchema = object({
-    explanation: string().required("موضوع را مشخص کنید!"),
+    item_id: string().required("موضوع را مشخص کنید!"),
+    sub_item_id: string().required("اقدام انجام شده را مشخص کنید!"),
     end_point: string().required("مقصد را مشخص کنید!"),
     region: string().required("محور ماموریت را مشخص کنید!"),
     category_id: string().required("نوع ماموریت را مشخص کنید!"),
@@ -24,6 +26,8 @@ const validationSchema = object({
 
 const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => {
     const defaultValues = {
+        item_id: allData.item_id,
+        sub_item_id: allData.sub_item_id,
         explanation: allData.explanation,
         end_point: allData.end_point,
         region: allData.region,
@@ -31,7 +35,7 @@ const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => {
         road_observed_id: allData.road_observed_id,
     };
 
-    const { control, handleSubmit } = useForm({
+    const { control, handleSubmit, watch, setValue, getValues } = useForm({
         defaultValues,
         resolver: yupResolver(validationSchema),
         mode: "all",
@@ -49,24 +53,14 @@ const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => {
                     <Stack>
                         <Grid container spacing={2}>
                             <Grid item xs={12} sm={6}>
-                                <Controller
+                                <ItemSelectField control={control} watch={watch} setValue={setValue} />
+                            </Grid>
+                            <Grid item xs={12} sm={6}>
+                                <SubItemSelectField
                                     control={control}
-                                    name={"explanation"}
+                                    watch={watch}
-                                    render={({ field, fieldState: { error } }) => (
+                                    setValue={setValue}
-                                        <PersianTextField
+                                    getValues={getValues}
-                                            value={field.value}
-                                            variant="outlined"
-                                            name="explanation"
-                                            onChange={field.onChange}
-                                            label="موضوع"
-                                            placeholder={"موضوع را وارد کنید"}
-                                            fullWidth
-                                            size="small"
-                                            error={error}
-                                            helperText={error?.message}
-                                            InputLabelProps={{ shrink: true }}
-                                        />
-                                    )}
                                 />
                             </Grid>
                             <Grid item xs={12} sm={6}>

src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/index.jsx

@@ -1,12 +1,11 @@
-import { AccessTime, Engineering, InsertDriveFile, Person, Verified, Map } from "@mui/icons-material";
+import { Engineering, InsertDriveFile, Map, Person, Verified } from "@mui/icons-material";
 import { Box, Tab, Tabs } from "@mui/material";
 import { useReducer, useState } from "react";
-import GetDateTime from "./GetDateTime";
+import Area from "./Area";
 import GetItemInfo from "./GetItemInfo";
 import MachineAndDriver from "./MachineAndDriver";
 import Rahdaran from "./Rahdaran";
 import Verify from "./Verify";
-import Area from "./Area";
 
 function TabPanel(props) {
     const { children, value, index } = props;

src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx

@@ -26,6 +26,8 @@ const MissionCorrection = ({ row, mutate, baseMutate }) => {
                 end_point: result.end_point,
                 driver: result.driver.id,
                 encoded_route: result.area,
+                item_id: result.item_id,
+                sub_item_id: result.sub_item_id,
             },
             hasSidebarUpdate: true,
         })

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

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

src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/DataBox.jsx

@@ -1,50 +1,135 @@
-import { Box, Button, TextField } from "@mui/material";
+import { Box, Stack, IconButton, Typography, Divider } from "@mui/material";
+import EditIcon from "@mui/icons-material/Edit";
+import CloseIcon from "@mui/icons-material/Close";
+import AddIcon from "@mui/icons-material/Add";
 
-const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => {
+const ROW_COLORS = {
+    source: "#0EA37A", // سبز
+    waypoint: "#F5A623", // زرد/نارنجی
+    dest: "#E53935", // قرمز
+};
+
+const formatCoord = (pos) => (pos ? `${pos.lat.toFixed(2)}, ${pos.lng.toFixed(2)}` : null);
+
+const Row = ({ color, label, value, onEdit, onRemove, placeholder = "در حال انتخاب..." }) => (
+    <Stack direction="row" alignItems="center" spacing={1} sx={{ py: 0.5 }}>
+        <Box
+            sx={{
+                width: 8,
+                height: 8,
+                borderRadius: "50%",
+                backgroundColor: color,
+                flexShrink: 0,
+            }}
+        />
+        <Box sx={{ minWidth: 0, flex: 1 }}>
+            <Typography variant="caption" sx={{ color: "#8A8A8A", lineHeight: 1, display: "block" }}>
+                {label}
+            </Typography>
+            <Typography
+                variant="body2"
+                sx={{
+                    fontFamily: "monospace",
+                    fontSize: 12,
+                    color: value ? "#1f1f1f" : "#bdbdbd",
+                    whiteSpace: "nowrap",
+                    overflow: "hidden",
+                    textOverflow: "ellipsis",
+                }}
+            >
+                {value || placeholder}
+            </Typography>
+        </Box>
+        {onEdit && (
+            <IconButton size="small" onClick={onEdit} sx={{ p: 0.5 }}>
+                <EditIcon sx={{ fontSize: 16, color: "#757575" }} />
+            </IconButton>
+        )}
+        {onRemove && (
+            <IconButton size="small" onClick={onRemove} sx={{ p: 0.5 }}>
+                <CloseIcon sx={{ fontSize: 16, color: "#E53935" }} />
+            </IconButton>
+        )}
+    </Stack>
+);
+
+const DataBox = ({
+    isSource,
+    isDest,
+    sourcePosition,
+    destPosition,
+    editingTarget,
+    onEditSource,
+    onEditDest,
+    waypoints = [],
+    onEditWaypoint,
+    onAddWaypoint,
+    onRemoveWaypoint,
+    canAddWaypoint,
+}) => {
     if (!isSource) return null;
 
     return (
         <Box
             sx={{
                 position: "absolute",
-                bottom: 5,
+                bottom: 12,
-                left: 5,
+                left: 12,
                 zIndex: 1000,
-                backgroundColor: "white",
+                backgroundColor: "rgba(255,255,255,0.95)",
-                border: "1px solid #e1e1e1",
+                backdropFilter: "blur(6px)",
-                padding: 1,
+                border: "1px solid #ececec",
                 borderRadius: 2,
-                opacity: 0.8,
+                boxShadow: "0 2px 10px rgba(0,0,0,0.12)",
-                gap: 1,
+                px: 1.25,
-                display: "flex",
+                py: 0.75,
-                flexDirection: "column",
+                width: 230,
+                maxWidth: "70vw",
             }}
         >
-            <div style={{ display: "flex", alignItems: "end", gap: 4 }}>
+            <Row
-                <TextField
+                color={ROW_COLORS.source}
-                    variant="outlined"
+                label="مبدا"
-                    size="small"
+                value={formatCoord(sourcePosition)}
-                    readOnly
+                onEdit={isSource && isDest ? onEditSource : null}
-                    value={sourcePosition ? `${sourcePosition.lat.toFixed(6)}, ${sourcePosition.lng.toFixed(6)}` : ""}
+            />
+
+            {waypoints.map((wp, index) => (
+                <Row
+                    key={`waypoint-${index}`}
+                    color={ROW_COLORS.waypoint}
+                    label={`نقطه میانی ${index + 1}`}
+                    value={formatCoord(wp.position)}
+                    onEdit={wp.confirmed && editingTarget !== `waypoint-${index}` ? () => onEditWaypoint(index) : null}
+                    onRemove={() => onRemoveWaypoint(index)}
                 />
-                {isSource && isDest && (
+            ))}
-                    <Button variant="contained" color="success" size="small" onClick={onEditSource}>
+
-                        ویرایش مبدا
-                    </Button>
-                )}
-            </div>
             {isDest && (
-                <div style={{ display: "flex", alignItems: "end", gap: 4 }}>
+                <Row color={ROW_COLORS.dest} label="مقصد" value={formatCoord(destPosition)} onEdit={onEditDest} />
-                    <TextField
+            )}
-                        size="small"
+
-                        variant="outlined"
+            {canAddWaypoint && (
-                        readOnly
+                <>
-                        value={destPosition ? `${destPosition.lat.toFixed(6)}, ${destPosition.lng.toFixed(6)}` : ""}
+                    <Divider sx={{ my: 0.5 }} />
-                    />
+                    <Stack
-                    <Button variant="contained" color="error" size="small" onClick={onEditDest}>
+                        direction="row"
-                        ویرایش مقصد
+                        alignItems="center"
-                    </Button>
+                        spacing={0.5}
-                </div>
+                        onClick={onAddWaypoint}
+                        sx={{
+                            cursor: "pointer",
+                            color: ROW_COLORS.waypoint,
+                            py: 0.25,
+                            "&:hover": { opacity: 0.75 },
+                        }}
+                    >
+                        <AddIcon sx={{ fontSize: 16 }} />
+                        <Typography variant="caption" sx={{ fontWeight: 600 }}>
+                            افزودن نقطه میانی
+                        </Typography>
+                    </Stack>
+                </>
             )}
         </Box>
     );

src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/ShowRoute.jsx

@@ -1,4 +1,4 @@
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Marker, Polyline, useMap } from "react-leaflet";
 import L from "leaflet";
 import polyline from "@mapbox/polyline";
@@ -18,14 +18,24 @@ const ShowRoute = ({ area }) => {
         });
     };
 
-    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);
+    const [showRoute, setShowRoute] = useState(false);
 
+    useEffect(() => {
+        if (!coords.length) return;
+
+        setShowRoute(false);
+
+        map.flyToBounds(coords, {
+            padding: [50, 50],
+            duration: 1.5,
+        });
+
+        map.once("moveend", () => {
+            setShowRoute(true);
+        });
+    }, [area]);
     if (!area) return null;
     const coords = polyline.decode(area, 6);
 
@@ -36,7 +46,8 @@ const ShowRoute = ({ area }) => {
 
     return (
         <>
-            <Polyline positions={coords} color="#015688" weight={7} opacity={1} />
+            {showRoute && <Polyline positions={coords} color="#015688" weight={7} />}
+
             <Marker position={sourcePosition} icon={sourceIcon} />
             <Marker position={destPosition} icon={destIcon} />
         </>
@@ -44,3 +55,74 @@ const ShowRoute = ({ area }) => {
 };
 
 export default ShowRoute;
+
+// import { useEffect, useState } 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";
+// import WaypointIcon from "@/assets/images/waypoint-icon.svg";
+//
+// 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]],
+//     });
+// };
+//
+// const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src);
+// const destIcon = createCustomIcon(defaultIconSize, DestIcon.src);
+// const waypointIcon = createCustomIcon(defaultIconSize, WaypointIcon.src);
+//
+// // locations: آرایه اختیاری [{lat, lon}, ...] شامل مبدا، نقاط میانی و مقصد به همون ترتیبی که برای روتینگ فرستاده شده
+// const ShowRoute = ({ area, locations = [] }) => {
+//     const map = useMap();
+//     const [showRoute, setShowRoute] = useState(false);
+//
+//     const coords = area ? polyline.decode(area, 6) : [];
+//
+//     useEffect(() => {
+//         if (!coords.length) return;
+//
+//         setShowRoute(false);
+//
+//         map.flyToBounds(coords, {
+//             padding: [50, 50],
+//             duration: 1.5,
+//         });
+//
+//         map.once("moveend", () => {
+//             setShowRoute(true);
+//         });
+//         // eslint-disable-next-line react-hooks/exhaustive-deps
+//     }, [area]);
+//
+//     if (!area || coords.length === 0) return null;
+//
+//     const sourcePosition = coords[0];
+//     const destPosition = coords[coords.length - 1];
+//
+//     // نقاط میانی فقط از روی locations قابل استخراج‌ان (بین اولی و آخری)
+//     const middleWaypoints = locations.length > 2 ? locations.slice(1, -1) : [];
+//
+//     return (
+//         <>
+//             {showRoute && <Polyline positions={coords} color="#015688" weight={7} />}
+//
+//             <Marker position={sourcePosition} icon={sourceIcon} />
+//
+//             {middleWaypoints.map((wp, index) => (
+//                 <Marker key={`waypoint-${index}`} position={[wp.lat, wp.lon]} icon={waypointIcon} />
+//             ))}
+//
+//             <Marker position={destPosition} icon={destIcon} />
+//         </>
+//     );
+// };
+//
+// export default ShowRoute;

src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/index.jsx

@@ -5,19 +5,29 @@ 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 WaypointIcon from "@/assets/images/prev-waypoint-icon.svg";
+import PrevWaypointIcon from "@/assets/images/waypoint-icon.svg";
 import { useEffect, useRef, useState } from "react";
 import DataBox from "./DataBox";
 import AlarmText from "./AlarmText";
 
+const MAX_WAYPOINTS = 2;
+
 const Routing = ({ setArea, setLocations, locations, area }) => {
     const mapPrevSourceMarker = useRef();
     const mapPrevDestMarker = useRef();
+    const mapPrevWaypointMarkers = useRef([]); // ref array, یکی به‌ازای هر waypoint
     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 [waypoints, setWaypoints] = useState([]);
+
     const [routeCoords, setRouteCoords] = useState([]);
     const [alternateCoords, setAlternateCoords] = useState([]);
     const [editingTarget, setEditingTarget] = useState(null);
@@ -42,24 +52,55 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
         isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src
     );
 
-    const isMovingSource = !isSource || editingTarget === "source";
+    const getWaypointIcon = (index) => {
-    const isMovingDest = isSource && (!isDest || editingTarget === "dest");
+        const wp = waypoints[index];
+        const isConfirmed = wp?.confirmed && editingTarget !== `waypoint-${index}`;
+        return createCustomIcon(defaultIconSize, isConfirmed ? WaypointIcon.src : PrevWaypointIcon.src);
+    };
+
+    const getActiveTarget = () => {
+        if (editingTarget) return editingTarget;
+        if (!isSource) return "source";
+        const pendingWaypointIndex = waypoints.findIndex((wp) => !wp.confirmed);
+        if (pendingWaypointIndex !== -1) return `waypoint-${pendingWaypointIndex}`;
+        if (!isDest) return "dest";
+        return null;
+    };
 
     const map = useMapEvents({
         move(e) {
-            if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter());
+            const target = getActiveTarget();
-            if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter());
+            const center = e.target.getCenter();
+            if (target === "source") {
+                mapPrevSourceMarker.current?.setLatLng(center);
+            } else if (target === "dest") {
+                mapPrevDestMarker.current?.setLatLng(center);
+            } else if (target?.startsWith("waypoint-")) {
+                const idx = Number(target.split("-")[1]);
+                mapPrevWaypointMarkers.current[idx]?.setLatLng(center);
+            }
         },
         movestart() {
-            if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src));
+            const target = getActiveTarget();
-            if (isMovingDest && mapPrevDestMarker.current)
+            if (target === "source") {
-                mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src));
+                mapPrevSourceMarker.current?.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src));
+            } else if (target === "dest") {
+                mapPrevDestMarker.current?.setIcon(createCustomIcon([45, 45], PrevDestIcon.src));
+            } else if (target?.startsWith("waypoint-")) {
+                const idx = Number(target.split("-")[1]);
+                mapPrevWaypointMarkers.current[idx]?.setIcon(createCustomIcon([45, 45], PrevWaypointIcon.src));
+            }
         },
         moveend() {
-            if (isMovingSource)
+            const target = getActiveTarget();
-                mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src));
+            if (target === "source") {
-            if (isMovingDest && mapPrevDestMarker.current)
+                mapPrevSourceMarker.current?.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src));
-                mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src));
+            } else if (target === "dest") {
+                mapPrevDestMarker.current?.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src));
+            } else if (target?.startsWith("waypoint-")) {
+                const idx = Number(target.split("-")[1]);
+                mapPrevWaypointMarkers.current[idx]?.setIcon(createCustomIcon(defaultIconSize, PrevWaypointIcon.src));
+            }
         },
     });
 
@@ -69,12 +110,19 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
 
     useEffect(() => {
         if (locations.length < 2) return;
-        const restoredSource = { lat: locations[0].lat, lng: locations[0].lon };
+        const first = { lat: locations[0].lat, lng: locations[0].lon };
-        const restoredDest = { lat: locations[1].lat, lng: locations[1].lon };
+        const last = { lat: locations[locations.length - 1].lat, lng: locations[locations.length - 1].lon };
-        setSourcePosition(restoredSource);
+        const middle = locations.slice(1, -1).map((loc) => ({
-        setDestPosition(restoredDest);
+            position: { lat: loc.lat, lng: loc.lon },
+            confirmed: true,
+        }));
+
+        setSourcePosition(first);
+        setDestPosition(last);
+        setWaypoints(middle);
         setIsSource(true);
         setIsDest(true);
+
         if (area) {
             const decoded = polyline.decode(area, 6);
             setRouteCoords(decoded);
@@ -83,13 +131,15 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
                 mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 });
             }, 100);
         } else {
-            fetchRoute(restoredSource, restoredDest);
+            fetchRoute(first, last, middle);
         }
     }, []);
 
-    const fetchRoute = async (source, dest) => {
+    const fetchRoute = async (source, dest, waypointsList = waypoints) => {
+        const confirmedWaypoints = waypointsList.filter((wp) => wp.confirmed && wp.position);
         const locs = [
             { lat: source.lat, lon: source.lng },
+            ...confirmedWaypoints.map((wp) => ({ lat: wp.position.lat, lon: wp.position.lng })),
             { lat: dest.lat, lon: dest.lng },
         ];
         try {
@@ -118,18 +168,23 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
         }
     };
 
+    const resetRoute = () => {
+        setRouteCoords([]);
+        setAlternateCoords([]);
+        setSelectedRoute(null);
+    };
+
     const handleMarkerClick = async () => {
         if (!isSource || editingTarget === "source") {
             const clickedPosition = mapPrevSourceMarker.current.getLatLng();
             setSourcePosition(clickedPosition);
             setIsSource(true);
+            const wasEditing = editingTarget === "source";
             setEditingTarget(null);
-            setRouteCoords([]);
+            resetRoute();
-            setAlternateCoords([]);
-            setSelectedRoute(null);
 
-            if (editingTarget === "source" && destPosition) {
+            if (wasEditing && destPosition) {
-                await fetchRoute(clickedPosition, destPosition);
+                await fetchRoute(clickedPosition, destPosition, waypoints);
             }
         }
     };
@@ -140,23 +195,65 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
             setDestPosition(clickedPosition);
             setIsDest(true);
             setEditingTarget(null);
+            resetRoute();
 
-            await fetchRoute(sourcePosition, clickedPosition);
+            await fetchRoute(sourcePosition, clickedPosition, waypoints);
+        }
+    };
+
+    const handleWaypointMarkerClick = async (index) => {
+        const wp = waypoints[index];
+        if (!wp || wp.confirmed) return; // فقط روی نقطه‌ی تأیید‌نشده کلیک معتبره (یا حالت ادیت)
+
+        const clickedPosition = mapPrevWaypointMarkers.current[index]?.getLatLng();
+        const updated = waypoints.map((w, i) => (i === index ? { position: clickedPosition, confirmed: true } : w));
+        setWaypoints(updated);
+        const wasEditing = editingTarget === `waypoint-${index}`;
+        setEditingTarget(null);
+        resetRoute();
+
+        if (sourcePosition && destPosition) {
+            await fetchRoute(sourcePosition, destPosition, updated);
         }
     };
 
     const handleEditSource = () => {
         setEditingTarget("source");
-        setRouteCoords([]);
+        resetRoute();
-        setAlternateCoords([]);
-        setSelectedRoute(null);
     };
 
     const handleEditDest = () => {
         setEditingTarget("dest");
-        setRouteCoords([]);
+        resetRoute();
-        setAlternateCoords([]);
+    };
-        setSelectedRoute(null);
+
+    const handleEditWaypoint = (index) => {
+        // برای ادیت یک waypoint تأییدشده، موقتاً unconfirmed می‌کنیم تا با حرکت نقشه جابه‌جا بشه
+        setWaypoints((prev) => prev.map((w, i) => (i === index ? { ...w, confirmed: false } : w)));
+        setEditingTarget(`waypoint-${index}`);
+        resetRoute();
+    };
+
+    // اضافه کردن یک نقطه میانی جدید (حداکثر MAX_WAYPOINTS)
+    const handleAddWaypoint = () => {
+        if (waypoints.length >= MAX_WAYPOINTS) return;
+        if (!isSource) return; // قبل از انتخاب مبدا معنی نداره
+        setWaypoints((prev) => [...prev, { position: null, confirmed: false }]);
+        setEditingTarget(`waypoint-${waypoints.length}`);
+        resetRoute();
+    };
+
+    // حذف یک نقطه میانی
+    const handleRemoveWaypoint = async (index) => {
+        const updated = waypoints.filter((_, i) => i !== index);
+        setWaypoints(updated);
+        mapPrevWaypointMarkers.current = mapPrevWaypointMarkers.current.filter((_, i) => i !== index);
+        if (editingTarget === `waypoint-${index}`) setEditingTarget(null);
+        resetRoute();
+
+        if (sourcePosition && destPosition) {
+            await fetchRoute(sourcePosition, destPosition, updated);
+        }
     };
 
     const handleSelectRoute = (index, coords) => {
@@ -176,14 +273,31 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
                 editingTarget={editingTarget}
                 onEditSource={handleEditSource}
                 onEditDest={handleEditDest}
+                waypoints={waypoints}
+                onEditWaypoint={handleEditWaypoint}
+                onAddWaypoint={handleAddWaypoint}
+                onRemoveWaypoint={handleRemoveWaypoint}
+                canAddWaypoint={isSource && waypoints.length < MAX_WAYPOINTS}
             />
             <AlarmText isSource={isSource} />
+
             <Marker
                 position={sourcePosition || map.getCenter()}
                 ref={mapPrevSourceMarker}
                 eventHandlers={{ click: handleMarkerClick }}
                 icon={defaultIcon}
             />
+
+            {waypoints.map((wp, index) => (
+                <Marker
+                    key={`waypoint-${index}`}
+                    position={wp.position || map.getCenter()}
+                    ref={(el) => (mapPrevWaypointMarkers.current[index] = el)}
+                    eventHandlers={{ click: () => handleWaypointMarkerClick(index) }}
+                    icon={getWaypointIcon(index)}
+                />
+            ))}
+
             {isSource && (
                 <Marker
                     position={destPosition || map.getCenter()}
@@ -192,6 +306,7 @@ const Routing = ({ setArea, setLocations, locations, area }) => {
                     icon={prevDestIcon}
                 />
             )}
+
             {alternateCoords.map((coords, index) => (
                 <Polyline
                     key={`alternate-${index}-${selectedRoute?.index === index}`}

src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/GetItemInfo/ItemSelectField.jsx

@@ -0,0 +1,34 @@
+import useRoadItemGetItems from "@/lib/hooks/useRoadItemGetItems";
+import { Controller } from "react-hook-form";
+import SelectBox from "@/core/components/SelectBox";
+
+const ItemSelectField = ({ control, setValue }) => {
+    const { itemsList, loadingItemsList, errorItemsList } = useRoadItemGetItems();
+    function getItemName(val) {
+        return itemsList.find((item) => item.id === val)?.name;
+    }
+
+    return (
+        <Controller
+            control={control}
+            name={"item_id"}
+            render={({ field, fieldState: { error } }) => (
+                <SelectBox
+                    value={field.value}
+                    label="موضوع"
+                    selectors={itemsList}
+                    isLoading={loadingItemsList}
+                    schema={{ name: "name", value: "id" }}
+                    error={errorItemsList}
+                    helperText={error?.message}
+                    onChange={(value) => {
+                        field.onChange(value);
+                        setValue("explanation", getItemName(value));
+                        setValue("sub_item_id", "");
+                    }}
+                />
+            )}
+        />
+    );
+};
+export default ItemSelectField;

src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/GetItemInfo/SubItemSelectField.jsx

@@ -0,0 +1,37 @@
+import useRoadItemGetSubItems from "@/lib/hooks/useRoadItemGetISubtems";
+import { Controller } from "react-hook-form";
+import SelectBox from "@/core/components/SelectBox";
+
+const SubItemSelectField = ({ control, watch, setValue, getValues }) => {
+    const itemId = watch("item_id");
+    const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetSubItems(itemId);
+
+    function createExplanation(val) {
+        const currentExplanation = getValues("explanation");
+        const selectedItem = subItemsList.find((item) => item.id === val)?.name;
+        return `${currentExplanation}-${selectedItem}`;
+    }
+
+    return (
+        <Controller
+            control={control}
+            name={"sub_item_id"}
+            render={({ field, fieldState: { error } }) => (
+                <SelectBox
+                    value={field.value}
+                    label="اقدام انجام شده"
+                    selectors={subItemsList}
+                    isLoading={loadingSubItemsList}
+                    schema={{ name: "name", value: "id" }}
+                    error={errorSubItemsList}
+                    helperText={error?.message}
+                    onChange={(val) => {
+                        field.onChange(val);
+                        setValue("explanation", createExplanation(val));
+                    }}
+                />
+            )}
+        />
+    );
+};
+export default SubItemSelectField;

src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/GetItemInfo/index.jsx

@@ -1,3 +1,4 @@
+import LtrTextField from "@/core/components/LtrTextField";
 import PersianTextField from "@/core/components/PersianTextField";
 import SelectBox from "@/core/components/SelectBox";
 import StyledForm from "@/core/components/StyledForm";
@@ -8,7 +9,8 @@ import { ExitToApp } from "@mui/icons-material";
 import { Box, Button, DialogActions, DialogContent, Grid, Stack } from "@mui/material";
 import { Controller, useForm } from "react-hook-form";
 import { object, string } from "yup";
-import LtrTextField from "@/core/components/LtrTextField";
+import ItemSelectField from "./ItemSelectField";
+import SubItemSelectField from "./SubItemSelectField";
 
 const validationSchema = object({
     explanation: string().required("موضوع را مشخص کنید!"),
@@ -24,6 +26,8 @@ const validationSchema = object({
 
 const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => {
     const defaultValues = {
+        item_id: allData.item_id,
+        sub_item_id: allData.sub_item_id,
         explanation: allData.explanation,
         end_point: allData.end_point,
         region: allData.region,
@@ -31,7 +35,7 @@ const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => {
         road_observed_id: allData.road_observed_id,
     };
 
-    const { control, handleSubmit } = useForm({
+    const { control, handleSubmit, watch, setValue, getValues } = useForm({
         defaultValues,
         resolver: yupResolver(validationSchema),
         mode: "all",
@@ -49,24 +53,14 @@ const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => {
                     <Stack>
                         <Grid container spacing={2}>
                             <Grid item xs={12} sm={6}>
-                                <Controller
+                                <ItemSelectField control={control} watch={watch} setValue={setValue} />
+                            </Grid>
+                            <Grid item xs={12} sm={6}>
+                                <SubItemSelectField
                                     control={control}
-                                    name={"explanation"}
+                                    watch={watch}
-                                    render={({ field, fieldState: { error } }) => (
+                                    setValue={setValue}
-                                        <PersianTextField
+                                    getValues={getValues}
-                                            value={field.value}
-                                            variant="outlined"
-                                            name="explanation"
-                                            onChange={field.onChange}
-                                            label="موضوع"
-                                            placeholder={"موضوع را وارد کنید"}
-                                            fullWidth
-                                            size="small"
-                                            error={error}
-                                            helperText={error?.message}
-                                            InputLabelProps={{ shrink: true }}
-                                        />
-                                    )}
                                 />
                             </Grid>
                             <Grid item xs={12} sm={6}>
@@ -126,7 +120,7 @@ const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => {
                                     }}
                                 />
                             </Grid>
-                            <Grid item xs={12} sm={12}>
+                            <Grid item xs={6} sm={6}>
                                 <Stack>
                                     <Controller
                                         control={control}

src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Verify/index.jsx

@@ -93,10 +93,12 @@ const Verify = ({ allData, handlePrev, submitForm, submitting }) => {
                             <Stack direction={"row"} alignItems={"center"} spacing={1}>
                                 <Typography variant="body2">خودرو</Typography>
                                 <Divider sx={{ flex: 1 }} />
-                                <Chip
+                                {allData.machine && (
-                                    size="small"
+                                    <Chip
-                                    label={`${allData.machine.machine_code} | ${allData.machine.car_name}`}
+                                        size="small"
-                                />
+                                        label={`${allData.machine.machine_code} | ${allData.machine.car_name}`}
+                                    />
+                                )}
                             </Stack>
                             {/* <Stack direction={"row"} alignItems={"center"} spacing={1}>
                                 <Typography variant="body2">راننده</Typography>

src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/index.jsx

@@ -9,6 +9,8 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => {
     const requestServer = useRequest({ notificationSuccess: true });
 
     const submitForm = async (result) => {
+        console.log("result: ", result);
+
         setSubmitting(true);
         await requestServer(`${REQUEST_MISSION_CONTINUE_MISSION}/${row.original.id}`, "post", {
             data: {
@@ -29,6 +31,8 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => {
                 end_point: result.end_point,
                 category_id: result.category_id,
                 explanation: result.explanation,
+                item_id: result.item_id,
+                sub_item_id: result.sub_item_id,
                 ...(result.category_id == 3
                     ? {
                           road_observed_id: result.road_observed_id,
@@ -51,6 +55,8 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => {
         <CreateForm
             defaultValues={{
                 explanation: "",
+                item_id: "",
+                sub_item_id: "",
                 category_id: "",
                 rahdaran: rahdaran.filter((r) => !r.is_driver),
                 bound_type: "polyline",

src/components/dashboard/roadMissions/operator/RowActions/Edit/EditController/index.jsx

@@ -51,6 +51,8 @@ const EditController = ({ row, mutate, openEditDialog, setOpenEditDialog }) => {
         await requestServer(`${UPDATE_REQUEST_MISSION}/${row.original.id}`, "post", {
             data: {
                 explanation: result.explanation,
+                item_id: result.item_id,
+                sub_item_id: result.sub_item_id,
                 category_id: result.category_id,
 
                 ...(result.category_id == 3
@@ -101,6 +103,8 @@ const EditController = ({ row, mutate, openEditDialog, setOpenEditDialog }) => {
         <CreateForm
             defaultValues={{
                 explanation: row.original.explanation,
+                item_id: row.original.item_id,
+                sub_item_id: row.original.sub_item_id,
                 category_id: row.original.category_id,
 
                 road_observed_id: row.original.category_id == 3 ? (row.original.road_observed?.[0]?.id ?? "") : "",

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

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

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

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