diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/driverReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/driverReports/page.js
new file mode 100644
index 0000000..95cfc33
--- /dev/null
+++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/driverReports/page.js
@@ -0,0 +1,18 @@
+import WithPermission from "@/core/middlewares/withPermission";
+import DriverReportsPage from "@/components/dashboard/roadMissions/reports/diverReports";
+
+export const metadata = {
+ title: "کارتابل گزارش راننده",
+};
+
+export default function Page() {
+ return (
+
+
+
+ );
+}
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx b/src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx
new file mode 100644
index 0000000..94880cd
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx
@@ -0,0 +1,71 @@
+"use client";
+import DataTableWithAuth from "@/core/components/DataTableWithAuth";
+import { Box } from "@mui/material";
+import { useMemo } from "react";
+import Toolbar from "./Toolbar";
+import RowActions from "./RowActions";
+
+const DriverReportsList = ({ data, specialFilter }) => {
+ const columns = useMemo(() => {
+ return [
+ {
+ accessorKey: "driver_id",
+ header: "کد یکتا",
+ id: "driver_id",
+ enableColumnFilter: false,
+ enableSorting: false,
+ datatype: "numeric",
+ grow: false,
+ size: 50,
+ },
+ {
+ accessorKey: "driver_name",
+ header: "نام راننده",
+ id: "driver_name",
+ enableColumnFilter: false,
+ enableSorting: false,
+ datatype: "text",
+ grow: false,
+ size: 50,
+ },
+ {
+ accessorKey: "func",
+ header: "کارکرد",
+ id: "func",
+ enableColumnFilter: false,
+ enableSorting: false,
+ datatype: "number",
+ grow: false,
+ size: 50,
+ },
+ {
+ accessorKey: "missions",
+ header: "تعداد ماموریت",
+ id: "missions",
+ enableColumnFilter: false,
+ enableSorting: false,
+ datatype: "number",
+ grow: false,
+ size: 50,
+ },
+ ];
+ }, []);
+
+ return (
+
+
+
+ );
+};
+
+export default DriverReportsList;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/ExcelPrint/index.jsx
new file mode 100644
index 0000000..daab8a9
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/ExcelPrint/index.jsx
@@ -0,0 +1,77 @@
+"use client";
+import {
+ EXPORT_GET_DRIVER_COUNTRY_ACTIVITY_REPORT,
+ EXPORT_GET_DRIVER_PROVINCE_ACTIVITY_REPORT,
+} from "@/core/utils/routes";
+import useRequest from "@/lib/hooks/useRequest";
+import { useTheme } from "@emotion/react";
+import DescriptionIcon from "@mui/icons-material/Description";
+import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material";
+import FileSaver from "file-saver";
+import moment from "jalali-moment";
+import { useMemo, useState } from "react";
+
+const PrintExcel = ({ table, filterData }) => {
+ const theme = useTheme();
+ const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+ const [loading, setLoading] = useState(false);
+ const requestServer = useRequest({ notificationSuccess: true });
+ const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => {
+ if (filter.value) {
+ acc.push({ id: filter.id, value: filter.value });
+ }
+ return acc;
+ }, []);
+
+ const filterParams = useMemo(() => {
+ const params = new URLSearchParams();
+ activeFilters.length > 0 &&
+ activeFilters.map((filter, index) => {
+ params.set(`${filter.id}`, filter.value);
+ });
+ return params;
+ }, [activeFilters]);
+
+ const clickHandler = () => {
+ setLoading(true);
+ const CountryOrProvince = activeFilters.find((item) => item.id === "province_id");
+ const requestUrl =
+ CountryOrProvince.value === "-1"
+ ? EXPORT_GET_DRIVER_COUNTRY_ACTIVITY_REPORT
+ : EXPORT_GET_DRIVER_PROVINCE_ACTIVITY_REPORT;
+ requestServer(`${requestUrl}?${filterParams}`, "get", {
+ requestOptions: { responseType: "blob" },
+ })
+ .then((response) => {
+ const filename = `خروجی کارتابل گزارشات راننده تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
+ FileSaver.saveAs(response.data, filename);
+ })
+ .catch(() => {})
+ .finally(() => {
+ setLoading(false);
+ });
+ };
+
+ return (
+ <>
+ {isMobile ? (
+
+
+
+ ) : (
+ : }
+ onClick={clickHandler}
+ >
+ خروجی اکسل
+
+ )}
+ >
+ );
+};
+export default PrintExcel;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx
new file mode 100644
index 0000000..3fc9f6f
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx
@@ -0,0 +1,106 @@
+import DataTableWithAuth from "@/core/components/DataTableWithAuth";
+import { GET_DRIVER_DETAILS } from "@/core/utils/routes";
+import { Box } from "@mui/material";
+import { useMemo } from "react";
+
+const DriverList = ({ row }) => {
+ const columns = useMemo(
+ () => [
+ {
+ accessorKey: "id",
+ header: "کد یکتا",
+ id: "id",
+ enableColumnFilter: true,
+ datatype: "text",
+ filterMode: "equals",
+ columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 80,
+ },
+ {
+ accessorKey: "province_name",
+ header: "استان",
+ id: "province_name",
+ enableColumnFilter: true,
+ datatype: "text",
+ filterMode: "equals",
+ columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
+ },
+ {
+ accessorKey: "city_name",
+ header: "شهر",
+ id: "city_name",
+ enableColumnFilter: true,
+ datatype: "text",
+ filterMode: "equals",
+ columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
+ },
+ {
+ accessorKey: "station_name",
+ header: "راهدارخانه",
+ id: "station_name",
+ enableColumnFilter: true,
+ datatype: "text",
+ filterMode: "equals",
+ columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
+ },
+ {
+ accessorKey: "driver_name",
+ header: "راننده",
+ id: "driver_name",
+ enableColumnFilter: true,
+ datatype: "text",
+ filterMode: "equals",
+ columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
+ },
+ {
+ accessorKey: "km",
+ header: "کیلومتر شروع",
+ id: "km",
+ enableColumnFilter: true,
+ datatype: "text",
+ filterMode: "equals",
+ columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
+ },
+ {
+ accessorKey: "end_km",
+ header: "کیلومتر پایان",
+ id: "end_km",
+ enableColumnFilter: true,
+ datatype: "text",
+ filterMode: "equals",
+ columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
+ },
+ ],
+ []
+ );
+
+ return (
+ <>
+
+
+
+ >
+ );
+};
+export default DriverList;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/index.jsx
new file mode 100644
index 0000000..3fcc57c
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/index.jsx
@@ -0,0 +1,27 @@
+import { Box, Button, DialogActions, DialogContent } from "@mui/material";
+import { Stack } from "@mui/system";
+import DriverList from "./DriverDetailsDialog/DriverList";
+
+const DriverDetailsTable = ({ row, setOpenDriverDetails }) => {
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >
+ );
+};
+export default DriverDetailsTable;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/index.jsx
new file mode 100644
index 0000000..4a02707
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/index.jsx
@@ -0,0 +1,47 @@
+import { Close, RemoveRedEye } from "@mui/icons-material";
+import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material";
+import { useState } from "react";
+import DriverDetailsTable from "./Form";
+
+const DriverDetails = ({ row }) => {
+ const [openDriverDetails, setOpenDriverDetails] = useState(false);
+
+ return (
+ <>
+
+ {
+ setOpenDriverDetails(true);
+ }}
+ >
+
+
+
+
+ >
+ );
+};
+export default DriverDetails;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/ShowRoute.jsx b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/ShowRoute.jsx
new file mode 100644
index 0000000..5e1a4bd
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/ShowRoute.jsx
@@ -0,0 +1,46 @@
+import { useEffect, useRef } from "react";
+import { Marker, Polyline, useMap } from "react-leaflet";
+import L from "leaflet";
+import polyline from "@mapbox/polyline";
+import SourceIcon from "@/assets/images/source-icon.svg";
+import DestIcon from "@/assets/images/destination-icon.svg";
+
+const ShowRoute = ({ area }) => {
+ const map = useMap();
+ const defaultIconSize = [35, 35];
+
+ const createCustomIcon = (size, iconUrl) => {
+ return L.icon({
+ iconUrl: iconUrl,
+ iconSize: size,
+ iconAnchor: [size[0] / 2, size[1]],
+ popupAnchor: [0, -size[1]],
+ });
+ };
+
+ useEffect(() => {
+ if (coords.length > 0) {
+ map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 });
+ }
+ }, [area]);
+ const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src);
+ const destIcon = createCustomIcon(defaultIconSize, DestIcon.src);
+
+ if (!area) return null;
+ const coords = polyline.decode(area, 6);
+
+ if (coords.length === 0) return null;
+
+ const sourcePosition = coords[0];
+ const destPosition = coords[coords.length - 1];
+
+ return (
+ <>
+
+
+
+ >
+ );
+};
+
+export default ShowRoute;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/index.jsx
new file mode 100644
index 0000000..4501d35
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/index.jsx
@@ -0,0 +1,57 @@
+import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material";
+import { useState } from "react";
+import MapIcon from "@mui/icons-material/Map";
+import MapLayer from "@/core/components/MapLayer";
+import ShowRoute from "./ShowRoute";
+
+const RouteDetail = ({ encoded_route }) => {
+ const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false);
+ return (
+ <>
+
+ setOpenRouteDetailDialog(true)}>
+
+
+
+
+ >
+ );
+};
+export default RouteDetail;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/index.jsx
new file mode 100644
index 0000000..af9b70a
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/index.jsx
@@ -0,0 +1,6 @@
+import DriverDetails from "./DriverDetails";
+
+const RowActions = ({ row }) => {
+ return ;
+};
+export default RowActions;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/diverReports/Search/FromDateController.jsx
new file mode 100644
index 0000000..490ee7b
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/FromDateController.jsx
@@ -0,0 +1,27 @@
+import MuiDatePicker from "@/core/components/MuiDatePicker";
+import moment from "jalali-moment";
+import { Controller } from "react-hook-form";
+
+const FromDateController = ({ control }) => {
+ return (
+ (
+ {
+ const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
+ onChange(formattedDate); // Update the field value in react-hook-form
+ }}
+ helperText={error ? error.message : null}
+ />
+ )}
+ />
+ );
+};
+export default FromDateController;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/diverReports/Search/SearchReportField.jsx
new file mode 100644
index 0000000..bde2a4c
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/SearchReportField.jsx
@@ -0,0 +1,44 @@
+import SearchIcon from "@mui/icons-material/Search";
+import { Button, Grid } from "@mui/material";
+import { Controller } from "react-hook-form";
+import FromDateController from "./FromDateController";
+import SelectProvince from "./SelectProvince";
+import ToDateController from "./ToDateController";
+
+const SearchReportField = ({ control, hasProvincesPermission }) => {
+ return (
+
+
+
+
+
+
+
+ {hasProvincesPermission && (
+
+
+
+ )}
+
+ (
+ }
+ fullWidth
+ >
+ {isSubmitting ? "درحال دریافت اطلاعات" : "جستجو"}
+
+ )}
+ />
+
+
+ );
+};
+
+export default SearchReportField;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/diverReports/Search/SelectProvince.jsx
new file mode 100644
index 0000000..2b24d67
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/SelectProvince.jsx
@@ -0,0 +1,45 @@
+import useProvinces from "@/lib/hooks/useProvince";
+import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material";
+import { Controller } from "react-hook-form";
+
+const SelectProvince = ({ control }) => {
+ const { provinces, loadingProvinces, errorProvinces } = useProvinces();
+ return (
+ (
+
+ استان
+
+ {error && {error.message}}
+
+ )}
+ />
+ );
+};
+export default SelectProvince;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/diverReports/Search/ToDateController.jsx
new file mode 100644
index 0000000..fc4a776
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/ToDateController.jsx
@@ -0,0 +1,30 @@
+import MuiDatePicker from "@/core/components/MuiDatePicker";
+import moment from "jalali-moment";
+import { Controller, useWatch } from "react-hook-form";
+
+const ToDateController = ({ control }) => {
+ const minDate = useWatch({ control, name: "from_date" });
+ return (
+ (
+ {
+ const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD");
+ onChange(formattedDate); // Update the field value in react-hook-form
+ }}
+ helperText={error ? error.message : null}
+ />
+ )}
+ />
+ );
+};
+export default ToDateController;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/Search/index.jsx
new file mode 100644
index 0000000..f29d302
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/index.jsx
@@ -0,0 +1,13 @@
+import StyledForm from "@/core/components/StyledForm";
+import SearchReportField from "./SearchReportField";
+
+const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => {
+ return (
+ <>
+
+
+
+ >
+ );
+};
+export default SearchReportList;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/diverReports/Toolbar.jsx
new file mode 100644
index 0000000..0f726c7
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/Toolbar.jsx
@@ -0,0 +1,11 @@
+import { Box } from "@mui/material";
+import PrintExcel from "./ExcelPrint";
+
+const Toolbar = ({ table, filterData, mutate }) => {
+ return (
+
+
+
+ );
+};
+export default Toolbar;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/index.jsx
new file mode 100644
index 0000000..cae06cb
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/index.jsx
@@ -0,0 +1,110 @@
+"use client";
+import PageTitle from "@/core/components/PageTitle";
+import {
+ GET_DRIVER_COUNTRY_ACTIVITY_REPORT,
+ GET_DRIVER_PROVINCE_ACTIVITY_REPORT,
+} from "@/core/utils/routes";
+import { useAuth } from "@/lib/contexts/auth";
+import { usePermissions } from "@/lib/hooks/usePermissions";
+import useRequest from "@/lib/hooks/useRequest";
+import { yupResolver } from "@hookform/resolvers/yup";
+import { LinearProgress, Stack } from "@mui/material";
+import moment from "jalali-moment";
+import { useEffect, useState } from "react";
+import { useForm } from "react-hook-form";
+import * as yup from "yup";
+import DriverReportsList from "./DriverReportsList";
+import SearchReportList from "./Search";
+
+const DriverReportsPage = () => {
+ const [data, setData] = useState(null);
+ const { data: userPermissions } = usePermissions();
+ const { user } = useAuth();
+ const requestServer = useRequest();
+ const hasProvincesPermission = userPermissions?.includes("mission-report-country");
+
+ const defaultValues = {
+ from_date: moment(new Date()).format("YYYY-MM-DD"),
+ date_to: moment(new Date()).format("YYYY-MM-DD"),
+ province_id: user.province_id || "-1",
+ };
+ const defaultFilter = [
+ { value: `${defaultValues.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" },
+ { value: `${defaultValues.from_date}`, datatype: "date", id: "from_date", fn: "between" },
+ { value: `${defaultValues.date_to}`, datatype: "date", id: "date_to", fn: "between" },
+ ];
+ const [specialFilter, setSpecialFilter] = useState(defaultFilter);
+
+ const onSearchSubmit = async (data) => {
+ const params = new URLSearchParams();
+ params.set("from_date", `${data.from_date} 00:00:00`);
+ params.set("date_to", `${data.date_to} 23:59:59`);
+ setSpecialFilter([
+ { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" },
+ { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" },
+ { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" },
+ ]);
+ if (data.province_id === "-1") {
+ try {
+ const response = await requestServer(`${GET_DRIVER_COUNTRY_ACTIVITY_REPORT}?${params}`);
+ const result = response.data.data;
+
+ setData({
+ data: result.activities,
+ filters: data,
+ });
+ } catch (e) {}
+ } else {
+ try {
+ params.set("province_id", `${data.province_id}`);
+ const response = await requestServer(`${GET_DRIVER_PROVINCE_ACTIVITY_REPORT}?${params}`);
+
+ const result = response.data.data;
+
+ setData({
+ data: result.activities,
+ filters: data,
+ });
+ } catch (e) {}
+ }
+ };
+
+ useEffect(() => {
+ if (!userPermissions) return;
+ onSearchSubmit(defaultValues);
+ }, [userPermissions]);
+
+ const validationSchema = yup.object().shape({
+ from_date: yup
+ .string()
+ .required("تاریخ شروع الزامی است!")
+ .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ شروع الزامی است!")
+ .test("is-valid-date", "تاریخ شروع معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()),
+ date_to: yup
+ .string()
+ .required("تاریخ پایان الزامی است!")
+ .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ پایان الزامی است!")
+ .test("is-valid-date", "تاریخ پایان معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()),
+ province_id: yup.string().nullable(),
+ });
+
+ const { control, handleSubmit } = useForm({
+ defaultValues,
+ resolver: yupResolver(validationSchema),
+ mode: "all",
+ });
+
+ return (
+
+
+
+ {!data ? : }
+
+ );
+};
+export default DriverReportsPage;
diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
index 037aec7..9bd3373 100644
--- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
@@ -94,7 +94,7 @@ const MachineMissionsList = ({ row }) => {
need_filter={true}
columns={columns}
sorting={[{ id: "id", desc: true }]}
- table_url={`${GET_MACHINE_MISSIONS_DETAILS}?machine_id=${row.machine_id}`}
+ table_url={`${GET_MACHINE_MISSIONS_DETAILS}/${row.machine_id}`}
page_name={"roadMissionsTransportation"}
table_name={"roadMissionsTransportationMachinesList"}
positionActionsColumn={"first"}
diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx
index 5d94b1f..ad34476 100644
--- a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx
+++ b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx
@@ -20,7 +20,7 @@ const ViolationForm = ({ setOpenMachinesDialog, mutate, openMachinesDialog }) =>
data: {
machine_code: result.machinesId.machine_code,
km: result.km,
- exit_station: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`,
+ exit_time: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`,
},
})
.then((response) => {
diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx
index 6b3bfa3..85fd833 100644
--- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx
+++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx
@@ -11,13 +11,13 @@ const EditController = ({ rowId, mutate, setOpen, row }) => {
const defaultData = {
end_date: endDate,
- end_time: row?.original?.enter_station ? new Date(row.original.enter_station) : null,
+ end_time: row?.original?.enter_time ? new Date(row.original.enter_time) : null,
};
const handleSubmit = async (result) => {
const payload = {};
if (result.end_date && result.end_time) {
- payload.enter_station = `${result.end_date} ${moment(result.end_time).format("HH:mm")}`;
+ payload.enter_time = `${result.end_date} ${moment(result.end_time).format("HH:mm")}`;
}
await requestServer(`${EDIT_VIOLATION}/${rowId}`, "post", {
diff --git a/src/core/utils/pageMenu.js b/src/core/utils/pageMenu.js
index 703c244..c7e8262 100644
--- a/src/core/utils/pageMenu.js
+++ b/src/core/utils/pageMenu.js
@@ -35,6 +35,7 @@ import SpaceDashboardIcon from "@mui/icons-material/SpaceDashboard";
import SpeedIcon from "@mui/icons-material/Speed";
import SupervisedUserCircleIcon from "@mui/icons-material/SupervisedUserCircle";
import TaxiAlertIcon from "@mui/icons-material/TaxiAlert";
+import AirlineSeatReclineNormalIcon from "@mui/icons-material/AirlineSeatReclineNormal";
export const pageMenu = [
{
@@ -211,6 +212,15 @@ export const pageMenu = [
badges: [{ key: "mission.request_portal" }],
permissions: ["all"],
},
+ {
+ id: "driverReports",
+ label: "راننده",
+ icon: ,
+ type: "page",
+ route: "/dashboard/road-missions/reports/driverReports",
+ badges: [{ key: "mission.request_portal" }],
+ permissions: ["all"],
+ },
],
},
],
diff --git a/src/core/utils/pageMenuDev.js b/src/core/utils/pageMenuDev.js
index e1c3a01..49a00d6 100644
--- a/src/core/utils/pageMenuDev.js
+++ b/src/core/utils/pageMenuDev.js
@@ -33,6 +33,7 @@ import SpaceDashboardIcon from "@mui/icons-material/SpaceDashboard";
import SpeedIcon from "@mui/icons-material/Speed";
import TaxiAlertIcon from "@mui/icons-material/TaxiAlert";
import SupervisedUserCircleIcon from "@mui/icons-material/SupervisedUserCircle";
+import AirlineSeatReclineNormalIcon from "@mui/icons-material/AirlineSeatReclineNormal";
export const pageMenuDev = [
{
@@ -209,6 +210,15 @@ export const pageMenuDev = [
badges: [{ key: "mission.request_portal" }],
permissions: ["all"],
},
+ {
+ id: "driverReports",
+ label: "راننده",
+ icon: ,
+ type: "page",
+ route: "/dashboard/road-missions/reports/driverReports",
+ badges: [{ key: "mission.request_portal" }],
+ permissions: ["all"],
+ },
],
},
],
diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js
index 969e100..d77593e 100644
--- a/src/core/utils/routes.js
+++ b/src/core/utils/routes.js
@@ -256,6 +256,13 @@ export const EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT =
export const EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT =
api + "/api/v3/missions/report_machine/province_machines_activity_excel";
+export const GET_DRIVER_COUNTRY_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/country_machine_drivers_activity";
+export const GET_DRIVER_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/province_machine_drivers_activity";
+export const EXPORT_GET_DRIVER_COUNTRY_ACTIVITY_REPORT =
+ api + "/api/v3/missions/report_machine/country_machine_drivers_activity_excel";
+export const EXPORT_GET_DRIVER_PROVINCE_ACTIVITY_REPORT =
+ api + "/api/v3/missions/report_machine/province_machine_drivers_activity_excel";
+
export const GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT =
api + "/api/v3/missions/report_machine/country_machine_types_activity";
export const GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/province_machine_types_activity";
@@ -304,3 +311,4 @@ export const GET_STATIONS_LIST = api + "/api/v3/road_maintenance_station";
export const UPDATE_MACHINE_STATUS_AND_LOCATION = api + "/api/v3/cmms_machines";
export const GET_MACHINE_MISSIONS_DETAILS = api + "/api/v3/missions/report_machine/machine_details_report";
export const GET_MACHINE_TYPE_MISSIONS_DETAILS = api + "/api/v3/missions/report_machine/machine_type_details_report";
+export const GET_DRIVER_DETAILS = api + "/api/v3/missions/report_machine/machine_driver_details_report";