diff --git a/src/components/dashboard/roadPatrols/operator/OperatorList.jsx b/src/components/dashboard/roadPatrols/operator/OperatorList.jsx
index e96d08d..f9e144d 100644
--- a/src/components/dashboard/roadPatrols/operator/OperatorList.jsx
+++ b/src/components/dashboard/roadPatrols/operator/OperatorList.jsx
@@ -43,10 +43,10 @@ const OperatorList = () => {
                         },
                     },
                 },
-                Cell: ({ renderedCellValue }) => {
+                Cell: ({ renderedCellValue, row }) => {
                     return (
                         <Stack alignItems={"center"} justifyContent={"center"}>
-                            <MachinePerformanceForm />
+                            <MachinePerformanceForm row={row} />
                         </Stack>
                     );
                 },
diff --git a/src/components/dashboard/roadPatrols/operator/RowActions/MachinePerformanceForm/StopsInfo.jsx b/src/components/dashboard/roadPatrols/operator/RowActions/MachinePerformanceForm/StopsInfo.jsx
index 4483996..6869f7a 100644
--- a/src/components/dashboard/roadPatrols/operator/RowActions/MachinePerformanceForm/StopsInfo.jsx
+++ b/src/components/dashboard/roadPatrols/operator/RowActions/MachinePerformanceForm/StopsInfo.jsx
@@ -52,7 +52,7 @@ const StopsInfo = ({ selectedPoint, staticData }) => {
                 </Box>
                 <Divider sx={{ flex: 1, mx: 2 }} />
                 <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.800" }}>
-                    {staticData.mileage || ""} کیلومتر
+                    {staticData.mileage.toLocaleString() || ""} متر
                 </Typography>
             </Grid>
             <Grid item xs={12} sm={12} sx={{ display: "flex", alignItems: "center" }}>
diff --git a/src/components/dashboard/roadPatrols/operator/RowActions/MachinePerformanceForm/index.jsx b/src/components/dashboard/roadPatrols/operator/RowActions/MachinePerformanceForm/index.jsx
index 242902f..fb267d5 100644
--- a/src/components/dashboard/roadPatrols/operator/RowActions/MachinePerformanceForm/index.jsx
+++ b/src/components/dashboard/roadPatrols/operator/RowActions/MachinePerformanceForm/index.jsx
@@ -3,34 +3,15 @@ import DirectionsCarIcon from "@mui/icons-material/DirectionsCar";
 import MachinePerformanceContent from "./MachinePerformanceContent";
 import { useState } from "react";
 
-const MachinePerformanceForm = () => {
+const MachinePerformanceForm = ({row}) => {
     const [openMachinesCodeDialog, setOpenMachinesCodeDialog] = useState(false);
     const machineData = {
-        cmms_machine_code: 245,
+        cmms_machine_code: row.original?.cmms_machines[0]?.machine_code,
         resultCode: 0,
-        mileage: 17645,
-        accOnDuration: 3599,
-        fuelConsumption: 6.1757503,
-        stopPoints: [
-            {
-                startDT: "2024-12-23T13:55:40",
-                duration: 114,
-                latitude: 37.521317,
-                longitude: 46.103584,
-            },
-            {
-                startDT: "2024-12-23T14:31:11",
-                duration: 14,
-                latitude: 37.566532,
-                longitude: 46.17688,
-            },
-            {
-                startDT: "2024-12-23T14:35:36",
-                duration: 55,
-                latitude: 37.569958,
-                longitude: 46.18166,
-            },
-        ],
+        mileage: row.original?.distance,
+        accOnDuration: row.original?.vehicle_runtime,
+        fuelConsumption: row.original?.fuel_consumption,
+        stopPoints: row.original?.stop_points,
     };
     return (
         <>
diff --git a/src/components/dashboard/roadPatrols/supervisor/RowActions/MachinePerformanceForm/StopsInfo.jsx b/src/components/dashboard/roadPatrols/supervisor/RowActions/MachinePerformanceForm/StopsInfo.jsx
index 25d9238..07e6e77 100644
--- a/src/components/dashboard/roadPatrols/supervisor/RowActions/MachinePerformanceForm/StopsInfo.jsx
+++ b/src/components/dashboard/roadPatrols/supervisor/RowActions/MachinePerformanceForm/StopsInfo.jsx
@@ -51,7 +51,7 @@ const StopsInfo = ({ selectedPoint, staticData }) => {
                 </Box>
                 <Divider sx={{ flex: 1, mx: 2 }} />
                 <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.800" }}>
-                    {staticData.mileage || ""} کیلومتر
+                    {staticData.mileage.toLocaleString() || ""} متر
                 </Typography>
             </Grid>
             <Grid item xs={12} sm={12} sx={{ display: "flex", alignItems: "center" }}>
@@ -70,59 +70,54 @@ const StopsInfo = ({ selectedPoint, staticData }) => {
                     {(staticData.accOnDuration / 60)?.toFixed(2) || ""} دقیقه
                 </Typography>
             </Grid>
-
-            {selectedPoint && (
-                <>
-                    <Grid item xs={12} sm={12} sx={{ display: "flex", alignItems: "center" }}>
-                        <Box sx={{ display: "flex", alignItems: "center" }}>
-                            <Chip
-                                icon={<PinDropIcon />}
-                                label={
-                                    <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.700" }}>
-                                        طول جغرافیایی
-                                    </Typography>
-                                }
-                            />
-                        </Box>
-                        <Divider sx={{ flex: 1, mx: 2 }} />
-                        <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.800" }}>
-                            {selectedPoint.longitude || ""}
-                        </Typography>
-                    </Grid>
-                    <Grid item xs={12} sm={12} sx={{ display: "flex", alignItems: "center" }}>
-                        <Box sx={{ display: "flex", alignItems: "center" }}>
-                            <Chip
-                                icon={<PinDropIcon />}
-                                label={
-                                    <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.700" }}>
-                                        عرض جغرافیایی
-                                    </Typography>
-                                }
-                            />
-                        </Box>
-                        <Divider sx={{ flex: 1, mx: 2 }} />
-                        <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.800" }}>
-                            {selectedPoint.latitude || ""}
-                        </Typography>
-                    </Grid>
-                    <Grid item xs={12} sm={12} sx={{ display: "flex", alignItems: "center" }}>
-                        <Box sx={{ display: "flex", alignItems: "center" }}>
-                            <Chip
-                                icon={<AccessAlarmsIcon />}
-                                label={
-                                    <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.700" }}>
-                                        مدت زمان توقف
-                                    </Typography>
-                                }
-                            />
-                        </Box>
-                        <Divider sx={{ flex: 1, mx: 2 }} />
-                        <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.800" }}>
-                            {selectedPoint.duration || ""} ثانیه
-                        </Typography>
-                    </Grid>
-                </>
-            )}
+            <Grid item xs={12} sm={12} sx={{ display: "flex", alignItems: "center" }}>
+                <Box sx={{ display: "flex", alignItems: "center" }}>
+                    <Chip
+                        icon={<PinDropIcon />}
+                        label={
+                            <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.700" }}>
+                                طول جغرافیایی
+                            </Typography>
+                        }
+                    />
+                </Box>
+                <Divider sx={{ flex: 1, mx: 2 }} />
+                <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.800" }}>
+                    {selectedPoint ? selectedPoint.longitude : "نقطه مورد نظر را انتخاب کنید"}
+                </Typography>
+            </Grid>
+            <Grid item xs={12} sm={12} sx={{ display: "flex", alignItems: "center" }}>
+                <Box sx={{ display: "flex", alignItems: "center" }}>
+                    <Chip
+                        icon={<PinDropIcon />}
+                        label={
+                            <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.700" }}>
+                                عرض جغرافیایی
+                            </Typography>
+                        }
+                    />
+                </Box>
+                <Divider sx={{ flex: 1, mx: 2 }} />
+                <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.800" }}>
+                    {selectedPoint ? selectedPoint.latitude : "نقطه مورد نظر را انتخاب کنید"}
+                </Typography>
+            </Grid>
+            <Grid item xs={12} sm={12} sx={{ display: "flex", alignItems: "center" }}>
+                <Box sx={{ display: "flex", alignItems: "center" }}>
+                    <Chip
+                        icon={<AccessAlarmsIcon />}
+                        label={
+                            <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.700" }}>
+                                مدت زمان توقف
+                            </Typography>
+                        }
+                    />
+                </Box>
+                <Divider sx={{ flex: 1, mx: 2 }} />
+                <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.800" }}>
+                    {selectedPoint ? `${selectedPoint.duration} ثانیه` : "نقطه مورد نظر را انتخاب کنید"}
+                </Typography>
+            </Grid>
         </Grid>
     );
 };
diff --git a/src/components/dashboard/roadPatrols/supervisor/RowActions/MachinePerformanceForm/index.jsx b/src/components/dashboard/roadPatrols/supervisor/RowActions/MachinePerformanceForm/index.jsx
index 242902f..fb267d5 100644
--- a/src/components/dashboard/roadPatrols/supervisor/RowActions/MachinePerformanceForm/index.jsx
+++ b/src/components/dashboard/roadPatrols/supervisor/RowActions/MachinePerformanceForm/index.jsx
@@ -3,34 +3,15 @@ import DirectionsCarIcon from "@mui/icons-material/DirectionsCar";
 import MachinePerformanceContent from "./MachinePerformanceContent";
 import { useState } from "react";
 
-const MachinePerformanceForm = () => {
+const MachinePerformanceForm = ({row}) => {
     const [openMachinesCodeDialog, setOpenMachinesCodeDialog] = useState(false);
     const machineData = {
-        cmms_machine_code: 245,
+        cmms_machine_code: row.original?.cmms_machines[0]?.machine_code,
         resultCode: 0,
-        mileage: 17645,
-        accOnDuration: 3599,
-        fuelConsumption: 6.1757503,
-        stopPoints: [
-            {
-                startDT: "2024-12-23T13:55:40",
-                duration: 114,
-                latitude: 37.521317,
-                longitude: 46.103584,
-            },
-            {
-                startDT: "2024-12-23T14:31:11",
-                duration: 14,
-                latitude: 37.566532,
-                longitude: 46.17688,
-            },
-            {
-                startDT: "2024-12-23T14:35:36",
-                duration: 55,
-                latitude: 37.569958,
-                longitude: 46.18166,
-            },
-        ],
+        mileage: row.original?.distance,
+        accOnDuration: row.original?.vehicle_runtime,
+        fuelConsumption: row.original?.fuel_consumption,
+        stopPoints: row.original?.stop_points,
     };
     return (
         <>
diff --git a/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx b/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx
index 6408d4d..f33c695 100644
--- a/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx
+++ b/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx
@@ -147,9 +147,9 @@ const SupervisorList = () => {
                         },
                     },
                 },
-                Cell: () => (
+                Cell: ({row}) => (
                     <Stack alignItems={"center"} justifyContent={"center"}>
-                        <MachinePerformanceForm />
+                        <MachinePerformanceForm row={row} />
                     </Stack>
                 ),
             },