From 6b70eb8e27bae976b11a2a0bf54cd6c8a7ad2f5f Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Wed, 20 May 2026 08:54:41 +0330 Subject: [PATCH 01/35] add base routing --- public/icons/destination-icon.svg | 18 ++ public/icons/origin-icon.svg | 18 ++ .../Form/Area/MapControlPolyline/index.jsx | 211 +++++++++--------- .../Actions/Create/Form/Area/index.jsx | 3 +- 4 files changed, 142 insertions(+), 108 deletions(-) create mode 100644 public/icons/destination-icon.svg create mode 100644 public/icons/origin-icon.svg diff --git a/public/icons/destination-icon.svg b/public/icons/destination-icon.svg new file mode 100644 index 0000000..ad8a633 --- /dev/null +++ b/public/icons/destination-icon.svg @@ -0,0 +1,18 @@ + +
 + + + + + + + + + + + + + + + + diff --git a/public/icons/origin-icon.svg b/public/icons/origin-icon.svg new file mode 100644 index 0000000..295c9da --- /dev/null +++ b/public/icons/origin-icon.svg @@ -0,0 +1,18 @@ + +
 + + + + + + + + + + + + + + + + diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx index 8d9b5d0..7302f7d 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx @@ -1,116 +1,113 @@ -import { Delete, Route } from "@mui/icons-material"; -import { Box, Button, Stack, Typography } from "@mui/material"; -import { useReducer } from "react"; -import DrawBound from "./DrawBound"; +"use client"; -const statusType = [ - { - id: 0, - message: "برای آغاز ترسیم مسیر، کلیک کنید!", - buttons: [ - { - label: "شروع ترسیم مسیر", - key: "start", - color: "primary", - icon: , - onclick: (controlDispach) => { - controlDispach({ type: "SET_STATUS", status: 1 }); - }, - }, - ], - }, - { - id: 1, - message: "مسیر موردنظر را با کلیک روی نقشه مشخص کنید. برای اتمام، روی نقطه‌ی پایانی کلیک کنید!", - buttons: [], - }, - { - id: 2, - message: "برای اصلاح مسیر، گوشه‌ها را بکشید. برای ترسیم دوباره، آن را حذف کنید", - buttons: [ - { - label: "حذف", - key: "end", - color: "error", - icon: , - onclick: (controlDispach) => { - controlDispach({ type: "SET_STATUS", status: 0 }); - }, - }, - ], - }, -]; +import { useEffect, useState } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; -const createInitialState = (bound) => { - if (bound) { - return { status: 2 }; - } - return { status: 0 }; -}; +// ===== Icons ===== +const originIcon = new L.Icon({ + iconUrl: "/icons/origin-marker.png", + iconSize: [32, 32], + iconAnchor: [16, 32], +}); -const reducer = (state, action) => { - switch (action.type) { - case "SET_STATUS": - return { ...state, status: action.status }; - default: - return state; - } -}; +const destinationIcon = new L.Icon({ + iconUrl: "/icons/destination-marker.png", + iconSize: [32, 32], + iconAnchor: [16, 32], +}); -const MapControlPolyline = ({ bound, setBound }) => { - const [control, controlDispach] = useReducer(reducer, bound, createInitialState); +// ===== Track Center ===== +function MapCenterTracker({ setCenter }) { + const map = useMap(); + + useEffect(() => { + const updateCenter = () => { + setCenter(map.getCenter()); + }; + + updateCenter(); + + map.on("move", updateCenter); + + return () => { + map.off("move", updateCenter); + }; + }, [map, setCenter]); + + return null; +} + +// ===== Fixed Center Marker ===== +function FixedCenterMarker() { + return ( +
+ center +
+ ); +} + +export default function Example() { + const [center, setCenter] = useState(null); + + const [origin, setOrigin] = useState(null); + const [destination, setDestination] = useState(null); + + const [step, setStep] = useState("origin"); + + const handleOk = () => { + if (!center) return; + + if (step === "origin") { + setOrigin(center); + setStep("destination"); + return; + } + + if (step === "destination") { + setDestination(center); + setStep("done"); + } + }; return ( - <> - - - theme.palette.info.main, - borderBottomLeftRadius: 8, - borderBottomRightRadius: 8, - py: 0.5, - px: 2, - }} - > - - {statusType.find((st) => st.id == control.status).message} - - - - +
- - {statusType - .find((st) => st.id == control.status) - .buttons.map((button) => ( - - ))} - - - + + + {/* saved markers */} + {origin && } + + {destination && } + + {/* route line */} + {origin && destination && } + + {/* fixed center pin */} + {step !== "done" && } +
+ +
+ +
+ ); -}; -export default MapControlPolyline; +} diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/index.jsx index a4240b3..dac1df2 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/index.jsx @@ -3,6 +3,7 @@ import { Box, Button, DialogActions, DialogContent, Stack } from "@mui/material" import dynamic from "next/dynamic"; import { useCallback, useState } from "react"; import MapControlPolyline from "./MapControlPolyline"; +import Example from "./MapControlPolyline"; const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { loading: () => , ssr: false, @@ -22,7 +23,7 @@ const Area = ({ allData, setAllData, handlePrev, setTabState }) => { - + From 5d9a86f2cf7cb6367903bd8fa3557713377125e5 Mon Sep 17 00:00:00 2001 From: mhmjalali Date: Wed, 20 May 2026 16:30:10 +0330 Subject: [PATCH 02/35] work on source marker --- src/assets/images/destination-icon.svg | 18 ++++++++ src/assets/images/prev-destination-icon.svg | 21 +++++++++ src/assets/images/prev-source-icon.svg | 21 +++++++++ src/assets/images/source-icon.svg | 18 ++++++++ .../Form/Area/MapControlPolyline/index.jsx | 6 +-- .../Create/Form/Area/Routing/index.jsx | 46 +++++++++++++++++++ .../Actions/Create/Form/Area/index.jsx | 5 +- .../operator/Actions/Create/Form/index.jsx | 2 +- 8 files changed, 130 insertions(+), 7 deletions(-) create mode 100644 src/assets/images/destination-icon.svg create mode 100644 src/assets/images/prev-destination-icon.svg create mode 100644 src/assets/images/prev-source-icon.svg create mode 100644 src/assets/images/source-icon.svg create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx diff --git a/src/assets/images/destination-icon.svg b/src/assets/images/destination-icon.svg new file mode 100644 index 0000000..ad8a633 --- /dev/null +++ b/src/assets/images/destination-icon.svg @@ -0,0 +1,18 @@ + +
 + + + + + + + + + + + + + + + + diff --git a/src/assets/images/prev-destination-icon.svg b/src/assets/images/prev-destination-icon.svg new file mode 100644 index 0000000..656eca3 --- /dev/null +++ b/src/assets/images/prev-destination-icon.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/prev-source-icon.svg b/src/assets/images/prev-source-icon.svg new file mode 100644 index 0000000..621e71a --- /dev/null +++ b/src/assets/images/prev-source-icon.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/source-icon.svg b/src/assets/images/source-icon.svg new file mode 100644 index 0000000..295c9da --- /dev/null +++ b/src/assets/images/source-icon.svg @@ -0,0 +1,18 @@ + +
 + + + + + + + + + + + + + + + + diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx index 7302f7d..3cf2a09 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx @@ -6,13 +6,13 @@ import L from "leaflet"; // ===== Icons ===== const originIcon = new L.Icon({ - iconUrl: "/icons/origin-marker.png", + iconUrl: "/icons/origin-icon.svg", iconSize: [32, 32], iconAnchor: [16, 32], }); const destinationIcon = new L.Icon({ - iconUrl: "/icons/destination-marker.png", + iconUrl: "/icons/destination-icon.svg", iconSize: [32, 32], iconAnchor: [16, 32], }); @@ -51,7 +51,7 @@ function FixedCenterMarker() { pointerEvents: "none", }} > - center + center ); } diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx new file mode 100644 index 0000000..f7e6f44 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx @@ -0,0 +1,46 @@ +import { Marker, useMapEvents } from "react-leaflet"; +import L from "leaflet"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; +import { useRef } from "react"; + + +const Routing = () => { + const mapPrevSourceMarker = useRef(); + 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 map = useMapEvents({ + move(e) { + mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); + }, + movestart() { + mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); + }, + moveend() { + mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); + }, + }); + + const handleMarkerClick = () => { + console.log(mapPrevSourceMarker.current.getLatLng().lat); + }; + + return ( + + ) +} + +export default Routing \ No newline at end of file diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/index.jsx index dac1df2..f221fcc 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/index.jsx @@ -2,8 +2,7 @@ import MapLoading from "@/core/components/MapLayer/Loading"; import { Box, Button, DialogActions, DialogContent, Stack } from "@mui/material"; import dynamic from "next/dynamic"; import { useCallback, useState } from "react"; -import MapControlPolyline from "./MapControlPolyline"; -import Example from "./MapControlPolyline"; +import Routing from "./Routing"; const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { loading: () => , ssr: false, @@ -23,7 +22,7 @@ const Area = ({ allData, setAllData, handlePrev, setTabState }) => { - + diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/index.jsx index 994ce63..dd39d68 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/index.jsx @@ -27,7 +27,7 @@ const reducer = (state, action) => { const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { const [allData, dispatch] = useReducer(reducer, defaultValues); - const [tabState, setTabState] = useState(0); + const [tabState, setTabState] = useState(2); const handleClose = () => { setOpen(false); }; From efb260b66daa78da05768549f21e6a20b60b824f Mon Sep 17 00:00:00 2001 From: mhmjalali Date: Sun, 24 May 2026 15:37:12 +0330 Subject: [PATCH 03/35] complete most of the routing task just request to server --- package.json | 1 + .../Form/Area/MapControlPolyline/index.jsx | 14 +- .../Create/Form/Area/Routing/DataBox.jsx | 46 ++++ .../Create/Form/Area/Routing/index.jsx | 230 +++++++++++++++--- .../CreateWithoutProcess/Form/Area/index.jsx | 2 +- .../reports/taradodReports/Search/index.jsx | 5 +- .../violationsReports/Search/index.jsx | 5 +- src/core/utils/routes.js | 6 +- 8 files changed, 252 insertions(+), 57 deletions(-) create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx diff --git a/package.json b/package.json index 8a2e759..79b3f30 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", "@hookform/resolvers": "^3.9.0", + "@mapbox/polyline": "^1.2.1", "@mui/icons-material": "^5.16.7", "@mui/lab": "^5.0.0-alpha.173", "@mui/material": "^5.16.7", diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx index 3cf2a09..0a14736 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/MapControlPolyline/index.jsx @@ -87,21 +87,21 @@ export default function Example() { height: "400px", }} > - + - {/* saved markers */} - {origin && } + {/* saved markers */} + {origin && } - {destination && } + {destination && } - {/* route line */} - {origin && destination && } + {/* route line */} + {origin && destination && } {/* fixed center pin */} {step !== "done" && } -
+
+
+ {isDest && ( +
+ + +
+ )} + + ); +}; + +export default DataBox; \ No newline at end of file diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx index f7e6f44..c27cb73 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx @@ -1,46 +1,202 @@ -import { Marker, useMapEvents } from "react-leaflet"; +import { Marker, Polyline, useMapEvents } from "react-leaflet"; import L from "leaflet"; +import polyline from "@mapbox/polyline"; import SourceIcon from "@/assets/images/source-icon.svg"; import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; -import { useRef } from "react"; - +import PrevDestIcon from "@/assets/images/prev-destination-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; +import { useRef, useState } from "react"; +import DataBox from "./DataBox"; const Routing = () => { - const mapPrevSourceMarker = useRef(); - 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 mapPrevSourceMarker = useRef(); + const mapPrevDestMarker = useRef(); + const defaultIconSize = [35, 35]; + const [isSource, setIsSource] = useState(false); + const [sourcePosition, setSourcePosition] = useState(null); + const [isDest, setIsDest] = useState(false); + const [destPosition, setDestPosition] = useState(null); + const [routeCoords, setRouteCoords] = useState([]); + const [alternateCoords, setAlternateCoords] = useState([]); + const [editingTarget, setEditingTarget] = useState(null); + const [selectedRoute, setSelectedRoute] = useState(null); - const map = useMapEvents({ - move(e) { - mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); - }, - movestart() { - mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); - }, - moveend() { - mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); - }, - }); + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; - const handleMarkerClick = () => { - console.log(mapPrevSourceMarker.current.getLatLng().lat); - }; + const defaultIcon = createCustomIcon( + defaultIconSize, + isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src + ); - return ( - - ) -} + const prevDestIcon = createCustomIcon( + defaultIconSize, + isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src + ); -export default Routing \ No newline at end of file + const isMovingSource = !isSource || editingTarget === "source"; + const isMovingDest = isSource && (!isDest || editingTarget === "dest"); + + const map = useMapEvents({ + move(e) { + if (isMovingSource) { + mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); + } + if (isMovingDest && mapPrevDestMarker.current) { + mapPrevDestMarker.current.setLatLng(e.target.getCenter()); + } + }, + movestart() { + if (isMovingSource) { + mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); + } + if (isMovingDest && mapPrevDestMarker.current) { + mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); + } + }, + moveend() { + if (isMovingSource) { + mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); + } + if (isMovingDest && mapPrevDestMarker.current) { + mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); + } + }, + }); + + const fetchRoute = async (source, dest) => { + const locations = [ + { lat: source.lat, lon: source.lng }, + { lat: dest.lat, lon: dest.lng }, + ]; + try { + const response = await fetch("https://jouya.141.ir/api/router/drive", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ locations }), + }); + const data = await response.json(); + + const shape = data.trip.legs[0].shape; + const decoded = polyline.decode(shape, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + + if (data.alternates && data.alternates.length > 0) { + const decodedAlternates = data.alternates.map((alt) => + polyline.decode(alt.trip.legs[0].shape, 6) + ); + setAlternateCoords(decodedAlternates); + } else { + setAlternateCoords([]); + } + map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + } catch (error) { + console.error("Routing error:", error); + } + }; + + const handleMarkerClick = async () => { + if (!isSource || editingTarget === "source") { + const clickedPosition = mapPrevSourceMarker.current.getLatLng(); + console.log("Source:", clickedPosition.lat, clickedPosition.lng); + setSourcePosition(clickedPosition); + setIsSource(true); + setEditingTarget(null); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + + if (editingTarget === "source" && destPosition) { + await fetchRoute(clickedPosition, destPosition); + } + } + }; + + const handleDestMarkerClick = async () => { + if (!isDest || editingTarget === "dest") { + const clickedPosition = mapPrevDestMarker.current.getLatLng(); + setDestPosition(clickedPosition); + setIsDest(true); + setEditingTarget(null); + + await fetchRoute(sourcePosition, clickedPosition); + } + }; + + const handleEditSource = () => { + setEditingTarget("source"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleEditDest = () => { + setEditingTarget("dest"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleSelectRoute = (index, coords) => { + setSelectedRoute({ index, coords }); + map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); + console.log("Selected route:", index, coords); + }; + + return ( + <> + + + {isSource && ( + + )} + {alternateCoords.map((coords, index) => ( + handleSelectRoute(index, coords) }} + /> + ))} + {routeCoords.length > 0 && ( + handleSelectRoute("main", routeCoords) }} + /> + )} + + ); +}; + +export default Routing; \ No newline at end of file diff --git a/src/components/dashboard/roadMissions/operator/Actions/CreateWithoutProcess/Form/Area/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/CreateWithoutProcess/Form/Area/index.jsx index 38ec045..a985737 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/CreateWithoutProcess/Form/Area/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/CreateWithoutProcess/Form/Area/index.jsx @@ -24,7 +24,7 @@ const Area = ({ allData, setAllData, handlePrev, setTabState }) => { - + diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx index 2b0d128..f29d302 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx @@ -5,10 +5,7 @@ const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesP return ( <> - + ); diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx index 2b0d128..f29d302 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx @@ -5,10 +5,7 @@ const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesP return ( <> - + ); diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index c1656f7..a2ea39f 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -47,10 +47,8 @@ export const GET_COUNTRY_ACTIVITY_REPORT = api + "/api/v3/missions/report/countr export const EXPORT_COUNTRY_ROAD_PATROL_REPORTS = api + "/api/v3/road_patrols/report/country_activity_excel"; export const EXPORT_PROVINCE_ROAD_PATROL_REPORTS = api + "/api/v3/road_patrols/report/province_activity_excel"; -export const GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY = - api + "/api/v3/missions/report_taradod/country_activity"; -export const GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY = - api + "/api/v3/missions/report_taradod/province_activity"; +export const GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY = api + "/api/v3/missions/report_taradod/country_activity"; +export const GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY = api + "/api/v3/missions/report_taradod/province_activity"; export const EXPORT_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY = api + "/api/v3/missions/report_taradod/country_excel_activity"; export const EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY = From 46bb4e4228ad583d3068ede3831669418f0c4f49 Mon Sep 17 00:00:00 2001 From: mhmjalali Date: Sat, 6 Jun 2026 10:18:30 +0330 Subject: [PATCH 04/35] working on map in rms mission --- .../Create/Form/Area/Routing/DataBox.jsx | 33 +++++++++++-------- .../Create/Form/Area/Routing/index.jsx | 8 ++--- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx index def45cb..5269a52 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx @@ -4,7 +4,22 @@ const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget if (!isSource) return null; return ( - +
-
@@ -29,12 +39,7 @@ const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget readOnly value={destPosition ? `${destPosition.lat.toFixed(6)}, ${destPosition.lng.toFixed(6)}` : ""} /> -
@@ -43,4 +48,4 @@ const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget ); }; -export default DataBox; \ No newline at end of file +export default DataBox; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx index c27cb73..4f1e47a 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx @@ -89,9 +89,7 @@ const Routing = () => { setSelectedRoute({ index: "main", coords: decoded }); if (data.alternates && data.alternates.length > 0) { - const decodedAlternates = data.alternates.map((alt) => - polyline.decode(alt.trip.legs[0].shape, 6) - ); + const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); setAlternateCoords(decodedAlternates); } else { setAlternateCoords([]); @@ -175,7 +173,7 @@ const Routing = () => { icon={prevDestIcon} /> )} - {alternateCoords.map((coords, index) => ( + {alternateCoords.map((coords, index) => ( { ); }; -export default Routing; \ No newline at end of file +export default Routing; From 9ee9132ed8dda072a61bfe8b406f80c2b17c035b Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Wed, 10 Jun 2026 13:36:28 +0330 Subject: [PATCH 05/35] debug filter select option in violation --- .../roadMissions/violations/ViolationsList.jsx | 13 ++++++++++--- src/core/utils/violationsCategoryStatus.js | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 src/core/utils/violationsCategoryStatus.js diff --git a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx index bf9566d..c78d6cc 100644 --- a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx +++ b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx @@ -6,6 +6,7 @@ import moment from "jalali-moment"; import { useMemo } from "react"; import RowActions from "./RowActions"; import Toolbar from "./Toolbar"; +import { violationsCategoryStatus } from "@/core/utils/violationsCategoryStatus"; const ViolationsList = () => { const columns = useMemo( @@ -21,14 +22,20 @@ const ViolationsList = () => { grow: false, }, { - accessorKey: "type", - header: "نوع تخلف", - id: "type", + accessorKey: "status", + header: "وضعیت", + id: "status", enableColumnFilter: true, datatype: "numeric", filterMode: "equals", sortDescFirst: true, grow: false, + columnSelectOption: () => { + return violationsCategoryStatus.map((category) => ({ + value: category.id, + label: category.name_fa, + })); + }, Cell: ({ row }) => (row.original.type === 1 ? "خروج بدون مجوز" : "عدم تحرک"), }, { diff --git a/src/core/utils/violationsCategoryStatus.js b/src/core/utils/violationsCategoryStatus.js new file mode 100644 index 0000000..1045f85 --- /dev/null +++ b/src/core/utils/violationsCategoryStatus.js @@ -0,0 +1,4 @@ +export const violationsCategoryStatus = [ + { id: 0, name_fa: "بدون اقدام" }, + { id: 1, name_fa: "اقدام شده" }, +]; From 8753f231467fb72197580b5033b33fbbc8ff0e0b Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Wed, 10 Jun 2026 13:49:22 +0330 Subject: [PATCH 06/35] remove without proccess and add minute to operator --- src/components/dashboard/roadMissions/operator/Toolbar.jsx | 4 ++-- .../violations/Actions/EditViolation/MissionDates/index.jsx | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/dashboard/roadMissions/operator/Toolbar.jsx b/src/components/dashboard/roadMissions/operator/Toolbar.jsx index 9ddee3a..12db25d 100644 --- a/src/components/dashboard/roadMissions/operator/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/operator/Toolbar.jsx @@ -1,12 +1,12 @@ import { Stack } from "@mui/material"; import Create from "./Actions/Create"; -import CreateWithoutProcess from "./Actions/CreateWithoutProcess"; +// import CreateWithoutProcess from "./Actions/CreateWithoutProcess"; const Toolbar = ({ table, filterData, mutate }) => { return ( - + {/**/} ); }; diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx index 225ab8f..493d4e2 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx @@ -42,7 +42,6 @@ const MissionDates = ({ control }) => { name="start_time" error={error} value={field.value} - views={["hours"]} placeholder={"زمان شروع ماموریت را وارد کنید"} label={"زمان شروع ماموریت"} setFieldValue={(name, value) => field.onChange(value || null)} From 5c05af0828522c7fe79da43d55e5365637912a57 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Wed, 10 Jun 2026 14:40:13 +0330 Subject: [PATCH 07/35] show time on edit dialog and remove time in tashih mamoriat --- .../CreateViolation/Form/CreateForm.jsx | 4 ++ .../Form/MissionDates/index.jsx | 55 +++++++++++++++++++ .../Actions/CreateViolation/Form/index.jsx | 4 ++ .../CreateWithoutProcess/Form/index.jsx | 17 +----- .../Actions/CreateWithoutProcess/index.jsx | 6 -- .../Actions/EditViolation/EditController.jsx | 15 ++--- .../EditViolation/MissionDates/index.jsx | 43 +-------------- 7 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/MissionDates/index.jsx diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/CreateForm.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/CreateForm.jsx index 86fb936..cb7dc7a 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/CreateForm.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/CreateForm.jsx @@ -5,6 +5,7 @@ import { yupResolver } from "@hookform/resolvers/yup"; import { Button, DialogActions, DialogContent, Stack } from "@mui/material"; import { Controller, useForm } from "react-hook-form"; import * as yup from "yup"; +import MissionDates from "@/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/MissionDates"; const schema = yup.object().shape({ machinesId: yup.object().required("کد خودرو الزامی است."), km: yup.string(), @@ -61,6 +62,9 @@ const CreateViolationForm = ({ setOpenMachinesDialog, defaultValues, onSubmitBas )} /> + + + diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/MissionDates/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/MissionDates/index.jsx new file mode 100644 index 0000000..ca84634 --- /dev/null +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/MissionDates/index.jsx @@ -0,0 +1,55 @@ +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import MuiTimePicker from "@/core/components/MuiTimePicker"; +import { Grid } from "@mui/material"; +import { Controller, useWatch } from "react-hook-form"; + +const MissionDates = ({ control }) => { + const start_date = useWatch({ control, name: "start_date" }); + const now = new Date(); + + return ( + <> + + { + return ( + field.onChange(value || [])} + helperText={error ? error.message : null} + /> + ); + }} + /> + + + { + return ( + field.onChange(value || null)} + helperText={error ? error.message : null} + /> + ); + }} + /> + + + ); +}; +export default MissionDates; 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 2b70d5b..ad34476 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx @@ -3,6 +3,7 @@ import { DialogHeader } from "next/dist/client/components/react-dev-overlay/inte import useRequest from "@/lib/hooks/useRequest"; import { CREATE_VIOLATION } from "@/core/utils/routes"; import CreateViolationForm from "@/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/CreateForm"; +import moment from "jalali-moment"; const ViolationForm = ({ setOpenMachinesDialog, mutate, openMachinesDialog }) => { const requestServer = useRequest({ notificationSuccess: true }); @@ -10,6 +11,8 @@ const ViolationForm = ({ setOpenMachinesDialog, mutate, openMachinesDialog }) => const defaultValues = { machinesId: null, km: "", + start_date: null, + start_time: null, }; const submitForm = async (result) => { @@ -17,6 +20,7 @@ const ViolationForm = ({ setOpenMachinesDialog, mutate, openMachinesDialog }) => data: { machine_code: result.machinesId.machine_code, km: result.km, + exit_time: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`, }, }) .then((response) => { diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx index 96de65d..76230ad 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx @@ -59,10 +59,9 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { }} > } label="مشخصات" /> - } label="زمانبندی" /> - } label="راننده" /> - } label="همراهان" /> - } label="بررسی نهایی" /> + } label="راننده" /> + } label="همراهان" /> + } label="بررسی نهایی" /> { setTabState={setTabState} /> - - { - dispatch({ type: "changeData", data }); - }} - handlePrev={handlePrev} - setTabState={setTabState} - /> - { ...(result.rahdaran.length != 0 ? { rahdaran: result.rahdaran.map((r) => r.id) } : {}), zone: result.region, end_point: result.end_point, - start_date: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`, - end_date: `${result.end_date} ${moment(result.end_time).format("HH:mm")}`, driver: result.driver.id, }, hasSidebarUpdate: true, @@ -70,10 +68,6 @@ const CreateWithoutProcess = ({ row, mutate }) => { category_id: "", road_observed_id: "", rahdaran: [], - start_date: "", - start_time: null, - end_date: "", - end_time: null, end_point: "", region: "", driver: null, diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx index 97ae1e2..ab16760 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx @@ -5,24 +5,19 @@ import { DialogHeader } from "next/dist/client/components/react-dev-overlay/inte import EditViolationForm from "./EditViolationForm"; import moment from "jalali-moment"; -const EditController = ({ rowId, mutate, setOpen }) => { +const EditController = ({ rowId, mutate, setOpen, row }) => { const requestServer = useRequest({ notificationSuccess: true }); + const [endDate] = row?.original?.enter_time?.split(" ") || [null]; const defaultData = { - start_date: null, - start_time: null, - end_date: null, - end_time: null, + end_date: endDate, + end_time: row?.original?.enter_time ? new Date(row.original.enter_time) : null, }; const handleSubmit = async (result) => { const payload = {}; - if (result.start_date && result.start_time) { - payload.enter_time = `${result.start_date} ${moment(result.start_time).format("HH:mm")}`; - } - if (result.end_date && result.end_time) { - payload.exit_time = `${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/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx index 493d4e2..ba07a09 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx @@ -5,52 +5,11 @@ import { Grid } from "@mui/material"; import { Controller, useWatch } from "react-hook-form"; const MissionDates = ({ control }) => { - const start_date = useWatch({ control, name: "start_date" }); const end_date = useWatch({ control, name: "end_date" }); const now = new Date(); return ( <> - - { - return ( - field.onChange(value || [])} - helperText={error ? error.message : null} - /> - ); - }} - /> - - - { - return ( - field.onChange(value || null)} - helperText={error ? error.message : null} - /> - ); - }} - /> - { error={error} value={field.value} disableFuture={false} - minDate={start_date ? start_date : now} + minDate={end_date ? end_date : now} placeholder={"تاریخ پایان ماموریت را وارد کنید"} label={"تاریخ پایان ماموریت"} setFieldValue={(name, value) => field.onChange(value || [])} From 16889752a113265350ad038b49b056e0ecf2a4c5 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Wed, 10 Jun 2026 14:48:31 +0330 Subject: [PATCH 08/35] build and format --- package.json | 110 +++---- .../reports/missionsReports/page.js | 36 +-- .../reports/violationsReports/page.js | 36 +-- .../taradodReports/ExcelPrint/index.jsx | 154 +++++----- .../taradodReports/MissionsReportLists.jsx | 276 ++++++++--------- .../Search/FromDateController.jsx | 54 ++-- .../Search/SearchReportField.jsx | 88 +++--- .../taradodReports/Search/SelectProvince.jsx | 90 +++--- .../Search/ToDateController.jsx | 60 ++-- .../reports/taradodReports/Search/index.jsx | 26 +- .../reports/taradodReports/Toolbar.jsx | 22 +- .../reports/taradodReports/index.jsx | 284 +++++++++--------- .../violationsReports/ExcelPrint/index.jsx | 154 +++++----- .../Search/FromDateController.jsx | 54 ++-- .../Search/SearchReportField.jsx | 88 +++--- .../Search/SelectProvince.jsx | 90 +++--- .../Search/ToDateController.jsx | 60 ++-- .../violationsReports/Search/index.jsx | 26 +- .../reports/violationsReports/Toolbar.jsx | 22 +- .../ViolationsReportsList.jsx | 196 ++++++------ .../reports/violationsReports/index.jsx | 282 ++++++++--------- 21 files changed, 1104 insertions(+), 1104 deletions(-) diff --git a/package.json b/package.json index 8a2e759..6074c06 100644 --- a/package.json +++ b/package.json @@ -1,55 +1,55 @@ -{ - "name": "rms", - "version": "0.1.0", - "private": true, - "scripts": { - "dev": "next dev", - "build": "next build", - "start": "next start", - "lint": "next lint", - "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,html,css,scss}\"", - "build:publish": "npm i && npm run build && pm2 restart ecosystem.config.js" - }, - "dependencies": { - "@emotion/cache": "^11.11.0", - "@emotion/react": "^11.11.3", - "@emotion/styled": "^11.11.0", - "@hookform/resolvers": "^3.9.0", - "@mui/icons-material": "^5.16.7", - "@mui/lab": "^5.0.0-alpha.173", - "@mui/material": "^5.16.7", - "@mui/material-nextjs": "^5.16.6", - "@mui/x-date-pickers": "^6.19.5", - "@mui/x-tree-view": "^7.11.0", - "@turf/turf": "^7.2.0", - "axios": "^1.7.2", - "date-fns": "^3.3.1", - "date-fns-jalali": "^2.13.0-0", - "dayjs": "^1.11.10", - "file-saver": "^2.0.5", - "jalali-moment": "^3.3.11", - "lz-string": "^1.5.0", - "material-react-table": "^2.11.2", - "next": "^14.2.3", - "react": "^18", - "react-dom": "^18", - "react-hook-form": "^7.52.1", - "react-leaflet": "^4.2.1", - "react-leaflet-draw": "^0.20.4", - "react-leaflet-markercluster": "^4.2.1", - "react-qr-code": "^2.0.18", - "react-toastify": "^10.0.5", - "sass": "^1.75.0", - "sharp": "^0.33.4", - "stylis": "^4.3.1", - "stylis-plugin-rtl": "^2.1.1", - "swr": "^2.2.5", - "yup": "^1.4.0" - }, - "devDependencies": { - "eslint": "^8", - "eslint-config-next": "14.1.0", - "eslint-config-prettier": "^9.1.0", - "prettier": "^3.3.2" - } -} +{ + "name": "rms", + "version": "0.1.0", + "private": true, + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint", + "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,html,css,scss}\"", + "build:publish": "npm i && npm run build && pm2 restart ecosystem.config.js" + }, + "dependencies": { + "@emotion/cache": "^11.11.0", + "@emotion/react": "^11.11.3", + "@emotion/styled": "^11.11.0", + "@hookform/resolvers": "^3.9.0", + "@mui/icons-material": "^5.16.7", + "@mui/lab": "^5.0.0-alpha.173", + "@mui/material": "^5.16.7", + "@mui/material-nextjs": "^5.16.6", + "@mui/x-date-pickers": "^6.19.5", + "@mui/x-tree-view": "^7.11.0", + "@turf/turf": "^7.2.0", + "axios": "^1.7.2", + "date-fns": "^3.3.1", + "date-fns-jalali": "^2.13.0-0", + "dayjs": "^1.11.10", + "file-saver": "^2.0.5", + "jalali-moment": "^3.3.11", + "lz-string": "^1.5.0", + "material-react-table": "^2.11.2", + "next": "^14.2.3", + "react": "^18", + "react-dom": "^18", + "react-hook-form": "^7.52.1", + "react-leaflet": "^4.2.1", + "react-leaflet-draw": "^0.20.4", + "react-leaflet-markercluster": "^4.2.1", + "react-qr-code": "^2.0.18", + "react-toastify": "^10.0.5", + "sass": "^1.75.0", + "sharp": "^0.33.4", + "stylis": "^4.3.1", + "stylis-plugin-rtl": "^2.1.1", + "swr": "^2.2.5", + "yup": "^1.4.0" + }, + "devDependencies": { + "eslint": "^8", + "eslint-config-next": "14.1.0", + "eslint-config-prettier": "^9.1.0", + "prettier": "^3.3.2" + } +} diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js index 0fae9c1..f60b32b 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js @@ -1,18 +1,18 @@ -import WithPermission from "@/core/middlewares/withPermission"; -import MissionsReportPage from "@/components/dashboard/roadMissions/reports/taradodReports"; -export const metadata = { - title: "کارتابل گزارش ترددها", -}; -const Page = () => { - return ( - - - - ); -}; - -export default Page; +import WithPermission from "@/core/middlewares/withPermission"; +import MissionsReportPage from "@/components/dashboard/roadMissions/reports/taradodReports"; +export const metadata = { + title: "کارتابل گزارش ترددها", +}; +const Page = () => { + return ( + + + + ); +}; + +export default Page; diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js index 6aa2483..66bc585 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js @@ -1,18 +1,18 @@ -import ViolationsReportsPage from "@/components/dashboard/roadMissions/reports/violationsReports"; -import WithPermission from "@/core/middlewares/withPermission"; - -export const metadata = { - title: "کارتابل گزارش تخلفات", -}; - -export default function Page() { - return ( - - - - ); -} +import ViolationsReportsPage from "@/components/dashboard/roadMissions/reports/violationsReports"; +import WithPermission from "@/core/middlewares/withPermission"; + +export const metadata = { + title: "کارتابل گزارش تخلفات", +}; + +export default function Page() { + return ( + + + + ); +} diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx index b398579..938d1e7 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx @@ -1,77 +1,77 @@ -"use client"; -import { - EXPORT_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY, - EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY, -} 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_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY - : EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY; - 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 ? ( - - - - ) : ( - - )} - - ); -}; -export default PrintExcel; +"use client"; +import { + EXPORT_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY, + EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY, +} 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_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY + : EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY; + 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 ? ( + + + + ) : ( + + )} + + ); +}; +export default PrintExcel; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx index 12de496..a80cabb 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx @@ -1,138 +1,138 @@ -"use client"; -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import { Box } from "@mui/material"; -import { useEffect, useMemo } from "react"; -import Toolbar from "./Toolbar"; - -const TaradodReportLists = ({ data, specialFilter }) => { - const columns = useMemo(() => { - return [ - { - accessorKey: "edare_name", - header: "اداره کل", - id: "edare_name", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "total", - header: "کل ماموریت ها", - id: "total", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "khareg_mahdode", - header: "تردد خارج از محدوده", - id: "khareg_mahdode", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "durations", - header: "جمع ساعات ماموریت", - id: "duration", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "gps", - header: "جمع ساعات gps", - id: "gps", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "far_h", - header: "با فرایند ساعتی", - id: "far_h", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "far_d", - header: "با فرایند روزانه", - id: "far_d", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "un_far_h", - header: "بدون فرایند ساعتی", - id: "un_far_h", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "un_far_d", - header: "بدون فرایند روزانه", - id: "un_far_d", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "item", - header: "فعالیت روزانه", - id: "item", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "patrol", - header: "گشت راهداری", - id: "patrol", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - ]; - }, []); - - return ( - - - - ); -}; - -export default TaradodReportLists; +"use client"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useEffect, useMemo } from "react"; +import Toolbar from "./Toolbar"; + +const TaradodReportLists = ({ data, specialFilter }) => { + const columns = useMemo(() => { + return [ + { + accessorKey: "edare_name", + header: "اداره کل", + id: "edare_name", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "total", + header: "کل ماموریت ها", + id: "total", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "khareg_mahdode", + header: "تردد خارج از محدوده", + id: "khareg_mahdode", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "durations", + header: "جمع ساعات ماموریت", + id: "duration", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "gps", + header: "جمع ساعات gps", + id: "gps", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "far_h", + header: "با فرایند ساعتی", + id: "far_h", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "far_d", + header: "با فرایند روزانه", + id: "far_d", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "un_far_h", + header: "بدون فرایند ساعتی", + id: "un_far_h", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "un_far_d", + header: "بدون فرایند روزانه", + id: "un_far_d", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "item", + header: "فعالیت روزانه", + id: "item", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "patrol", + header: "گشت راهداری", + id: "patrol", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + ]; + }, []); + + return ( + + + + ); +}; + +export default TaradodReportLists; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx index 490ee7b..0a81488 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx @@ -1,27 +1,27 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller } from "react-hook-form"; - -const FromDateController = ({ control }) => { - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default FromDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller } from "react-hook-form"; + +const FromDateController = ({ control }) => { + return ( + ( + { + 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/taradodReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx index bde2a4c..e1b71cd 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx @@ -1,44 +1,44 @@ -import SearchIcon from "@mui/icons-material/Search"; -import { Button, Grid } from "@mui/material"; -import { Controller } from "react-hook-form"; -import FromDateController from "./FromDateController"; -import SelectProvince from "./SelectProvince"; -import ToDateController from "./ToDateController"; - -const SearchReportField = ({ control, hasProvincesPermission }) => { - return ( - - - - - - - - {hasProvincesPermission && ( - - - - )} - - ( - - )} - /> - - - ); -}; - -export default SearchReportField; +import SearchIcon from "@mui/icons-material/Search"; +import { Button, Grid } from "@mui/material"; +import { Controller } from "react-hook-form"; +import FromDateController from "./FromDateController"; +import SelectProvince from "./SelectProvince"; +import ToDateController from "./ToDateController"; + +const SearchReportField = ({ control, hasProvincesPermission }) => { + return ( + + + + + + + + {hasProvincesPermission && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +export default SearchReportField; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx index 2b24d67..89395f0 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx @@ -1,45 +1,45 @@ -import useProvinces from "@/lib/hooks/useProvince"; -import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; -import { Controller } from "react-hook-form"; - -const SelectProvince = ({ control }) => { - const { provinces, loadingProvinces, errorProvinces } = useProvinces(); - return ( - ( - - استان - - {error && {error.message}} - - )} - /> - ); -}; -export default SelectProvince; +import useProvinces from "@/lib/hooks/useProvince"; +import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; +import { Controller } from "react-hook-form"; + +const SelectProvince = ({ control }) => { + const { provinces, loadingProvinces, errorProvinces } = useProvinces(); + return ( + ( + + استان + + {error && {error.message}} + + )} + /> + ); +}; +export default SelectProvince; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx index fc4a776..ef3ff49 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx @@ -1,30 +1,30 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller, useWatch } from "react-hook-form"; - -const ToDateController = ({ control }) => { - const minDate = useWatch({ control, name: "from_date" }); - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default ToDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller, useWatch } from "react-hook-form"; + +const ToDateController = ({ control }) => { + const minDate = useWatch({ control, name: "from_date" }); + return ( + ( + { + 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/taradodReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx index f29d302..9d504f2 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx @@ -1,13 +1,13 @@ -import StyledForm from "@/core/components/StyledForm"; -import SearchReportField from "./SearchReportField"; - -const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => { - return ( - <> - - - - - ); -}; -export default SearchReportList; +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/taradodReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx index 0f726c7..afc132c 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx @@ -1,11 +1,11 @@ -import { Box } from "@mui/material"; -import PrintExcel from "./ExcelPrint"; - -const Toolbar = ({ table, filterData, mutate }) => { - return ( - - - - ); -}; -export default Toolbar; +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/taradodReports/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx index ce41101..1af4608 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx @@ -1,142 +1,142 @@ -"use client"; -import PageTitle from "@/core/components/PageTitle"; -import { - GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY, - GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY, -} 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 TaradodReportLists from "./MissionsReportLists"; -import SearchReportList from "./Search"; - -const TaradodReportPage = () => { - const [data, setData] = useState(null); - const { data: userPermissions } = usePermissions(); - const { user } = useAuth(); - const requestServer = useRequest(); - const [provinceId, setProvinceId] = useState(user.province_id || "-1"); - 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: provinceId, - }; - 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}`); - params.set("date_to", `${data.date_to}`); - 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 { - // params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY}?${params}`); - const result = response.data.data; - const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); - const nationalReport = { - edare_name: "کل کشور", - ...nationalReportForItem, - }; - - setData({ - data: [ - nationalReport, - ...result.provinces.map((province) => { - const filteredReports = result.activities.find( - (report) => report.province_id == province.id - ); - return { - ...filteredReports, - edare_name: province.name_fa, - }; - }), - ], - filters: data, - }); - } catch (e) {} - } else { - try { - params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY}?${params}`); - const result = response.data.data; - - const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); - - const nationalReport = { - ...nationalReportForItem, - edare_name: "کل استان", - }; - setData({ - data: [ - nationalReport, - ...result.city.map((city) => { - const filteredReports = result.activities.find((report) => report.city_id == city.id); - return { - edare_name: city.name_fa, - ...filteredReports, - }; - }), - ], - 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 TaradodReportPage; +"use client"; +import PageTitle from "@/core/components/PageTitle"; +import { + GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY, + GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY, +} 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 TaradodReportLists from "./MissionsReportLists"; +import SearchReportList from "./Search"; + +const TaradodReportPage = () => { + const [data, setData] = useState(null); + const { data: userPermissions } = usePermissions(); + const { user } = useAuth(); + const requestServer = useRequest(); + const [provinceId, setProvinceId] = useState(user.province_id || "-1"); + 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: provinceId, + }; + 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}`); + params.set("date_to", `${data.date_to}`); + 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 { + // params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY}?${params}`); + const result = response.data.data; + const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); + const nationalReport = { + edare_name: "کل کشور", + ...nationalReportForItem, + }; + + setData({ + data: [ + nationalReport, + ...result.provinces.map((province) => { + const filteredReports = result.activities.find( + (report) => report.province_id == province.id + ); + return { + ...filteredReports, + edare_name: province.name_fa, + }; + }), + ], + filters: data, + }); + } catch (e) {} + } else { + try { + params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY}?${params}`); + const result = response.data.data; + + const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); + + const nationalReport = { + ...nationalReportForItem, + edare_name: "کل استان", + }; + setData({ + data: [ + nationalReport, + ...result.city.map((city) => { + const filteredReports = result.activities.find((report) => report.city_id == city.id); + return { + edare_name: city.name_fa, + ...filteredReports, + }; + }), + ], + 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 TaradodReportPage; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx index b7487f6..3968fff 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx @@ -1,77 +1,77 @@ -"use client"; -import { - EXPORT_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY, - EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY, -} 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_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY - : EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY; - 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 ? ( - - - - ) : ( - - )} - - ); -}; -export default PrintExcel; +"use client"; +import { + EXPORT_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY, + EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY, +} 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_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY + : EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY; + 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 ? ( + + + + ) : ( + + )} + + ); +}; +export default PrintExcel; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx index 490ee7b..0a81488 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx @@ -1,27 +1,27 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller } from "react-hook-form"; - -const FromDateController = ({ control }) => { - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default FromDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller } from "react-hook-form"; + +const FromDateController = ({ control }) => { + return ( + ( + { + 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/violationsReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SearchReportField.jsx index bde2a4c..e1b71cd 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/SearchReportField.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SearchReportField.jsx @@ -1,44 +1,44 @@ -import SearchIcon from "@mui/icons-material/Search"; -import { Button, Grid } from "@mui/material"; -import { Controller } from "react-hook-form"; -import FromDateController from "./FromDateController"; -import SelectProvince from "./SelectProvince"; -import ToDateController from "./ToDateController"; - -const SearchReportField = ({ control, hasProvincesPermission }) => { - return ( - - - - - - - - {hasProvincesPermission && ( - - - - )} - - ( - - )} - /> - - - ); -}; - -export default SearchReportField; +import SearchIcon from "@mui/icons-material/Search"; +import { Button, Grid } from "@mui/material"; +import { Controller } from "react-hook-form"; +import FromDateController from "./FromDateController"; +import SelectProvince from "./SelectProvince"; +import ToDateController from "./ToDateController"; + +const SearchReportField = ({ control, hasProvincesPermission }) => { + return ( + + + + + + + + {hasProvincesPermission && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +export default SearchReportField; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx index 2b24d67..89395f0 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx @@ -1,45 +1,45 @@ -import useProvinces from "@/lib/hooks/useProvince"; -import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; -import { Controller } from "react-hook-form"; - -const SelectProvince = ({ control }) => { - const { provinces, loadingProvinces, errorProvinces } = useProvinces(); - return ( - ( - - استان - - {error && {error.message}} - - )} - /> - ); -}; -export default SelectProvince; +import useProvinces from "@/lib/hooks/useProvince"; +import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; +import { Controller } from "react-hook-form"; + +const SelectProvince = ({ control }) => { + const { provinces, loadingProvinces, errorProvinces } = useProvinces(); + return ( + ( + + استان + + {error && {error.message}} + + )} + /> + ); +}; +export default SelectProvince; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx index 2dd7263..9b9ac81 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx @@ -1,30 +1,30 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller, useWatch } from "react-hook-form"; - -const ToDateController = ({ control }) => { - const minDate = useWatch({ control, name: "from_date" }); - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default ToDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller, useWatch } from "react-hook-form"; + +const ToDateController = ({ control }) => { + const minDate = useWatch({ control, name: "from_date" }); + return ( + ( + { + 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/violationsReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx index f29d302..9d504f2 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx @@ -1,13 +1,13 @@ -import StyledForm from "@/core/components/StyledForm"; -import SearchReportField from "./SearchReportField"; - -const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => { - return ( - <> - - - - - ); -}; -export default SearchReportList; +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/violationsReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Toolbar.jsx index 0f726c7..afc132c 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Toolbar.jsx @@ -1,11 +1,11 @@ -import { Box } from "@mui/material"; -import PrintExcel from "./ExcelPrint"; - -const Toolbar = ({ table, filterData, mutate }) => { - return ( - - - - ); -}; -export default Toolbar; +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/violationsReports/ViolationsReportsList.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx index 60966f8..61f7282 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx @@ -1,98 +1,98 @@ -"use client"; -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import { Box } from "@mui/material"; -import { useEffect, useMemo } from "react"; -import Toolbar from "./Toolbar"; - -const ViolationsReportsList = ({ data, specialFilter }) => { - const columns = useMemo(() => { - return [ - { - accessorKey: "edare_name", - header: "اداره کل", - id: "edare_name", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "total", - header: "کل تخلفات", - id: "total", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "done", - header: "اقدام شده", - id: "done", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "undone", - header: "اقدام نشده", - id: "un_done", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "gps", - header: "GPS", - id: "gps", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "herasat", - header: "ثبت حراست", - id: "herasat", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "mil_gps", - header: "کیلومتر GPS", - id: "mil_gps", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - ]; - }, []); - - return ( - - - - ); -}; - -export default ViolationsReportsList; +"use client"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useEffect, useMemo } from "react"; +import Toolbar from "./Toolbar"; + +const ViolationsReportsList = ({ data, specialFilter }) => { + const columns = useMemo(() => { + return [ + { + accessorKey: "edare_name", + header: "اداره کل", + id: "edare_name", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "total", + header: "کل تخلفات", + id: "total", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "done", + header: "اقدام شده", + id: "done", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "undone", + header: "اقدام نشده", + id: "un_done", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "gps", + header: "GPS", + id: "gps", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "herasat", + header: "ثبت حراست", + id: "herasat", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "mil_gps", + header: "کیلومتر GPS", + id: "mil_gps", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + ]; + }, []); + + return ( + + + + ); +}; + +export default ViolationsReportsList; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx index 37d765f..d7f9a5a 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx @@ -1,141 +1,141 @@ -"use client"; -import PageTitle from "@/core/components/PageTitle"; -import { - GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY, - GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY, -} 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 ViolationsReportsList from "./ViolationsReportsList"; -import SearchReportList from "./Search"; - -const ViolationsReportsPage = () => { - 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}`); - params.set("date_to", `${data.date_to}`); - 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 { - // params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY}?${params}`); - const result = response.data.data; - const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); - const nationalReport = { - edare_name: "کل کشور", - ...nationalReportForItem, - }; - - setData({ - data: [ - nationalReport, - ...result.provinces.map((province) => { - const filteredReports = result.activities.find( - (report) => report.province_id == province.id - ); - return { - ...filteredReports, - edare_name: province.name_fa, - }; - }), - ], - filters: data, - }); - } catch (e) {} - } else { - try { - params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY}?${params}`); - const result = response.data.data; - - const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); - - const nationalReport = { - ...nationalReportForItem, - edare_name: "کل استان", - }; - setData({ - data: [ - nationalReport, - ...result.city.map((city) => { - const filteredReports = result.activities.find((report) => report.city_id == city.id); - return { - edare_name: city.name_fa, - ...filteredReports, - }; - }), - ], - 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 ViolationsReportsPage; +"use client"; +import PageTitle from "@/core/components/PageTitle"; +import { + GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY, + GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY, +} 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 ViolationsReportsList from "./ViolationsReportsList"; +import SearchReportList from "./Search"; + +const ViolationsReportsPage = () => { + 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}`); + params.set("date_to", `${data.date_to}`); + 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 { + // params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY}?${params}`); + const result = response.data.data; + const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); + const nationalReport = { + edare_name: "کل کشور", + ...nationalReportForItem, + }; + + setData({ + data: [ + nationalReport, + ...result.provinces.map((province) => { + const filteredReports = result.activities.find( + (report) => report.province_id == province.id + ); + return { + ...filteredReports, + edare_name: province.name_fa, + }; + }), + ], + filters: data, + }); + } catch (e) {} + } else { + try { + params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY}?${params}`); + const result = response.data.data; + + const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); + + const nationalReport = { + ...nationalReportForItem, + edare_name: "کل استان", + }; + setData({ + data: [ + nationalReport, + ...result.city.map((city) => { + const filteredReports = result.activities.find((report) => report.city_id == city.id); + return { + edare_name: city.name_fa, + ...filteredReports, + }; + }), + ], + 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 ViolationsReportsPage; From 6d8e9ddb5b6baa7d96a3583c22e910a20bf4132f Mon Sep 17 00:00:00 2001 From: mhmjalali Date: Wed, 10 Jun 2026 16:05:25 +0330 Subject: [PATCH 09/35] complete routing section and view of route on table actions --- .../Create/Form/Area/Routing/AlarmText.jsx | 28 ++++++++ .../Create/Form/Area/Routing/DataBox.jsx | 8 ++- .../Create/Form/Area/Routing/ShowRoute.jsx | 46 +++++++++++++ .../Create/Form/Area/Routing/index.jsx | 65 ++++++++++++------- .../Actions/Create/Form/Area/index.jsx | 14 ++-- .../Actions/Create/Form/Verify/index.jsx | 18 +++-- .../operator/Actions/Create/Form/index.jsx | 2 +- .../operator/Actions/Create/index.jsx | 11 +--- .../roadMissions/operator/OperatorList.jsx | 18 ++--- .../operator/RowActions/RouteDetail/index.jsx | 57 ++++++++++++++++ 10 files changed, 211 insertions(+), 56 deletions(-) create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/AlarmText.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/ShowRoute.jsx create mode 100644 src/components/dashboard/roadMissions/operator/RowActions/RouteDetail/index.jsx diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/AlarmText.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/AlarmText.jsx new file mode 100644 index 0000000..0a3be1b --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/AlarmText.jsx @@ -0,0 +1,28 @@ +import { Box, Typography } from "@mui/material"; + +const AlarmText = ({ isSource }) => { + if (isSource) return null; + return ( + + + با کلیک بر روی مارکر موقعیت را انتخاب کنید + + + ); +}; + +export default AlarmText; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx index 5269a52..c19cb6f 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx @@ -27,9 +27,11 @@ const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget readOnly value={sourcePosition ? `${sourcePosition.lat.toFixed(6)}, ${sourcePosition.lng.toFixed(6)}` : ""} /> - + {isSource && isDest && ( + + )} {isDest && (
diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/ShowRoute.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/ShowRoute.jsx new file mode 100644 index 0000000..8cc7e90 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/ShowRoute.jsx @@ -0,0 +1,46 @@ +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + 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]; + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + + return ( + <> + + + + + ); +}; + +export default ShowRoute; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx index 4f1e47a..06e7c9b 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx @@ -5,12 +5,14 @@ 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 { useRef, useState } from "react"; +import { useEffect, useRef, useState } from "react"; import DataBox from "./DataBox"; +import AlarmText from "./AlarmText"; -const Routing = () => { +const Routing = ({ setArea, setLocations, locations, area }) => { const mapPrevSourceMarker = useRef(); const mapPrevDestMarker = useRef(); + const mapRef = useRef(null); const defaultIconSize = [35, 35]; const [isSource, setIsSource] = useState(false); const [sourcePosition, setSourcePosition] = useState(null); @@ -45,33 +47,48 @@ const Routing = () => { const map = useMapEvents({ move(e) { - if (isMovingSource) { - mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); - } - if (isMovingDest && mapPrevDestMarker.current) { - mapPrevDestMarker.current.setLatLng(e.target.getCenter()); - } + if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); + if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter()); }, movestart() { - if (isMovingSource) { - mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); - } - if (isMovingDest && mapPrevDestMarker.current) { + if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); - } }, moveend() { - if (isMovingSource) { + if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); - } - if (isMovingDest && mapPrevDestMarker.current) { + if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); - } }, }); + useEffect(() => { + mapRef.current = map; + }, [map]); + + useEffect(() => { + if (locations.length < 2) return; + const restoredSource = { lat: locations[0].lat, lng: locations[0].lon }; + const restoredDest = { lat: locations[1].lat, lng: locations[1].lon }; + setSourcePosition(restoredSource); + setDestPosition(restoredDest); + setIsSource(true); + setIsDest(true); + if (area) { + const decoded = polyline.decode(area, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + setTimeout(() => { + mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + }, 100); + } else { + fetchRoute(restoredSource, restoredDest); + } + }, []); + const fetchRoute = async (source, dest) => { - const locations = [ + const locs = [ { lat: source.lat, lon: source.lng }, { lat: dest.lat, lon: dest.lng }, ]; @@ -79,16 +96,17 @@ const Routing = () => { const response = await fetch("https://jouya.141.ir/api/router/drive", { method: "POST", headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ locations }), + body: JSON.stringify({ locations: locs }), }); const data = await response.json(); - const shape = data.trip.legs[0].shape; + setLocations(locs); + setArea(shape); const decoded = polyline.decode(shape, 6); setRouteCoords(decoded); setSelectedRoute({ index: "main", coords: decoded }); - if (data.alternates && data.alternates.length > 0) { + if (data.alternates?.length > 0) { const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); setAlternateCoords(decodedAlternates); } else { @@ -103,7 +121,6 @@ const Routing = () => { const handleMarkerClick = async () => { if (!isSource || editingTarget === "source") { const clickedPosition = mapPrevSourceMarker.current.getLatLng(); - console.log("Source:", clickedPosition.lat, clickedPosition.lng); setSourcePosition(clickedPosition); setIsSource(true); setEditingTarget(null); @@ -144,8 +161,9 @@ const Routing = () => { const handleSelectRoute = (index, coords) => { setSelectedRoute({ index, coords }); + const encoded = polyline.encode(coords, 6); + setArea(encoded); map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); - console.log("Selected route:", index, coords); }; return ( @@ -159,6 +177,7 @@ const Routing = () => { onEditSource={handleEditSource} onEditDest={handleEditDest} /> + import("@/core/components/MapLayer"), { }); const Area = ({ allData, setAllData, handlePrev, setTabState }) => { - const [bound, setBound] = useState(allData.bound); + const [area, setArea] = useState(allData.area); + const [locations, setLocations] = useState(allData.locations); const handleNext = useCallback(() => { - setAllData({ bound: bound }); + setAllData({ area: area }); + setAllData({ locations: locations }); setTabState((s) => s + 1); - }, [bound]); + }, [area]); return ( <> @@ -22,7 +24,7 @@ const Area = ({ allData, setAllData, handlePrev, setTabState }) => { - + @@ -31,8 +33,8 @@ const Area = ({ allData, setAllData, handlePrev, setTabState }) => { - diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Verify/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Verify/index.jsx index 57515c4..639fdef 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Verify/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Verify/index.jsx @@ -7,7 +7,7 @@ import { Box, Button, Chip, DialogActions, DialogContent, Divider, Stack, Typogr import moment from "jalali-moment"; import dynamic from "next/dynamic"; import { useCallback } from "react"; -import ShowBound from "../../../showBound"; +import ShowRoute from "../Area/Routing/ShowRoute"; const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { loading: () => , ssr: false, @@ -23,11 +23,17 @@ const Verify = ({ allData, handlePrev, submitForm, submitting }) => { - - - - - + + + + + + {console.log("allData.area", allData.area)} + + + + + diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/index.jsx index dd39d68..994ce63 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/index.jsx @@ -27,7 +27,7 @@ const reducer = (state, action) => { const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { const [allData, dispatch] = useReducer(reducer, defaultValues); - const [tabState, setTabState] = useState(2); + const [tabState, setTabState] = useState(0); const handleClose = () => { setOpen(false); }; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/index.jsx index 3726f9e..2595dca 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/index.jsx @@ -19,8 +19,6 @@ const Create = ({ mutate }) => { const submitForm = async (result) => { setSubmitting(true); - const bound = result.bound.getLatLngs(); - let area = bound.map((latlng) => [latlng.lng, latlng.lat]); await requestServer(REQUEST_MISSION, "post", { data: { @@ -31,10 +29,7 @@ const Create = ({ mutate }) => { road_observed_id: result.road_observed_id, } : {}), - area: { - type: result.bound_type, - coordinates: area, - }, + encoded_route: result.area, ...(result.rahdaran.length != 0 ? { rahdaran: result.rahdaran.map((r) => r.id) } : {}), requested_machines: result.requested_machines, type: result.type, @@ -101,8 +96,8 @@ const Create = ({ mutate }) => { road_observed_id: "", rahdaran: [], requested_machines: [], - bound: null, - bound_type: "polyline", + area: null, + locations: [], type: "", start_date: "", start_time: null, diff --git a/src/components/dashboard/roadMissions/operator/OperatorList.jsx b/src/components/dashboard/roadMissions/operator/OperatorList.jsx index e343866..8c277e3 100644 --- a/src/components/dashboard/roadMissions/operator/OperatorList.jsx +++ b/src/components/dashboard/roadMissions/operator/OperatorList.jsx @@ -1,21 +1,21 @@ "use client"; +import DescriptionDialog from "@/components/dashboard/roadMissions/operator/RowActions/DescriptionDialog"; +import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; import DataTableWithAuth from "@/core/components/DataTableWithAuth"; import { missionCategoryTypes } from "@/core/utils/missionCategoryTypes"; import { missionRegions } from "@/core/utils/missionRegions"; import { missionTypes } from "@/core/utils/missionTypes"; import { GET_ROAD_MISSIONS_OPERATOR_LIST } from "@/core/utils/routes"; +import useCities from "@/lib/hooks/useCities"; +import useProvinces from "@/lib/hooks/useProvince"; import { Box, Stack } from "@mui/material"; import moment from "jalali-moment"; import { useMemo } from "react"; -import ShowArea from "./Actions/showArea"; import RowActions from "./RowActions"; import MachinesDialog from "./RowActions/Machines"; -import Toolbar from "./Toolbar"; import RahdaranDialog from "./RowActions/Rahdaran"; -import DescriptionDialog from "@/components/dashboard/roadMissions/operator/RowActions/DescriptionDialog"; -import useProvinces from "@/lib/hooks/useProvince"; -import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; -import useCities from "@/lib/hooks/useCities"; +import RouteDetail from "./RowActions/RouteDetail"; +import Toolbar from "./Toolbar"; const OperatorList = () => { const columns = useMemo(() => { @@ -247,7 +247,7 @@ const OperatorList = () => { }, { header: "منطقه عملیاتی", - id: "area", + id: "encoded_route", enableColumnFilter: false, datatype: "numeric", filterMode: "equals", @@ -263,9 +263,9 @@ const OperatorList = () => { }, }, Cell: ({ row }) => - row.original.area ? ( + row.original.encoded_route ? ( - + ) : ( "-" diff --git a/src/components/dashboard/roadMissions/operator/RowActions/RouteDetail/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/RouteDetail/index.jsx new file mode 100644 index 0000000..e345bf9 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/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 "../../Actions/Create/Form/Area/Routing/ShowRoute"; + +const RouteDetail = ({ encoded_route }) => { + const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false); + return ( + <> + + setOpenRouteDetailDialog(true)}> + + + + setOpenRouteDetailDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"sm"} + > + مسیر انتخابی + + + + + + + + + + + + + ); +}; +export default RouteDetail; From 70ea71cbfaff8369e2e4c46cbe65ce434e28112c Mon Sep 17 00:00:00 2001 From: mhmjalali Date: Wed, 10 Jun 2026 16:11:24 +0330 Subject: [PATCH 10/35] add showroute to transportation component --- .../RowActions/RouteDetail/ShowRoute.jsx | 46 +++++++++++++++ .../RowActions/RouteDetail/index.jsx | 57 +++++++++++++++++++ .../transportation/TransportationList.jsx | 6 +- 3 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/ShowRoute.jsx create mode 100644 src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/index.jsx diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/ShowRoute.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/ShowRoute.jsx new file mode 100644 index 0000000..8cc7e90 --- /dev/null +++ b/src/components/dashboard/roadMissions/transportation/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]], + }); + }; + + 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]; + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + + return ( + <> + + + + + ); +}; + +export default ShowRoute; diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/index.jsx new file mode 100644 index 0000000..4501d35 --- /dev/null +++ b/src/components/dashboard/roadMissions/transportation/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)}> + + + + setOpenRouteDetailDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"sm"} + > + مسیر انتخابی + + + + + + + + + + + + + ); +}; +export default RouteDetail; diff --git a/src/components/dashboard/roadMissions/transportation/TransportationList.jsx b/src/components/dashboard/roadMissions/transportation/TransportationList.jsx index ab735d2..51872c9 100644 --- a/src/components/dashboard/roadMissions/transportation/TransportationList.jsx +++ b/src/components/dashboard/roadMissions/transportation/TransportationList.jsx @@ -4,13 +4,13 @@ import { GET_ROAD_MISSIONS_TRANSPORTATION_LIST } from "@/core/utils/routes"; import { Box, Stack } from "@mui/material"; import moment from "jalali-moment"; import { useMemo } from "react"; -import ShowArea from "./Actions/showArea"; import RowActions from "./RowActions"; import { missionRegions } from "@/core/utils/missionRegions"; import { missionTypes } from "@/core/utils/missionTypes"; import useProvinces from "@/lib/hooks/useProvince"; import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; import useCities from "@/lib/hooks/useCities"; +import RouteDetail from "./RowActions/RouteDetail"; const TransportationList = () => { const columns = useMemo(() => { @@ -230,9 +230,9 @@ const TransportationList = () => { }, }, Cell: ({ row }) => - row.original.area ? ( + row.original.encoded_route ? ( - + ) : ( "-" From 63ec584aca243c3a5d9144608fcbbd8b8f1a5c82 Mon Sep 17 00:00:00 2001 From: baslani Date: Wed, 10 Jun 2026 16:30:08 +0330 Subject: [PATCH 11/35] [wip] implementing machines cartable --- jsconfig.json | 38 +-- .../dashboard/machines/loading.jsx | 7 + .../dashboard/machines/page.jsx | 19 ++ .../Form/CreateTollHouse/CityContent.jsx | 33 ++ .../Form/CreateTollHouse/CityController.jsx | 14 + .../CreateTollHouse/EditMachineContent.jsx | 145 ++++++++ .../Form/CreateTollHouse/ImageUpload.jsx | 77 +++++ .../CreateTollHouse/LogesticController.jsx | 42 +++ .../Form/CreateTollHouse/MachineInfo.jsx | 311 ++++++++++++++++++ .../CreateTollHouse/TollHouseLocation.jsx | 20 ++ .../machines/Form/CreateTollHouse/index.jsx | 154 +++++++++ .../machines/Form/Edit/EditController.jsx | 77 +++++ .../dashboard/machines/Form/Edit/index.jsx | 59 ++++ .../dashboard/machines/MachinesList.jsx | 242 ++++++++++++++ .../RowActions/DeleteDialog/DeleteContent.jsx | 39 +++ .../RowActions/DeleteDialog/index.jsx | 34 ++ .../RowActions/ImageForm/ImageFormContent.jsx | 45 +++ .../RowActions/ImageForm/ImagesContent.jsx | 39 +++ .../machines/RowActions/ImageForm/index.jsx | 43 +++ .../LocationForm/LocationFormContent.jsx | 35 ++ .../RowActions/LocationForm/index.jsx | 38 +++ .../dashboard/machines/RowActions/index.jsx | 16 + .../machines/ShowProjectArea/ShowBound.jsx | 29 ++ .../machines/ShowProjectArea/index.jsx | 65 ++++ src/components/dashboard/machines/Toolbar.jsx | 6 + src/components/dashboard/machines/index.jsx | 14 + src/core/utils/pageMenu.js | 16 +- src/core/utils/pageMenuDev.js | 10 +- src/core/utils/routes.js | 5 + 29 files changed, 1640 insertions(+), 32 deletions(-) create mode 100644 src/app/(withAuth)/(dashboardLayout)/dashboard/machines/loading.jsx create mode 100644 src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx create mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/CityContent.jsx create mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/CityController.jsx create mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/EditMachineContent.jsx create mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/ImageUpload.jsx create mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/LogesticController.jsx create mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/MachineInfo.jsx create mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/TollHouseLocation.jsx create mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/index.jsx create mode 100644 src/components/dashboard/machines/Form/Edit/EditController.jsx create mode 100644 src/components/dashboard/machines/Form/Edit/index.jsx create mode 100644 src/components/dashboard/machines/MachinesList.jsx create mode 100644 src/components/dashboard/machines/RowActions/DeleteDialog/DeleteContent.jsx create mode 100644 src/components/dashboard/machines/RowActions/DeleteDialog/index.jsx create mode 100644 src/components/dashboard/machines/RowActions/ImageForm/ImageFormContent.jsx create mode 100644 src/components/dashboard/machines/RowActions/ImageForm/ImagesContent.jsx create mode 100644 src/components/dashboard/machines/RowActions/ImageForm/index.jsx create mode 100644 src/components/dashboard/machines/RowActions/LocationForm/LocationFormContent.jsx create mode 100644 src/components/dashboard/machines/RowActions/LocationForm/index.jsx create mode 100644 src/components/dashboard/machines/RowActions/index.jsx create mode 100644 src/components/dashboard/machines/ShowProjectArea/ShowBound.jsx create mode 100644 src/components/dashboard/machines/ShowProjectArea/index.jsx create mode 100644 src/components/dashboard/machines/Toolbar.jsx create mode 100644 src/components/dashboard/machines/index.jsx diff --git a/jsconfig.json b/jsconfig.json index b51472a..c136578 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,27 +1,27 @@ // javascript for production -{ - "compilerOptions": { - "paths": { - "@/*": ["./src/*"], - "^/*": ["./public/*"] - } - } -} - -// typescript for local development // { // "compilerOptions": { -// "jsx": "react-jsx", -// "noUnusedLocals": true, -// "noImplicitAny": false, -// "checkJs": true, -// "allowJs": true, -// "strict": true, -// "baseUrl": ".", // "paths": { // "@/*": ["./src/*"], // "^/*": ["./public/*"] // } -// }, -// "exclude": ["node_modules"] +// } // } + +// typescript for local development +{ + "compilerOptions": { + "jsx": "react-jsx", + "noUnusedLocals": true, + "noImplicitAny": false, + "checkJs": true, + "allowJs": true, + "strict": true, + "baseUrl": ".", + "paths": { + "@/*": ["./src/*"], + "^/*": ["./public/*"] + } + }, + "exclude": ["node_modules"] +} diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/loading.jsx b/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/loading.jsx new file mode 100644 index 0000000..4535a8d --- /dev/null +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/loading.jsx @@ -0,0 +1,7 @@ +"use client"; +import PageLoading from "@/core/components/PageLoading"; + +const Loading = () => { + return ; +}; +export default Loading; diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx b/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx new file mode 100644 index 0000000..53e7040 --- /dev/null +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx @@ -0,0 +1,19 @@ +import WithPermission from "@/core/middlewares/withPermission"; +import MachinesPage from "@/components/dashboard/machines" + +export const metadata = { + title: "کارتابل ماشین‌ها", +}; +const Page = () => { + return ( + <> + + + + + ); +}; + +export default Page; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/CityContent.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/CityContent.jsx new file mode 100644 index 0000000..3069208 --- /dev/null +++ b/src/components/dashboard/machines/Form/CreateTollHouse/CityContent.jsx @@ -0,0 +1,33 @@ +import SelectBox from "@/core/components/SelectBox"; +import { useEffect, useState } from "react"; +import useCities from "@/lib/hooks/useCities"; + +const CityContent = ({ provinceID, field, fieldState: { error } }) => { + const { cityList, loadingCityList, errorCityList } = useCities(provinceID); + const [prevDependency, setPrevDependency] = useState(provinceID); + + useEffect(() => { + if (prevDependency === provinceID) return; + field.onChange(null); + setPrevDependency(provinceID); + }, [provinceID]); + + return ( + + ); +}; +export default CityContent; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/CityController.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/CityController.jsx new file mode 100644 index 0000000..72de542 --- /dev/null +++ b/src/components/dashboard/machines/Form/CreateTollHouse/CityController.jsx @@ -0,0 +1,14 @@ +import { Controller, useWatch } from "react-hook-form"; +import CityContent from "./CityContent"; + +const CityController = ({ control }) => { + const provinceID = useWatch({ control, name: "province_id" }); + return ( + } + /> + ); +}; +export default CityController; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/EditMachineContent.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/EditMachineContent.jsx new file mode 100644 index 0000000..7128b06 --- /dev/null +++ b/src/components/dashboard/machines/Form/CreateTollHouse/EditMachineContent.jsx @@ -0,0 +1,145 @@ +import StyledForm from "@/core/components/StyledForm"; +import { yupResolver } from "@hookform/resolvers/yup"; +import BeenhereIcon from "@mui/icons-material/Beenhere"; +import ExitToAppIcon from "@mui/icons-material/ExitToApp"; +import KeyboardDoubleArrowLeftIcon from "@mui/icons-material/KeyboardDoubleArrowLeft"; +import KeyboardDoubleArrowRightIcon from "@mui/icons-material/KeyboardDoubleArrowRight"; +import OtherHousesIcon from "@mui/icons-material/OtherHouses"; +import { Box, Button, DialogActions, DialogContent, Tab, Tabs } from "@mui/material"; +import { useState } from "react"; +import { useForm } from "react-hook-form"; +import { number, object, string } from "yup"; +import MachineInfo from "./MachineInfo"; + +function TabPanel(props) { + const { children, value, index } = props; + return ( + + ); +} + +const validationSchema = object({ + name: string().required("وارد کردن نام راهدارخانه الزامیست!"), + status: string().required("وارد کردن وضعیت الزامیست!"), + type: string().required("وارد کردن نوع الزامیست!"), + phone: string().required("وارد کردن تلفن راهدارخانه الزامیست!"), + team_num: string().required("وارد کردن تعداد اکیپ الزامیست!"), + staff_num: string().required("وارد کردن تعداد پرسنل الزامیست!"), + responsible_name: string().required("وارد کردن نام مسئول الزامیست!"), + responsible_mobile: string() + .required("وارد کردن تلفن مسئول الزامیست!") + .matches(/^09\d{9}$/, "شماره تلفن مسئول باید با ۰۹ شروع شده و ۱۱ رقم باشد!"), + successor_name: string().required("وارد کردن نام جانشین الزامیست!"), + successor_mobile: string() + .required("وارد کردن تلفن جانشین الزامیست!") + .matches(/^09\d{9}$/, "شماره تلفن جانشین باید با ۰۹ شروع شده و ۱۱ رقم باشد!"), + province_id: number().required("وارد کردن استان الزامیست!"), + city_id: number().required("وارد کردن شهرستان الزامیست!"), + machines_light: string().required("وارد کردن ماشین آلات سبک الزامیست!"), + machines_sheavy: string().required("وارد کردن ماشین آلات نیمه سنگین الزامیست!"), + machines_heavy: string().required("وارد کردن ماشین آلات سنگین الزامیست!"), +}); +const EditMachineContent = ({ setOpen, SubmitCreateTollHouse, defaultValues }) => { + const [tabState, setTabState] = useState(0); + const handleClose = () => { + setOpen(false); + }; + + const handleChangeTab = (event, newValue) => { + setTabState(newValue); + }; + const handleNext = async () => { + const fieldsToValidate = [ + "status", + "province_id", + "city_id", + "station_id", + ]; + const isValid = await trigger(fieldsToValidate); + if (isValid) { + setTabState(tabState + 1); + } + }; + const handlePrev = () => { + if (tabState === 0) { + handleClose(); + } else { + setTabState(tabState - 1); + } + }; + const { + control, + handleSubmit, + trigger, + formState: { isSubmitting }, + } = useForm({ + defaultValues, + resolver: yupResolver(validationSchema), + mode: "all", + }); + const onSubmitBase = async (data) => { + await SubmitCreateTollHouse(data); + }; + return ( + + + } label="اطلاعات راهدارخانه" /> + + + + + + + + + + + {tabState !== 3 && ( + + )} + {tabState === 3 && ( + + )} + + + ); +}; +export default EditMachineContent; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/ImageUpload.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/ImageUpload.jsx new file mode 100644 index 0000000..033a6f1 --- /dev/null +++ b/src/components/dashboard/machines/Form/CreateTollHouse/ImageUpload.jsx @@ -0,0 +1,77 @@ +import { FormControl, FormHelperText } from "@mui/material"; +import UploadSystem from "@/core/components/UploadSystem"; +import React, { useEffect, useState } from "react"; + +const ImageUpload = ({ name, value, onChange, error, title }) => { + const [beforeImg, setBeforeImg] = useState(value ? value : null); + const [beforeFileType, setBeforeFileType] = useState(value ? "image/" : null); + const [beforeFileName, setBeforeFileName] = useState(null); + const [showBeforeImage, setShowBeforeImage] = useState(!value); + + useEffect(() => { + if (value) { + setShowBeforeImage(false); + if (typeof value === "string") { + setBeforeImg(value); + setBeforeFileType("image/"); + } else if (value instanceof File) { + setBeforeImg(URL.createObjectURL(value)); + setBeforeFileType(value.type); + } + } + }, [value]); + + const handleFileChange = (event) => { + const uploadedFile = event.target?.files?.[0]; + if (uploadedFile) { + const fileType = event.target?.files?.[0].type; + const fileName = event.target?.files?.[0].name; + setBeforeImg(URL.createObjectURL(uploadedFile)); + setBeforeFileType(fileType); + setBeforeFileName(fileName); + onChange(uploadedFile); + setShowBeforeImage(false); + } + }; + + return ( + + + {title} + + + {error ? error.message : null} + + ); +}; +export default ImageUpload; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/LogesticController.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/LogesticController.jsx new file mode 100644 index 0000000..513abbf --- /dev/null +++ b/src/components/dashboard/machines/Form/CreateTollHouse/LogesticController.jsx @@ -0,0 +1,42 @@ +import { Controller, useWatch } from "react-hook-form"; +import SelectBox from "@/core/components/SelectBox"; +import useProvinces from "@/lib/hooks/useProvince"; +import { Grid } from "@mui/material"; +import CityController from "./CityController"; + +const LogesticController = ({ control }) => { + const { provinces, errorProvinces, loadingProvinces } = useProvinces(); + const isProvince = useWatch({ control, name: "is_province" }); + return ( + + {!isProvince ? ( + + { + return ( + + ); + }} + /> + + ) : null} + + + + + ); +}; +export default LogesticController; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/MachineInfo.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/MachineInfo.jsx new file mode 100644 index 0000000..6fca8a4 --- /dev/null +++ b/src/components/dashboard/machines/Form/CreateTollHouse/MachineInfo.jsx @@ -0,0 +1,311 @@ +import { Grid, Stack, TextField } from "@mui/material"; +import { Controller } from "react-hook-form"; +import SelectBox from "@/core/components/SelectBox"; +import useProvince from "@/lib/hooks/useProvince"; +import PersianTextField from "@/core/components/PersianTextField"; +import CityController from "./CityController"; +import LogesticController from "./LogesticController"; + +const MachineInfo = ({ control }) => { + const { provinces, loadingProvinces, errorProvinces } = useProvince(); + return ( + + + + + ( + + )} + /> + + + ( + { + const inputValue = event.target.value; + if (isNaN(Number(inputValue))) { + return; + } + onChange(inputValue); + }} + /> + )} + /> + + + + + + + + + + { + return ( + + ); + }} + /> + + + { + return ( + + ); + }} + /> + + + + + + + ( + { + const inputValue = event.target.value; + if (isNaN(Number(inputValue))) { + return; + } + onChange(inputValue); + }} + /> + )} + /> + + + ( + { + const inputValue = event.target.value; + if (isNaN(Number(inputValue))) { + return; + } + onChange(inputValue); + }} + /> + )} + /> + + + + + + + ( + + )} + /> + + + ( + { + const inputValue = event.target.value; + if (isNaN(Number(inputValue))) { + return; + } + onChange(inputValue); + }} + /> + )} + /> + + + + + + + ( + + )} + /> + + + ( + { + const inputValue = event.target.value; + if (isNaN(Number(inputValue))) { + return; + } + onChange(inputValue); + }} + /> + )} + /> + + + + + ); +}; +export default MachineInfo; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/TollHouseLocation.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/TollHouseLocation.jsx new file mode 100644 index 0000000..98d36a7 --- /dev/null +++ b/src/components/dashboard/machines/Form/CreateTollHouse/TollHouseLocation.jsx @@ -0,0 +1,20 @@ +import MapInfoOneMarker from "@/core/components/MapInfoOneMarker"; +import { Stack } from "@mui/material"; +import { useWatch } from "react-hook-form"; + +const TollHouseLocation = ({ setValue, errors, control }) => { + const StartPoint = useWatch({ control, name: "start_point" }); + return ( + <> + + + + + ); +}; +export default TollHouseLocation; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/index.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/index.jsx new file mode 100644 index 0000000..3649dcd --- /dev/null +++ b/src/components/dashboard/machines/Form/CreateTollHouse/index.jsx @@ -0,0 +1,154 @@ +import { Button, Dialog, IconButton, useMediaQuery } from "@mui/material"; +import { useState } from "react"; +import CreateTollHouseContent from "./EditMachineContent"; +import { AddCircle } from "@mui/icons-material"; +import { useTheme } from "@emotion/react"; +import { CREATE_TOLL_HOUSE } from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import CloseIcon from "@mui/icons-material/Close"; +import { useAuth } from "@/lib/contexts/auth"; +import { usePermissions } from "@/lib/hooks/usePermissions"; + +const CreateTollHouse = ({ mutate }) => { + const requestServer = useRequest({ notificationSuccess: true }); + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down("sm")); + const [open, setOpen] = useState(false); + const { user } = useAuth(); + const { data: userPermissions } = usePermissions(); + const hasCreateProvincePermission = userPermissions.some((item) => ["add-tollhouse"].includes(item)); + const handleOpen = () => { + setOpen(true); + }; + const SubmitCreateTollHouse = async (result) => { + const fields = [ + "province_id", + "city_id", + "name", + "status", + "type", + "team_num", + "staff_num", + "phone", + "responsible_name", + "responsible_mobile", + "successor_name", + "successor_mobile", + "machines_light", + "machines_sheavy", + "machines_heavy", + "overview_files_1", + "overview_files_2", + "overview_files_3", + "overview_files_4", + "overview_files_5", + ]; + const formData = new FormData(); + fields.forEach((field) => { + if (result[field] !== undefined && result[field] !== null) { + formData.append(field, result[field]); + } + }); + formData.append("lat", result.start_point.lat); + formData.append("lng", result.start_point.lng); + formData.append("area[type]", "polygon"); + result.area.map((point, pointIndex) => { + formData.append(`area[coordinates][${pointIndex}][0]`, point.lon); + formData.append(`area[coordinates][${pointIndex}][1]`, point.lat); + }); + const repeat_first = result.area.length; + formData.append(`area[coordinates][${repeat_first}][0]`, result.area[0].lon); + formData.append(`area[coordinates][${repeat_first}][1]`, result.area[0].lat); + await requestServer(`${CREATE_TOLL_HOUSE}`, "post", { + data: formData, + }) + .then(() => { + mutate(); + setOpen(false); + }) + .catch(() => {}); + }; + const defaultValues = { + name: "", + is_province: !hasCreateProvincePermission, + province_id: !hasCreateProvincePermission ? user.province_id : null, + city_id: null, + status: "", + type: "", + phone: "", + team_num: "", + staff_num: "", + responsible_name: "", + responsible_mobile: "", + successor_name: "", + successor_mobile: "", + machines_light: "", + machines_sheavy: "", + machines_heavy: "", + overview_files_1: null, + overview_files_2: null, + overview_files_3: null, + overview_files_4: null, + overview_files_5: null, + start_point: "", + area: [ + { lat: "", lon: "" }, + { lat: "", lon: "" }, + { lat: "", lon: "" }, + { lat: "", lon: "" }, + ], + }; + return ( + <> + {isMobile ? ( + + + + ) : ( + + )} + setOpen(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + maxWidth={"md"} + scroll="paper" + > + setOpen(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + {open && ( + + )} + + + ); +}; +export default CreateTollHouse; diff --git a/src/components/dashboard/machines/Form/Edit/EditController.jsx b/src/components/dashboard/machines/Form/Edit/EditController.jsx new file mode 100644 index 0000000..a5f9c7f --- /dev/null +++ b/src/components/dashboard/machines/Form/Edit/EditController.jsx @@ -0,0 +1,77 @@ +import DialogLoading from "@/core/components/DialogLoading"; +import { GET_TOLL_HOUSE_DETAILS, UPDATE_TOLL_HOUSE_ITEM } from "@/core/utils/routes"; +import { usePermissions } from "@/lib/hooks/usePermissions"; +import useRequest from "@/lib/hooks/useRequest"; +import { useEffect, useState } from "react"; +import EditMachineContent from "../CreateTollHouse/EditMachineContent"; + +const EditController = ({ rowId, mutate, setOpenEditDialog }) => { + const { data: userPermissions } = usePermissions(); + const hasCreateProvincePermission = userPermissions.some((item) => ["update-machine"].includes(item)); + const requestServer = useRequest(); + const [MachineItemDetails, setMachineItemDetails] = useState(null); + const [machineItemDetailsLoading, setMachineItemDetailsLoading] = useState(false); + + useEffect(() => { + setMachineItemDetailsLoading(true); + requestServer(`${GET_TOLL_HOUSE_DETAILS}/${rowId}`, "get") + .then((response) => { + setMachineItemDetails(response.data.data); + setMachineItemDetailsLoading(false); + }) + .catch((e) => { + setMachineItemDetailsLoading(false); + }); + }, [rowId]); + + const defaultData = { + is_province: !hasCreateProvincePermission, + province_id: MachineItemDetails?.province_id || null, + city_id: MachineItemDetails?.city_id || null, + status: MachineItemDetails?.status || "", + station_id: MachineItemDetails?.station_id || "", + }; + const HandleSubmit = async (result) => { + const fields = [ + "status", + "province_id", + "city_id", + "station_id", + ]; + const formData = new FormData(); + fields.forEach((field) => { + if (result[field] !== undefined && result[field] !== null) { + formData.append(field, result[field]); + } + }); + for (let i = 1; i <= 5; i++) { + if (result[`overview_files_${i}`] !== defaultData[`overview_files_${i}`]) { + formData.append(`overview_files_${i}`, result[`overview_files_${i}`]); + } + } + + await requestServer(`${UPDATE_TOLL_HOUSE_ITEM}/${rowId}`, "post", { + data: formData, + notificationSuccess: true, + }) + .then(() => { + mutate(); + setOpenEditDialog(false); + }) + .catch(() => {}); + }; + return ( + <> + {machineItemDetailsLoading ? ( + + ) : ( + + )} + + ); +}; +export default EditController; diff --git a/src/components/dashboard/machines/Form/Edit/index.jsx b/src/components/dashboard/machines/Form/Edit/index.jsx new file mode 100644 index 0000000..53be78c --- /dev/null +++ b/src/components/dashboard/machines/Form/Edit/index.jsx @@ -0,0 +1,59 @@ +import { Dialog, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import BorderColorIcon from "@mui/icons-material/BorderColor"; +import EditController from "./EditController"; +import CloseIcon from "@mui/icons-material/Close"; + +const EditForm = ({ row, mutate, rowId }) => { + const [openEditDialog, setOpenEditDialog] = useState(false); + + return ( + <> + + { + setOpenEditDialog(true); + }} + > + + + + + setOpenEditDialog(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + {openEditDialog && ( + + )} + + + ); +}; +export default EditForm; diff --git a/src/components/dashboard/machines/MachinesList.jsx b/src/components/dashboard/machines/MachinesList.jsx new file mode 100644 index 0000000..bcfb104 --- /dev/null +++ b/src/components/dashboard/machines/MachinesList.jsx @@ -0,0 +1,242 @@ +"use client"; +import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { GET_MACHINES_LIST } from "@/core/utils/routes"; +import { useAuth } from "@/lib/contexts/auth"; +import useEdaratLists from "@/lib/hooks/useEdaratLists"; +import { usePermissions } from "@/lib/hooks/usePermissions"; +import useProvinces from "@/lib/hooks/useProvince"; +import { Box, Typography } from "@mui/material"; +import { useEffect, useMemo, useState } from "react"; +import RowActions from "./RowActions"; +import Toolbar from "./Toolbar"; + +const statusOptions = [ + { value: "", label: "همه وضعیت ها" }, + { value: 1, label: "آماده" }, + { value: 2, label: "رزرو" }, + { value: 3, label: "در ماموریت" }, + { value: 4, label: "خارج از رده" }, + { value: 5, label: "در تعمیر" }, + { value: 6, label: "فروخته شده" }, + { value: 7, label: "نیاز به تعمیر" }, +]; + +const MachinesList = () => { + const { data: userPermissions } = usePermissions(); + const hasCountryPermission = userPermissions?.includes("show-tollhouse"); + const { user } = useAuth(); + + const columns = useMemo(() => { + const provinceColumn = { + accessorKey: "province_id", + 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 ( + + ); + }, + Cell: ({ row }) => <>{row.original.province_name}, + }; + return [ + { + accessorKey: "id", + header: "کد یکتا", // Unique Code + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + + { + header: "اطلاعات ماشین‌ها", + id: "machines_info", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + columns: [ + { + accessorKey: "car_name", + header: "نام ماشین", + id: "car_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "car_type", + header: "نوع ماشین", + id: "car_type", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "machine_code", + header: "کد ماشین", + id: "machine_code", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "plak_number", + header: "پلاک", + id: "plak_number", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + ...(hasCountryPermission ? [provinceColumn] : []), + { + accessorKey: "city_id", + header: "شهرستان", // Office + id: "city_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + dependencyId: hasCountryPermission ? "province_id" : null, + grow: false, + size: 120, + ColumnSelectComponent: (props) => { + const { edaratList, loadingEdaratList, errorEdaratList } = useEdaratLists( + hasCountryPermission ? props.dependencyFieldValue.value : user.province_id + ); + const [prevDependency, setPrevDependency] = useState( + hasCountryPermission ? props.dependencyFieldValue.value : user.province_id + ); + + const getColumnSelectOptions = useMemo(() => { + if (hasCountryPermission && props.dependencyFieldValue.value === "") { + return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }]; + } + if (loadingEdaratList) { + return [{ value: "loading", label: "در حال بارگذاری..." }]; + } + if (errorEdaratList) { + return [{ value: "error", label: "خطا در بارگذاری" }]; + } + return [ + { value: "", label: "کل شهر ها" }, + ...edaratList.map((edare) => ({ + value: edare.id, + label: edare.name_fa, + })), + ]; + }, [edaratList, loadingEdaratList, errorEdaratList]); + useEffect(() => { + if (hasCountryPermission) return; + if (prevDependency === props.dependencyFieldValue?.value) return; + props.handleChange({ ...props.filterParameters, value: "" }); + setPrevDependency(props.dependencyFieldValue?.value); + }, [props.dependencyFieldValue?.value, hasCountryPermission]); + return ( + + ); + }, + Cell: ({ row }) => <>{row.original.city_name}, + }, + { + accessorKey: "status", + header: "وضعیت", + id: "status", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + grow: false, + size: 100, + columnSelectOption: () => { + return statusOptions.map((status) => ({ + value: status.value, + label: status.label, + })); + }, + Cell: ({ row }) => { + const status = statusOptions.find((option) => option.value == row.original.status); + return {status?.label || ""}; + }, + }, + + ], + }, + ]; + }, []); + + return ( + <> + + + + + ); +}; +export default MachinesList; diff --git a/src/components/dashboard/machines/RowActions/DeleteDialog/DeleteContent.jsx b/src/components/dashboard/machines/RowActions/DeleteDialog/DeleteContent.jsx new file mode 100644 index 0000000..3f3095a --- /dev/null +++ b/src/components/dashboard/machines/RowActions/DeleteDialog/DeleteContent.jsx @@ -0,0 +1,39 @@ +import { Button, DialogActions, DialogContent, Stack, Typography } from "@mui/material"; +import React, { useState } from "react"; +import useRequest from "@/lib/hooks/useRequest"; +import { DELETE_TOLL_HOUSE_ITEM } from "@/core/utils/routes"; + +const DeleteContent = ({ rowId, mutate, setOpenDeleteDialog }) => { + const [submitting, setSubmitting] = useState(false); + const requestServer = useRequest({ notificationSuccess: true }); + const handleClick = () => { + setSubmitting(true); + requestServer(`${DELETE_TOLL_HOUSE_ITEM}/${rowId}`, "delete") + .then(() => { + mutate(); + setOpenDeleteDialog(false); + setSubmitting(false); + }) + .catch(() => { + setSubmitting(false); + }); + }; + return ( + <> + + + آیا از حذف راهدارخانه اطمینان دارید؟ + + + + + + + + ); +}; +export default DeleteContent; diff --git a/src/components/dashboard/machines/RowActions/DeleteDialog/index.jsx b/src/components/dashboard/machines/RowActions/DeleteDialog/index.jsx new file mode 100644 index 0000000..54278bd --- /dev/null +++ b/src/components/dashboard/machines/RowActions/DeleteDialog/index.jsx @@ -0,0 +1,34 @@ +import DeleteIcon from "@mui/icons-material/Delete"; +import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import DeleteContent from "./DeleteContent"; +const DeleteDialog = ({ rowId, mutate }) => { + const [openDeleteDialog, setOpenDeleteDialog] = useState(false); + + return ( + <> + + setOpenDeleteDialog(true)}> + + + + setOpenDeleteDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"md"} + > + حذف راهدارخانه + {openDeleteDialog && ( + + )} + + + ); +}; +export default DeleteDialog; diff --git a/src/components/dashboard/machines/RowActions/ImageForm/ImageFormContent.jsx b/src/components/dashboard/machines/RowActions/ImageForm/ImageFormContent.jsx new file mode 100644 index 0000000..c8f22d0 --- /dev/null +++ b/src/components/dashboard/machines/RowActions/ImageForm/ImageFormContent.jsx @@ -0,0 +1,45 @@ +import { Box, Stack, Typography, useTheme } from "@mui/material"; +import Image from "next/image"; + +const ImageFormContent = ({ image, title }) => { + const theme = useTheme(); + return ( + + + {title} + + + Image + + + ); +}; +export default ImageFormContent; diff --git a/src/components/dashboard/machines/RowActions/ImageForm/ImagesContent.jsx b/src/components/dashboard/machines/RowActions/ImageForm/ImagesContent.jsx new file mode 100644 index 0000000..6e22c9a --- /dev/null +++ b/src/components/dashboard/machines/RowActions/ImageForm/ImagesContent.jsx @@ -0,0 +1,39 @@ +import { useEffect, useState } from "react"; +import ImageFormContent from "./ImageFormContent"; +import DialogLoading from "@/core/components/DialogLoading"; +import useRequest from "@/lib/hooks/useRequest"; +import { GET_TOLL_HOUSE_IMAGES } from "@/core/utils/routes"; +import { Typography } from "@mui/material"; +const titles = ["نمای کلی از راهداری", "آشیانه ماشین آلات", "انباری شن و ماسه", "محیط کاری", "سایر تصاویر"]; + +const ImagesContent = ({ rowId }) => { + const requestServer = useRequest(); + const [tollHouseImages, setTollHouseImages] = useState(null); + const [tollHouseImagesLoading, setTollHouseImagesLoading] = useState(false); + useEffect(() => { + setTollHouseImagesLoading(true); + requestServer(`${GET_TOLL_HOUSE_IMAGES}/${rowId}`, "get") + .then((response) => { + setTollHouseImages(response.data.data); + setTollHouseImagesLoading(false); + }) + .catch((e) => { + setTollHouseImagesLoading(false); + }); + }, [rowId]); + + return ( + <> + {tollHouseImagesLoading ? ( + + ) : tollHouseImages ? ( + tollHouseImages.map((image, index) => { + return ; + }) + ) : ( + تصویری در سامانه یافت نشد + )} + + ); +}; +export default ImagesContent; diff --git a/src/components/dashboard/machines/RowActions/ImageForm/index.jsx b/src/components/dashboard/machines/RowActions/ImageForm/index.jsx new file mode 100644 index 0000000..6ac8d25 --- /dev/null +++ b/src/components/dashboard/machines/RowActions/ImageForm/index.jsx @@ -0,0 +1,43 @@ +import PhotoLibraryIcon from "@mui/icons-material/PhotoLibrary"; +import { Button, Dialog, DialogActions, DialogContent, DialogTitle, IconButton, Tooltip } from "@mui/material"; +import { useEffect, useState } from "react"; +import ImagesContent from "./ImagesContent"; +import useRequest from "@/lib/hooks/useRequest"; +import { GET_TOLL_HOUSE_IMAGES } from "@/core/utils/routes"; +import DialogLoading from "@/core/components/DialogLoading"; + +const ImageDialog = ({ rowId }) => { + const [openImageDialog, setOpenImageDialog] = useState(false); + + return ( + <> + + setOpenImageDialog(true)}> + + + + setOpenImageDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + maxWidth={"sm"} + scroll="paper" + > + تصاویر + {openImageDialog && } + + + + + + ); +}; + +export default ImageDialog; diff --git a/src/components/dashboard/machines/RowActions/LocationForm/LocationFormContent.jsx b/src/components/dashboard/machines/RowActions/LocationForm/LocationFormContent.jsx new file mode 100644 index 0000000..14b3db3 --- /dev/null +++ b/src/components/dashboard/machines/RowActions/LocationForm/LocationFormContent.jsx @@ -0,0 +1,35 @@ +"use client"; +import { Box, Button, DialogActions, DialogContent, Stack } from "@mui/material"; +import React from "react"; +import dynamic from "next/dynamic"; +import MapLoading from "@/core/components/MapLayer/Loading"; +import ShowLocationMarker from "@/core/components/ShowLocationMarker"; +const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { + loading: () => , + ssr: false, +}); + +const LocationFormContent = ({ setOpenLocationDialog, start_lat, start_lng, end_lat, end_lng }) => { + return ( + <> + + + + + + + + + + + + ); +}; +export default LocationFormContent; diff --git a/src/components/dashboard/machines/RowActions/LocationForm/index.jsx b/src/components/dashboard/machines/RowActions/LocationForm/index.jsx new file mode 100644 index 0000000..f578ca8 --- /dev/null +++ b/src/components/dashboard/machines/RowActions/LocationForm/index.jsx @@ -0,0 +1,38 @@ +import React, { useState } from "react"; +import { Tooltip, IconButton, Dialog, DialogTitle } from "@mui/material"; +import ExploreIcon from "@mui/icons-material/Explore"; +import LocationFormContent from "./LocationFormContent"; +const LocationForm = ({ start_lat, start_lng, end_lat, end_lng }) => { + const [openLocationDialog, setOpenLocationDialog] = useState(false); + + return ( + <> + + setOpenLocationDialog(true)}> + + + + setOpenLocationDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"md"} + > + موقعیت + + + + ); +}; +export default LocationForm; diff --git a/src/components/dashboard/machines/RowActions/index.jsx b/src/components/dashboard/machines/RowActions/index.jsx new file mode 100644 index 0000000..8feb437 --- /dev/null +++ b/src/components/dashboard/machines/RowActions/index.jsx @@ -0,0 +1,16 @@ +import { usePermissions } from "@/lib/hooks/usePermissions"; +import { Box } from "@mui/material"; +import EditForm from "../Form/Edit"; + +const RowActions = ({ row, mutate }) => { + const { data: userPermissions } = usePermissions(); + const hasEditPermission = userPermissions.some((item) => + ["update-machine"].includes(item) + ); + return ( + + {hasEditPermission && } + + ); +}; +export default RowActions; diff --git a/src/components/dashboard/machines/ShowProjectArea/ShowBound.jsx b/src/components/dashboard/machines/ShowProjectArea/ShowBound.jsx new file mode 100644 index 0000000..24db476 --- /dev/null +++ b/src/components/dashboard/machines/ShowProjectArea/ShowBound.jsx @@ -0,0 +1,29 @@ +import { useEffect, useRef } from "react"; +import { FeatureGroup, useMap } from "react-leaflet"; + +const ShowBound = ({ bound }) => { + const map = useMap(); + const featureRef = useRef(null); + + const safeFitBounds = (layer) => { + if (!layer || !map) return; + try { + const latLngs = layer.getLatLngs(); + map.fitBounds(latLngs, { + paddingTopLeft: [20, 20], + paddingBottomRight: [20, 20], + }); + } catch (e) { + console.warn("fitBounds failed:", e); + } + }; + + useEffect(() => { + bound?.editing?.disable(); + featureRef.current.addLayer(bound); + safeFitBounds(bound); + }, []); + + return ; +}; +export default ShowBound; diff --git a/src/components/dashboard/machines/ShowProjectArea/index.jsx b/src/components/dashboard/machines/ShowProjectArea/index.jsx new file mode 100644 index 0000000..250cd52 --- /dev/null +++ b/src/components/dashboard/machines/ShowProjectArea/index.jsx @@ -0,0 +1,65 @@ +const { IconButton, Tooltip, Box, Dialog, DialogTitle, Typography, DialogContent } = require("@mui/material"); +import MapLayer from "@/core/components/MapLayer"; +import CloseIcon from "@mui/icons-material/Close"; +import LayersIcon from "@mui/icons-material/Layers"; +import L from "leaflet"; +import { useMemo, useState } from "react"; +import ShowBound from "./ShowBound"; + +const ShowProjectArea = ({ primaryArea }) => { + const [openShowAreaDialog, setOpenShowAreaDialog] = useState(false); + const bound = useMemo(() => { + const coordinates = Object.values(primaryArea.coordinates); + + const latLngCoords = coordinates.map(([lat, lng]) => [parseFloat(lng), parseFloat(lat)]); + + return primaryArea.type === "polygon" + ? L.polygon(latLngCoords, { color: "#ff5555" }) + : L.polyline(latLngCoords); + }, [primaryArea]); + + return ( + + + setOpenShowAreaDialog(true)}> + + + + setOpenShowAreaDialog(false)} + PaperProps={{ + sx: { + transition: "all .3s", + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + borderRadius: 2, + padding: 1, + }, + }} + maxWidth="sm" + fullWidth + dir="rtl" + > + + + محدوده طرح + + setOpenShowAreaDialog(false)} size="small"> + + + + + + + + + + + + + + + ); +}; + +export default ShowProjectArea; diff --git a/src/components/dashboard/machines/Toolbar.jsx b/src/components/dashboard/machines/Toolbar.jsx new file mode 100644 index 0000000..ae86ec0 --- /dev/null +++ b/src/components/dashboard/machines/Toolbar.jsx @@ -0,0 +1,6 @@ +import { Box } from "@mui/material"; + +const Toolbar = ({ table, filterData, mutate }) => { + return machines toolbar; +}; +export default Toolbar; diff --git a/src/components/dashboard/machines/index.jsx b/src/components/dashboard/machines/index.jsx new file mode 100644 index 0000000..ed3db7c --- /dev/null +++ b/src/components/dashboard/machines/index.jsx @@ -0,0 +1,14 @@ +"use client"; +import PageTitle from "@/core/components/PageTitle"; +import { Stack } from "@mui/material"; +import MachinesList from "./MachinesList"; + +const MachinesPage = () => { + return ( + + + + + ); +}; +export default MachinesPage; diff --git a/src/core/utils/pageMenu.js b/src/core/utils/pageMenu.js index a770353..99366c4 100644 --- a/src/core/utils/pageMenu.js +++ b/src/core/utils/pageMenu.js @@ -1,3 +1,4 @@ +import { ReportProblem, RvHookup } from "@mui/icons-material"; import AccountTreeIcon from "@mui/icons-material/AccountTree"; import AdminPanelSettingsIcon from "@mui/icons-material/AdminPanelSettings"; import AssessmentIcon from "@mui/icons-material/Assessment"; @@ -5,7 +6,9 @@ import AssignmentLateIcon from "@mui/icons-material/AssignmentLate"; import AssistantIcon from "@mui/icons-material/Assistant"; import BallotIcon from "@mui/icons-material/Ballot"; import BiotechIcon from "@mui/icons-material/Biotech"; +import ContactPageIcon from "@mui/icons-material/ContactPage"; import CottageIcon from "@mui/icons-material/Cottage"; +import DirectionsBusIcon from "@mui/icons-material/DirectionsBus"; import DoorbellIcon from "@mui/icons-material/Doorbell"; import DriveEtaIcon from "@mui/icons-material/DriveEta"; import ElectricBoltIcon from "@mui/icons-material/ElectricBolt"; @@ -23,17 +26,14 @@ import MapIcon from "@mui/icons-material/Map"; import MapsHomeWorkIcon from "@mui/icons-material/MapsHomeWork"; import Mediation from "@mui/icons-material/Mediation"; import PsychologyAltIcon from "@mui/icons-material/PsychologyAlt"; +import RemoveRoadIcon from "@mui/icons-material/RemoveRoad"; import ReportIcon from "@mui/icons-material/Report"; import RouteIcon from "@mui/icons-material/Route"; import ScienceIcon from "@mui/icons-material/Science"; import SecurityIcon from "@mui/icons-material/Security"; import SpaceDashboardIcon from "@mui/icons-material/SpaceDashboard"; import SpeedIcon from "@mui/icons-material/Speed"; -import ContactPageIcon from "@mui/icons-material/ContactPage"; -import DirectionsBusIcon from "@mui/icons-material/DirectionsBus"; import SupervisedUserCircleIcon from "@mui/icons-material/SupervisedUserCircle"; -import RemoveRoadIcon from "@mui/icons-material/RemoveRoad"; -import { ReportProblem, RvHookup } from "@mui/icons-material"; export const pageMenu = [ { @@ -685,12 +685,12 @@ export const pageMenu = [ permissions: ["manage-damage"], }, { - id: "CarDetails", - label: "اطلاعات خودرو", + id: "machines", + label: "ماشین‌ها", type: "page", - route: "/dashboard/car-details", + route: "/dashboard/machines", icon: , - permissions: [""], + permissions: ["update-machine"], }, ], }, diff --git a/src/core/utils/pageMenuDev.js b/src/core/utils/pageMenuDev.js index e0f742d..08aaf62 100644 --- a/src/core/utils/pageMenuDev.js +++ b/src/core/utils/pageMenuDev.js @@ -682,13 +682,13 @@ export const pageMenuDev = [ icon: , permissions: ["manage-damage"], }, - { - id: "CarDetails", - label: "اطلاعات خودرو", + { + id: "machines", + label: "ماشین‌ها", type: "page", - route: "/dashboard/car-details", + route: "/dashboard/machines", icon: , - permissions: ["show-rahdaran"], + permissions: ["update-machine"], }, ], }, diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index a2ea39f..4de64fe 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -277,3 +277,8 @@ export const CONFIRM_VERIFY_LICENSE_FORM = api + "/api/v3/harim/technical_deputy // History export const GET_HISTORY_LIST = api + "/api/v3/harim/detail/histories"; export const GET_REQUEST_INQUIRY_PRIVACY = api + "/api/v3/harim/technical_deputy"; + + +// Machines +export const GET_MACHINES_LIST = api + "/api/v3/cmms_machines" +export const UPDATE_CMMS_MACHINES = api + "/api/v3/cmms_machines" \ No newline at end of file From e3ca4a20526b10e176b5d1e876e0536b515b8f50 Mon Sep 17 00:00:00 2001 From: mhmjalali Date: Sat, 13 Jun 2026 06:13:17 +0330 Subject: [PATCH 12/35] complete transportation page --- .../RowActions/Allocation/Form/index.jsx | 40 +++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx index c35018d..be001cc 100644 --- a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx +++ b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx @@ -14,16 +14,10 @@ import MachinesDialog from "./MachinesDialog"; import Reject from "./Reject"; import SelectBox from "@/core/components/SelectBox"; import { Controller, useForm } from "react-hook-form"; +import RouteDetail from "../../RouteDetail"; +import ShowRoute from "../../RouteDetail/ShowRoute"; const AllocationForm = ({ row, mutate, setOpenAllocationDialog }) => { - const latLngs = useMemo(() => { - return row.area.coordinates.map(([lng, lat]) => [lat, lng]); - }, [row.area.coordinates]); - - const bound = useMemo( - () => (row.area.type === "polygon" ? L.polygon(latLngs) : L.polyline(latLngs)), - [row.area.type, latLngs] - ); const requestServer = useRequest({ notificationSuccess: true }); const [machine, setMachine] = useState(); const [driver, setDriver] = useState(); @@ -180,10 +174,32 @@ const AllocationForm = ({ row, mutate, setOpenAllocationDialog }) => { )} - - - - + + {row.encoded_route ? ( + + + + ) : ( + + مختصات برای این ماموریت در دسترس نمیباشد + + )} From 855afc05e56a9bb1a145594d43faf7cbef0d8c5d Mon Sep 17 00:00:00 2001 From: mhmjalali Date: Sat, 13 Jun 2026 10:22:49 +0330 Subject: [PATCH 13/35] complete adding route selection and view of it for violation page --- .../Actions/Create/Form/Verify/index.jsx | 1 - .../MapControlPolygon/DrawBound/index.jsx | 129 ----------- .../Form/Area/MapControlPolygon/index.jsx | 116 ---------- .../MapControlPolyline/DrawBound/index.jsx | 129 ----------- .../Form/Area/MapControlPolyline/index.jsx | 116 ---------- .../Form/Area/Routing/AlarmText.jsx | 28 +++ .../Form/Area/Routing/DataBox.jsx | 53 +++++ .../Form/Area/Routing/ShowRoute.jsx | 46 ++++ .../Form/Area/Routing/index.jsx | 219 ++++++++++++++++++ .../Form/Area/SelectBoundType/index.jsx | 25 -- .../CreateWithoutProcess/Form/Area/index.jsx | 29 +-- .../Form/Verify/index.jsx | 12 +- .../CreateWithoutProcess/Form/index.jsx | 20 +- .../Actions/CreateWithoutProcess/index.jsx | 5 +- 14 files changed, 386 insertions(+), 542 deletions(-) delete mode 100644 src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolygon/DrawBound/index.jsx delete mode 100644 src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolygon/index.jsx delete mode 100644 src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolyline/DrawBound/index.jsx delete mode 100644 src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolyline/index.jsx create mode 100644 src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/AlarmText.jsx create mode 100644 src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/DataBox.jsx create mode 100644 src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/ShowRoute.jsx create mode 100644 src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/index.jsx delete mode 100644 src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/SelectBoundType/index.jsx diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Verify/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Verify/index.jsx index 639fdef..e48883e 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Verify/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Verify/index.jsx @@ -28,7 +28,6 @@ const Verify = ({ allData, handlePrev, submitForm, submitting }) => { - {console.log("allData.area", allData.area)} diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolygon/DrawBound/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolygon/DrawBound/index.jsx deleted file mode 100644 index 5a253a9..0000000 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolygon/DrawBound/index.jsx +++ /dev/null @@ -1,129 +0,0 @@ -import React, { useCallback, useEffect, useRef, useState } from "react"; -import L from "leaflet"; -import { FeatureGroup, useMap } from "react-leaflet"; -import "leaflet-draw"; - -const DrawBound = ({ control, controlDispach, bound, setBound }) => { - const map = useMap(); - const featureRef = useRef(null); - const [area, setArea] = useState(); - const drawControlRef = useRef(null); - - const safeFlyToBounds = (layer) => { - if (!layer || !map) return; - try { - const latLngs = layer.getLatLngs(); - map.flyToBounds(latLngs, { - paddingTopLeft: [20, 35], - paddingBottomRight: [20, 55], - }); - } catch (e) { - console.warn("flyToBounds failed:", e); - } - }; - - const safeFitBounds = (layer) => { - if (!layer || !map) return; - try { - const latLngs = layer.getLatLngs(); - map.fitBounds(latLngs, { - paddingTopLeft: [20, 35], - paddingBottomRight: [20, 55], - }); - } catch (e) { - console.warn("fitBounds failed:", e); - } - }; - - const bindEditEvent = (layer) => { - if (!layer) return; - layer.on("edit", function (e) { - const editedLayer = e.target; - setArea(editedLayer); - setBound(editedLayer); - safeFlyToBounds(editedLayer); - }); - }; - - const handlerCreatedBound = useCallback((event) => { - const { layer } = event; - layer.editing.enable(); - featureRef.current.addLayer(layer); // 🟢 اول اضافه به نقشه - setArea(layer); - setBound(layer); - safeFlyToBounds(layer); - bindEditEvent(layer); - controlDispach({ type: "SET_STATUS", status: 2 }); - }, []); - - useEffect(() => { - if ( - control.status === 1 && - drawControlRef.current && - drawControlRef.current._toolbars?.draw?._modes?.polygon?.handler - ) { - drawControlRef.current._toolbars.draw._modes.polygon.handler.enable(); - } - }, [control.status]); - - useEffect(() => { - if (control.status === 0 && area && featureRef.current) { - featureRef.current.removeLayer(area); - setArea(null); - setBound(null); - } - }, [control.status, area]); - - useEffect(() => { - if (control.status === 2 && bound && featureRef.current) { - setArea(bound); - featureRef.current.addLayer(bound); - bound.editing.enable(); - safeFitBounds(bound); - bindEditEvent(bound); - } - }, [control.status, bound]); - - useEffect(() => { - if (!featureRef.current) return; - - L.drawLocal.draw.handlers.polygon.tooltip.start = "برای شروع ترسیم محدوده، روی نقشه کلیک کنید"; - L.drawLocal.draw.handlers.polygon.tooltip.cont = "برای ادامه ترسیم، نقاط بعدی را کلیک کنید"; - L.drawLocal.draw.handlers.polygon.tooltip.end = "برای بستن محدوده، روی نقطه‌ی شروع کلیک کنید"; - - const drawControl = new L.Control.Draw({ - draw: { - polygon: { - shapeOptions: { - color: "#3388ff", - weight: 3, - clickable: true, - }, - }, - polyline: false, - rectangle: false, - circle: false, - marker: false, - circlemarker: false, - }, - edit: { - featureGroup: featureRef.current, - edit: true, - remove: false, - }, - }); - - drawControlRef.current = drawControl; - map.addControl(drawControl); - map.on(L.Draw.Event.CREATED, handlerCreatedBound); - - return () => { - map.off(L.Draw.Event.CREATED, handlerCreatedBound); - map.removeControl(drawControl); - }; - }, [map, handlerCreatedBound]); - - return ; -}; - -export default DrawBound; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolygon/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolygon/index.jsx deleted file mode 100644 index 718600c..0000000 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolygon/index.jsx +++ /dev/null @@ -1,116 +0,0 @@ -import { Delete, Route } from "@mui/icons-material"; -import { Box, Button, Stack, Typography } from "@mui/material"; -import { useReducer } from "react"; -import DrawBound from "./DrawBound"; - -const statusType = [ - { - id: 0, - message: "برای آغاز ترسیم محدوده، کلیک کنید!", - buttons: [ - { - label: "شروع ترسیم محدوده", - key: "start", - color: "primary", - icon: , - onclick: (controlDispach) => { - controlDispach({ type: "SET_STATUS", status: 1 }); - }, - }, - ], - }, - { - id: 1, - message: "محدوده‌ی موردنظر را با کلیک روی نقشه مشخص کنید. برای اتمام، روی نقطه‌ی ابتدایی کلیک کنید!", - buttons: [], - }, - { - id: 2, - message: "برای اصلاح محدوده، گوشه‌ها را بکشید. برای ترسیم دوباره، آن را حذف کنید", - buttons: [ - { - label: "حذف", - key: "end", - color: "error", - icon: , - onclick: (controlDispach) => { - controlDispach({ type: "SET_STATUS", status: 0 }); - }, - }, - ], - }, -]; - -const createInitialState = (bound) => { - if (bound) { - return { status: 2 }; - } - return { status: 0 }; -}; - -const reducer = (state, action) => { - switch (action.type) { - case "SET_STATUS": - return { ...state, status: action.status }; - default: - return state; - } -}; - -const MapControlPolygon = ({ bound, setBound }) => { - const [control, controlDispach] = useReducer(reducer, bound, createInitialState); - - return ( - <> - - - theme.palette.info.main, - borderBottomLeftRadius: 8, - borderBottomRightRadius: 8, - py: 0.5, - px: 2, - }} - > - - {statusType.find((st) => st.id == control.status).message} - - - - - - {statusType - .find((st) => st.id == control.status) - .buttons.map((button) => ( - - ))} - - - - ); -}; -export default MapControlPolygon; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolyline/DrawBound/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolyline/DrawBound/index.jsx deleted file mode 100644 index 5456d12..0000000 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolyline/DrawBound/index.jsx +++ /dev/null @@ -1,129 +0,0 @@ -import React, { useCallback, useEffect, useRef, useState } from "react"; -import L from "leaflet"; -import { FeatureGroup, useMap } from "react-leaflet"; -import "leaflet-draw"; - -const DrawBound = ({ control, controlDispach, bound, setBound }) => { - const map = useMap(); - const featureRef = useRef(null); - const [area, setArea] = useState(); - const drawControlRef = useRef(null); - - const safeFlyToBounds = (layer) => { - if (!layer || !map) return; - try { - const latLngs = layer.getLatLngs(); - map.flyToBounds(latLngs, { - paddingTopLeft: [20, 35], - paddingBottomRight: [20, 55], - }); - } catch (e) { - console.warn("flyToBounds failed:", e); - } - }; - - const safeFitBounds = (layer) => { - if (!layer || !map) return; - try { - const latLngs = layer.getLatLngs(); - map.fitBounds(latLngs, { - paddingTopLeft: [20, 35], - paddingBottomRight: [20, 55], - }); - } catch (e) { - console.warn("fitBounds failed:", e); - } - }; - - const bindEditEvent = (layer) => { - if (!layer) return; - layer.on("edit", function (e) { - const editedLayer = e.target; - setArea(editedLayer); - setBound(editedLayer); - safeFlyToBounds(editedLayer); - }); - }; - - const handlerCreatedBound = useCallback((event) => { - const { layer } = event; - layer.editing.enable(); - featureRef.current.addLayer(layer); // 🟢 اول اضافه به نقشه - setArea(layer); - setBound(layer); - safeFlyToBounds(layer); - bindEditEvent(layer); - controlDispach({ type: "SET_STATUS", status: 2 }); - }, []); - - useEffect(() => { - if ( - control.status === 1 && - drawControlRef.current && - drawControlRef.current._toolbars?.draw?._modes?.polyline?.handler - ) { - drawControlRef.current._toolbars.draw._modes.polyline.handler.enable(); - } - }, [control.status]); - - useEffect(() => { - if (control.status === 0 && area && featureRef.current) { - featureRef.current.removeLayer(area); - setArea(null); - setBound(null); - } - }, [control.status, area]); - - useEffect(() => { - if (control.status === 2 && bound && featureRef.current) { - setArea(bound); - featureRef.current.addLayer(bound); - bound.editing.enable(); - safeFitBounds(bound); - bindEditEvent(bound); - } - }, [control.status, bound]); - - useEffect(() => { - if (!featureRef.current) return; - - L.drawLocal.draw.handlers.polyline.tooltip.start = "برای شروع ترسیم مسیر، روی نقشه کلیک کنید"; - L.drawLocal.draw.handlers.polyline.tooltip.cont = "برای ادامه ترسیم، نقاط بعدی را کلیک کنید"; - L.drawLocal.draw.handlers.polyline.tooltip.end = "برای بستن مسیر، روی نقطه پایانی کلیک کنید"; - - const drawControl = new L.Control.Draw({ - draw: { - polyline: { - shapeOptions: { - color: "#3388ff", - weight: 3, - clickable: true, - }, - }, - polygon: false, - rectangle: false, - circle: false, - marker: false, - circlemarker: false, - }, - edit: { - featureGroup: featureRef.current, - edit: true, - remove: false, - }, - }); - - drawControlRef.current = drawControl; - map.addControl(drawControl); - map.on(L.Draw.Event.CREATED, handlerCreatedBound); - - return () => { - map.off(L.Draw.Event.CREATED, handlerCreatedBound); - map.removeControl(drawControl); - }; - }, [map, handlerCreatedBound]); - - return ; -}; - -export default DrawBound; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolyline/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolyline/index.jsx deleted file mode 100644 index 8d9b5d0..0000000 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/MapControlPolyline/index.jsx +++ /dev/null @@ -1,116 +0,0 @@ -import { Delete, Route } from "@mui/icons-material"; -import { Box, Button, Stack, Typography } from "@mui/material"; -import { useReducer } from "react"; -import DrawBound from "./DrawBound"; - -const statusType = [ - { - id: 0, - message: "برای آغاز ترسیم مسیر، کلیک کنید!", - buttons: [ - { - label: "شروع ترسیم مسیر", - key: "start", - color: "primary", - icon: , - onclick: (controlDispach) => { - controlDispach({ type: "SET_STATUS", status: 1 }); - }, - }, - ], - }, - { - id: 1, - message: "مسیر موردنظر را با کلیک روی نقشه مشخص کنید. برای اتمام، روی نقطه‌ی پایانی کلیک کنید!", - buttons: [], - }, - { - id: 2, - message: "برای اصلاح مسیر، گوشه‌ها را بکشید. برای ترسیم دوباره، آن را حذف کنید", - buttons: [ - { - label: "حذف", - key: "end", - color: "error", - icon: , - onclick: (controlDispach) => { - controlDispach({ type: "SET_STATUS", status: 0 }); - }, - }, - ], - }, -]; - -const createInitialState = (bound) => { - if (bound) { - return { status: 2 }; - } - return { status: 0 }; -}; - -const reducer = (state, action) => { - switch (action.type) { - case "SET_STATUS": - return { ...state, status: action.status }; - default: - return state; - } -}; - -const MapControlPolyline = ({ bound, setBound }) => { - const [control, controlDispach] = useReducer(reducer, bound, createInitialState); - - return ( - <> - - - theme.palette.info.main, - borderBottomLeftRadius: 8, - borderBottomRightRadius: 8, - py: 0.5, - px: 2, - }} - > - - {statusType.find((st) => st.id == control.status).message} - - - - - - {statusType - .find((st) => st.id == control.status) - .buttons.map((button) => ( - - ))} - - - - ); -}; -export default MapControlPolyline; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/AlarmText.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/AlarmText.jsx new file mode 100644 index 0000000..0a3be1b --- /dev/null +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/AlarmText.jsx @@ -0,0 +1,28 @@ +import { Box, Typography } from "@mui/material"; + +const AlarmText = ({ isSource }) => { + if (isSource) return null; + return ( + + + با کلیک بر روی مارکر موقعیت را انتخاب کنید + + + ); +}; + +export default AlarmText; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/DataBox.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/DataBox.jsx new file mode 100644 index 0000000..c19cb6f --- /dev/null +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/DataBox.jsx @@ -0,0 +1,53 @@ +import { Box, Button, TextField } from "@mui/material"; + +const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => { + if (!isSource) return null; + + return ( + +
+ + {isSource && isDest && ( + + )} +
+ {isDest && ( +
+ + +
+ )} + + ); +}; + +export default DataBox; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/ShowRoute.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/ShowRoute.jsx new file mode 100644 index 0000000..8cc7e90 --- /dev/null +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/ShowRoute.jsx @@ -0,0 +1,46 @@ +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + 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]; + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + + return ( + <> + + + + + ); +}; + +export default ShowRoute; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/index.jsx new file mode 100644 index 0000000..06e7c9b --- /dev/null +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/index.jsx @@ -0,0 +1,219 @@ +import { Marker, Polyline, useMapEvents } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; +import PrevDestIcon from "@/assets/images/prev-destination-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; +import { useEffect, useRef, useState } from "react"; +import DataBox from "./DataBox"; +import AlarmText from "./AlarmText"; + +const Routing = ({ setArea, setLocations, locations, area }) => { + const mapPrevSourceMarker = useRef(); + const mapPrevDestMarker = useRef(); + const mapRef = useRef(null); + const defaultIconSize = [35, 35]; + const [isSource, setIsSource] = useState(false); + const [sourcePosition, setSourcePosition] = useState(null); + const [isDest, setIsDest] = useState(false); + const [destPosition, setDestPosition] = useState(null); + const [routeCoords, setRouteCoords] = useState([]); + const [alternateCoords, setAlternateCoords] = useState([]); + const [editingTarget, setEditingTarget] = useState(null); + const [selectedRoute, setSelectedRoute] = useState(null); + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + const defaultIcon = createCustomIcon( + defaultIconSize, + isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src + ); + + const prevDestIcon = createCustomIcon( + defaultIconSize, + isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src + ); + + const isMovingSource = !isSource || editingTarget === "source"; + const isMovingDest = isSource && (!isDest || editingTarget === "dest"); + + const map = useMapEvents({ + move(e) { + if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); + if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter()); + }, + movestart() { + if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); + }, + moveend() { + if (isMovingSource) + mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); + }, + }); + + useEffect(() => { + mapRef.current = map; + }, [map]); + + useEffect(() => { + if (locations.length < 2) return; + const restoredSource = { lat: locations[0].lat, lng: locations[0].lon }; + const restoredDest = { lat: locations[1].lat, lng: locations[1].lon }; + setSourcePosition(restoredSource); + setDestPosition(restoredDest); + setIsSource(true); + setIsDest(true); + if (area) { + const decoded = polyline.decode(area, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + setTimeout(() => { + mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + }, 100); + } else { + fetchRoute(restoredSource, restoredDest); + } + }, []); + + const fetchRoute = async (source, dest) => { + const locs = [ + { lat: source.lat, lon: source.lng }, + { lat: dest.lat, lon: dest.lng }, + ]; + try { + const response = await fetch("https://jouya.141.ir/api/router/drive", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ locations: locs }), + }); + const data = await response.json(); + const shape = data.trip.legs[0].shape; + setLocations(locs); + setArea(shape); + const decoded = polyline.decode(shape, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + + if (data.alternates?.length > 0) { + const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); + setAlternateCoords(decodedAlternates); + } else { + setAlternateCoords([]); + } + map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + } catch (error) { + console.error("Routing error:", error); + } + }; + + const handleMarkerClick = async () => { + if (!isSource || editingTarget === "source") { + const clickedPosition = mapPrevSourceMarker.current.getLatLng(); + setSourcePosition(clickedPosition); + setIsSource(true); + setEditingTarget(null); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + + if (editingTarget === "source" && destPosition) { + await fetchRoute(clickedPosition, destPosition); + } + } + }; + + const handleDestMarkerClick = async () => { + if (!isDest || editingTarget === "dest") { + const clickedPosition = mapPrevDestMarker.current.getLatLng(); + setDestPosition(clickedPosition); + setIsDest(true); + setEditingTarget(null); + + await fetchRoute(sourcePosition, clickedPosition); + } + }; + + const handleEditSource = () => { + setEditingTarget("source"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleEditDest = () => { + setEditingTarget("dest"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleSelectRoute = (index, coords) => { + setSelectedRoute({ index, coords }); + const encoded = polyline.encode(coords, 6); + setArea(encoded); + map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); + }; + + return ( + <> + + + + {isSource && ( + + )} + {alternateCoords.map((coords, index) => ( + handleSelectRoute(index, coords) }} + /> + ))} + {routeCoords.length > 0 && ( + handleSelectRoute("main", routeCoords) }} + /> + )} + + ); +}; + +export default Routing; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/SelectBoundType/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/SelectBoundType/index.jsx deleted file mode 100644 index ebb3c69..0000000 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/SelectBoundType/index.jsx +++ /dev/null @@ -1,25 +0,0 @@ -import SelectBox from "@/core/components/SelectBox"; - -export const boundTypes = [ - { id: "polygon", name_fa: "محدوده" }, - { id: "polyline", name_fa: "مسیر" }, -]; - -const SelectBoundType = ({ boundType, setBoundType, setBound, setAllData }) => { - return ( - <> - { - setBound(null); - setBoundType(newValue); - setAllData({ bound_type: newValue }); - }} - /> - - ); -}; -export default SelectBoundType; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/index.jsx index 3d666fd..200c1e0 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/index.jsx @@ -2,40 +2,29 @@ import MapLoading from "@/core/components/MapLayer/Loading"; import { Box, Button, DialogActions, DialogContent, Stack } from "@mui/material"; import dynamic from "next/dynamic"; import { useCallback, useState } from "react"; -import MapControlPolygon from "./MapControlPolygon"; -import MapControlPolyline from "./MapControlPolyline"; -import SelectBoundType from "./SelectBoundType"; +import Routing from "./Routing"; const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { loading: () => , ssr: false, }); const Area = ({ allData, setAllData, handlePrev, setTabState }) => { - const [bound, setBound] = useState(allData.bound); - const [boundType, setBoundType] = useState(allData.bound_type); + const [area, setArea] = useState(allData.area); + const [locations, setLocations] = useState(allData.locations); const handleNext = useCallback(() => { - setAllData({ bound: bound }); + setAllData({ area: area }); + setAllData({ locations: locations }); setTabState((s) => s + 1); - }, [bound]); + }, [area]); return ( <> - - {boundType == "polygon" ? ( - - ) : ( - - )} + @@ -44,8 +33,8 @@ const Area = ({ allData, setAllData, handlePrev, setTabState }) => { - diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Verify/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Verify/index.jsx index 09f865f..68f99e7 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Verify/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Verify/index.jsx @@ -5,7 +5,7 @@ import { Box, Button, Chip, DialogActions, DialogContent, Divider, Stack, Typogr import moment from "jalali-moment"; import dynamic from "next/dynamic"; import { useCallback } from "react"; -import ShowBound from "../../../showBound"; +import ShowRoute from "../Area/Routing/ShowRoute"; const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { loading: () => , ssr: false, @@ -22,6 +22,16 @@ const Verify = ({ allData, handlePrev, submitForm, submitting }) => { + + + + + + + + + + diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx index 96de65d..0f9c7b2 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx @@ -1,4 +1,4 @@ -import { AccessTime, Engineering, InsertDriveFile, Person, Verified } from "@mui/icons-material"; +import { AccessTime, Engineering, InsertDriveFile, Person, Verified, Map } from "@mui/icons-material"; import { Box, Tab, Tabs } from "@mui/material"; import { useReducer, useState } from "react"; import GetDateTime from "./GetDateTime"; @@ -6,6 +6,7 @@ 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; @@ -61,8 +62,9 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { } label="مشخصات" /> } label="زمانبندی" /> } label="راننده" /> - } label="همراهان" /> - } label="بررسی نهایی" /> + } label="مختصات" /> + } label="همراهان" /> + } label="بررسی نهایی" /> { /> - { dispatch({ type: "changeData", data }); @@ -105,6 +107,16 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { /> + { + dispatch({ type: "changeData", data }); + }} + handlePrev={handlePrev} + setTabState={setTabState} + /> + + diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/index.jsx index 0e1f42b..f2d3d09 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/index.jsx @@ -28,6 +28,7 @@ const CreateWithoutProcess = ({ row, mutate }) => { start_date: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`, end_date: `${result.end_date} ${moment(result.end_time).format("HH:mm")}`, driver: result.driver.id, + encoded_route: result.area, }, hasSidebarUpdate: true, }) @@ -49,7 +50,7 @@ const CreateWithoutProcess = ({ row, mutate }) => { - + setOpen(false)} @@ -77,6 +78,8 @@ const CreateWithoutProcess = ({ row, mutate }) => { end_point: "", region: "", driver: null, + area: null, + locations: [], }} submitForm={submitForm} submitting={submitting} From 5f88728d674537b2c528d7ab0518a2fbfcc9e207 Mon Sep 17 00:00:00 2001 From: baslani Date: Sat, 13 Jun 2026 10:57:36 +0330 Subject: [PATCH 14/35] implemented machines cartable --- .../Form/CreateTollHouse/CityContent.jsx | 33 -- .../Form/CreateTollHouse/CityController.jsx | 14 - .../CreateTollHouse/EditMachineContent.jsx | 145 -------- .../Form/CreateTollHouse/ImageUpload.jsx | 77 ----- .../CreateTollHouse/LogesticController.jsx | 42 --- .../Form/CreateTollHouse/MachineInfo.jsx | 311 ------------------ .../CreateTollHouse/TollHouseLocation.jsx | 20 -- .../machines/Form/CreateTollHouse/index.jsx | 154 --------- .../machines/Form/Edit/EditController.jsx | 77 ----- .../dashboard/machines/MachinesList.jsx | 112 +------ .../machines/RowActions/Edit/Form/index.jsx | 281 ++++++++++++++++ .../{Form => RowActions}/Edit/index.jsx | 33 +- .../RowActions/ImageForm/ImageFormContent.jsx | 45 --- .../RowActions/ImageForm/ImagesContent.jsx | 39 --- .../machines/RowActions/ImageForm/index.jsx | 43 --- .../LocationForm/LocationFormContent.jsx | 35 -- .../RowActions/LocationForm/index.jsx | 38 --- .../dashboard/machines/RowActions/index.jsx | 8 +- src/components/dashboard/machines/Toolbar.jsx | 6 - src/core/utils/routes.js | 9 +- 20 files changed, 301 insertions(+), 1221 deletions(-) delete mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/CityContent.jsx delete mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/CityController.jsx delete mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/EditMachineContent.jsx delete mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/ImageUpload.jsx delete mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/LogesticController.jsx delete mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/MachineInfo.jsx delete mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/TollHouseLocation.jsx delete mode 100644 src/components/dashboard/machines/Form/CreateTollHouse/index.jsx delete mode 100644 src/components/dashboard/machines/Form/Edit/EditController.jsx create mode 100644 src/components/dashboard/machines/RowActions/Edit/Form/index.jsx rename src/components/dashboard/machines/{Form => RowActions}/Edit/index.jsx (54%) delete mode 100644 src/components/dashboard/machines/RowActions/ImageForm/ImageFormContent.jsx delete mode 100644 src/components/dashboard/machines/RowActions/ImageForm/ImagesContent.jsx delete mode 100644 src/components/dashboard/machines/RowActions/ImageForm/index.jsx delete mode 100644 src/components/dashboard/machines/RowActions/LocationForm/LocationFormContent.jsx delete mode 100644 src/components/dashboard/machines/RowActions/LocationForm/index.jsx delete mode 100644 src/components/dashboard/machines/Toolbar.jsx diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/CityContent.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/CityContent.jsx deleted file mode 100644 index 3069208..0000000 --- a/src/components/dashboard/machines/Form/CreateTollHouse/CityContent.jsx +++ /dev/null @@ -1,33 +0,0 @@ -import SelectBox from "@/core/components/SelectBox"; -import { useEffect, useState } from "react"; -import useCities from "@/lib/hooks/useCities"; - -const CityContent = ({ provinceID, field, fieldState: { error } }) => { - const { cityList, loadingCityList, errorCityList } = useCities(provinceID); - const [prevDependency, setPrevDependency] = useState(provinceID); - - useEffect(() => { - if (prevDependency === provinceID) return; - field.onChange(null); - setPrevDependency(provinceID); - }, [provinceID]); - - return ( - - ); -}; -export default CityContent; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/CityController.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/CityController.jsx deleted file mode 100644 index 72de542..0000000 --- a/src/components/dashboard/machines/Form/CreateTollHouse/CityController.jsx +++ /dev/null @@ -1,14 +0,0 @@ -import { Controller, useWatch } from "react-hook-form"; -import CityContent from "./CityContent"; - -const CityController = ({ control }) => { - const provinceID = useWatch({ control, name: "province_id" }); - return ( - } - /> - ); -}; -export default CityController; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/EditMachineContent.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/EditMachineContent.jsx deleted file mode 100644 index 7128b06..0000000 --- a/src/components/dashboard/machines/Form/CreateTollHouse/EditMachineContent.jsx +++ /dev/null @@ -1,145 +0,0 @@ -import StyledForm from "@/core/components/StyledForm"; -import { yupResolver } from "@hookform/resolvers/yup"; -import BeenhereIcon from "@mui/icons-material/Beenhere"; -import ExitToAppIcon from "@mui/icons-material/ExitToApp"; -import KeyboardDoubleArrowLeftIcon from "@mui/icons-material/KeyboardDoubleArrowLeft"; -import KeyboardDoubleArrowRightIcon from "@mui/icons-material/KeyboardDoubleArrowRight"; -import OtherHousesIcon from "@mui/icons-material/OtherHouses"; -import { Box, Button, DialogActions, DialogContent, Tab, Tabs } from "@mui/material"; -import { useState } from "react"; -import { useForm } from "react-hook-form"; -import { number, object, string } from "yup"; -import MachineInfo from "./MachineInfo"; - -function TabPanel(props) { - const { children, value, index } = props; - return ( - - ); -} - -const validationSchema = object({ - name: string().required("وارد کردن نام راهدارخانه الزامیست!"), - status: string().required("وارد کردن وضعیت الزامیست!"), - type: string().required("وارد کردن نوع الزامیست!"), - phone: string().required("وارد کردن تلفن راهدارخانه الزامیست!"), - team_num: string().required("وارد کردن تعداد اکیپ الزامیست!"), - staff_num: string().required("وارد کردن تعداد پرسنل الزامیست!"), - responsible_name: string().required("وارد کردن نام مسئول الزامیست!"), - responsible_mobile: string() - .required("وارد کردن تلفن مسئول الزامیست!") - .matches(/^09\d{9}$/, "شماره تلفن مسئول باید با ۰۹ شروع شده و ۱۱ رقم باشد!"), - successor_name: string().required("وارد کردن نام جانشین الزامیست!"), - successor_mobile: string() - .required("وارد کردن تلفن جانشین الزامیست!") - .matches(/^09\d{9}$/, "شماره تلفن جانشین باید با ۰۹ شروع شده و ۱۱ رقم باشد!"), - province_id: number().required("وارد کردن استان الزامیست!"), - city_id: number().required("وارد کردن شهرستان الزامیست!"), - machines_light: string().required("وارد کردن ماشین آلات سبک الزامیست!"), - machines_sheavy: string().required("وارد کردن ماشین آلات نیمه سنگین الزامیست!"), - machines_heavy: string().required("وارد کردن ماشین آلات سنگین الزامیست!"), -}); -const EditMachineContent = ({ setOpen, SubmitCreateTollHouse, defaultValues }) => { - const [tabState, setTabState] = useState(0); - const handleClose = () => { - setOpen(false); - }; - - const handleChangeTab = (event, newValue) => { - setTabState(newValue); - }; - const handleNext = async () => { - const fieldsToValidate = [ - "status", - "province_id", - "city_id", - "station_id", - ]; - const isValid = await trigger(fieldsToValidate); - if (isValid) { - setTabState(tabState + 1); - } - }; - const handlePrev = () => { - if (tabState === 0) { - handleClose(); - } else { - setTabState(tabState - 1); - } - }; - const { - control, - handleSubmit, - trigger, - formState: { isSubmitting }, - } = useForm({ - defaultValues, - resolver: yupResolver(validationSchema), - mode: "all", - }); - const onSubmitBase = async (data) => { - await SubmitCreateTollHouse(data); - }; - return ( - - - } label="اطلاعات راهدارخانه" /> - - - - - - - - - - - {tabState !== 3 && ( - - )} - {tabState === 3 && ( - - )} - - - ); -}; -export default EditMachineContent; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/ImageUpload.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/ImageUpload.jsx deleted file mode 100644 index 033a6f1..0000000 --- a/src/components/dashboard/machines/Form/CreateTollHouse/ImageUpload.jsx +++ /dev/null @@ -1,77 +0,0 @@ -import { FormControl, FormHelperText } from "@mui/material"; -import UploadSystem from "@/core/components/UploadSystem"; -import React, { useEffect, useState } from "react"; - -const ImageUpload = ({ name, value, onChange, error, title }) => { - const [beforeImg, setBeforeImg] = useState(value ? value : null); - const [beforeFileType, setBeforeFileType] = useState(value ? "image/" : null); - const [beforeFileName, setBeforeFileName] = useState(null); - const [showBeforeImage, setShowBeforeImage] = useState(!value); - - useEffect(() => { - if (value) { - setShowBeforeImage(false); - if (typeof value === "string") { - setBeforeImg(value); - setBeforeFileType("image/"); - } else if (value instanceof File) { - setBeforeImg(URL.createObjectURL(value)); - setBeforeFileType(value.type); - } - } - }, [value]); - - const handleFileChange = (event) => { - const uploadedFile = event.target?.files?.[0]; - if (uploadedFile) { - const fileType = event.target?.files?.[0].type; - const fileName = event.target?.files?.[0].name; - setBeforeImg(URL.createObjectURL(uploadedFile)); - setBeforeFileType(fileType); - setBeforeFileName(fileName); - onChange(uploadedFile); - setShowBeforeImage(false); - } - }; - - return ( - - - {title} - - - {error ? error.message : null} - - ); -}; -export default ImageUpload; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/LogesticController.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/LogesticController.jsx deleted file mode 100644 index 513abbf..0000000 --- a/src/components/dashboard/machines/Form/CreateTollHouse/LogesticController.jsx +++ /dev/null @@ -1,42 +0,0 @@ -import { Controller, useWatch } from "react-hook-form"; -import SelectBox from "@/core/components/SelectBox"; -import useProvinces from "@/lib/hooks/useProvince"; -import { Grid } from "@mui/material"; -import CityController from "./CityController"; - -const LogesticController = ({ control }) => { - const { provinces, errorProvinces, loadingProvinces } = useProvinces(); - const isProvince = useWatch({ control, name: "is_province" }); - return ( - - {!isProvince ? ( - - { - return ( - - ); - }} - /> - - ) : null} - - - - - ); -}; -export default LogesticController; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/MachineInfo.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/MachineInfo.jsx deleted file mode 100644 index 6fca8a4..0000000 --- a/src/components/dashboard/machines/Form/CreateTollHouse/MachineInfo.jsx +++ /dev/null @@ -1,311 +0,0 @@ -import { Grid, Stack, TextField } from "@mui/material"; -import { Controller } from "react-hook-form"; -import SelectBox from "@/core/components/SelectBox"; -import useProvince from "@/lib/hooks/useProvince"; -import PersianTextField from "@/core/components/PersianTextField"; -import CityController from "./CityController"; -import LogesticController from "./LogesticController"; - -const MachineInfo = ({ control }) => { - const { provinces, loadingProvinces, errorProvinces } = useProvince(); - return ( - - - - - ( - - )} - /> - - - ( - { - const inputValue = event.target.value; - if (isNaN(Number(inputValue))) { - return; - } - onChange(inputValue); - }} - /> - )} - /> - - - - - - - - - - { - return ( - - ); - }} - /> - - - { - return ( - - ); - }} - /> - - - - - - - ( - { - const inputValue = event.target.value; - if (isNaN(Number(inputValue))) { - return; - } - onChange(inputValue); - }} - /> - )} - /> - - - ( - { - const inputValue = event.target.value; - if (isNaN(Number(inputValue))) { - return; - } - onChange(inputValue); - }} - /> - )} - /> - - - - - - - ( - - )} - /> - - - ( - { - const inputValue = event.target.value; - if (isNaN(Number(inputValue))) { - return; - } - onChange(inputValue); - }} - /> - )} - /> - - - - - - - ( - - )} - /> - - - ( - { - const inputValue = event.target.value; - if (isNaN(Number(inputValue))) { - return; - } - onChange(inputValue); - }} - /> - )} - /> - - - - - ); -}; -export default MachineInfo; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/TollHouseLocation.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/TollHouseLocation.jsx deleted file mode 100644 index 98d36a7..0000000 --- a/src/components/dashboard/machines/Form/CreateTollHouse/TollHouseLocation.jsx +++ /dev/null @@ -1,20 +0,0 @@ -import MapInfoOneMarker from "@/core/components/MapInfoOneMarker"; -import { Stack } from "@mui/material"; -import { useWatch } from "react-hook-form"; - -const TollHouseLocation = ({ setValue, errors, control }) => { - const StartPoint = useWatch({ control, name: "start_point" }); - return ( - <> - - - - - ); -}; -export default TollHouseLocation; diff --git a/src/components/dashboard/machines/Form/CreateTollHouse/index.jsx b/src/components/dashboard/machines/Form/CreateTollHouse/index.jsx deleted file mode 100644 index 3649dcd..0000000 --- a/src/components/dashboard/machines/Form/CreateTollHouse/index.jsx +++ /dev/null @@ -1,154 +0,0 @@ -import { Button, Dialog, IconButton, useMediaQuery } from "@mui/material"; -import { useState } from "react"; -import CreateTollHouseContent from "./EditMachineContent"; -import { AddCircle } from "@mui/icons-material"; -import { useTheme } from "@emotion/react"; -import { CREATE_TOLL_HOUSE } from "@/core/utils/routes"; -import useRequest from "@/lib/hooks/useRequest"; -import CloseIcon from "@mui/icons-material/Close"; -import { useAuth } from "@/lib/contexts/auth"; -import { usePermissions } from "@/lib/hooks/usePermissions"; - -const CreateTollHouse = ({ mutate }) => { - const requestServer = useRequest({ notificationSuccess: true }); - const theme = useTheme(); - const isMobile = useMediaQuery(theme.breakpoints.down("sm")); - const [open, setOpen] = useState(false); - const { user } = useAuth(); - const { data: userPermissions } = usePermissions(); - const hasCreateProvincePermission = userPermissions.some((item) => ["add-tollhouse"].includes(item)); - const handleOpen = () => { - setOpen(true); - }; - const SubmitCreateTollHouse = async (result) => { - const fields = [ - "province_id", - "city_id", - "name", - "status", - "type", - "team_num", - "staff_num", - "phone", - "responsible_name", - "responsible_mobile", - "successor_name", - "successor_mobile", - "machines_light", - "machines_sheavy", - "machines_heavy", - "overview_files_1", - "overview_files_2", - "overview_files_3", - "overview_files_4", - "overview_files_5", - ]; - const formData = new FormData(); - fields.forEach((field) => { - if (result[field] !== undefined && result[field] !== null) { - formData.append(field, result[field]); - } - }); - formData.append("lat", result.start_point.lat); - formData.append("lng", result.start_point.lng); - formData.append("area[type]", "polygon"); - result.area.map((point, pointIndex) => { - formData.append(`area[coordinates][${pointIndex}][0]`, point.lon); - formData.append(`area[coordinates][${pointIndex}][1]`, point.lat); - }); - const repeat_first = result.area.length; - formData.append(`area[coordinates][${repeat_first}][0]`, result.area[0].lon); - formData.append(`area[coordinates][${repeat_first}][1]`, result.area[0].lat); - await requestServer(`${CREATE_TOLL_HOUSE}`, "post", { - data: formData, - }) - .then(() => { - mutate(); - setOpen(false); - }) - .catch(() => {}); - }; - const defaultValues = { - name: "", - is_province: !hasCreateProvincePermission, - province_id: !hasCreateProvincePermission ? user.province_id : null, - city_id: null, - status: "", - type: "", - phone: "", - team_num: "", - staff_num: "", - responsible_name: "", - responsible_mobile: "", - successor_name: "", - successor_mobile: "", - machines_light: "", - machines_sheavy: "", - machines_heavy: "", - overview_files_1: null, - overview_files_2: null, - overview_files_3: null, - overview_files_4: null, - overview_files_5: null, - start_point: "", - area: [ - { lat: "", lon: "" }, - { lat: "", lon: "" }, - { lat: "", lon: "" }, - { lat: "", lon: "" }, - ], - }; - return ( - <> - {isMobile ? ( - - - - ) : ( - - )} - setOpen(false)} - PaperProps={{ - sx: { - boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", - }, - }} - maxWidth={"md"} - scroll="paper" - > - setOpen(false)} - sx={(theme) => ({ - position: "absolute", - right: 8, - top: 8, - zIndex: 50, - color: theme.palette.grey[500], - })} - > - - - {open && ( - - )} - - - ); -}; -export default CreateTollHouse; diff --git a/src/components/dashboard/machines/Form/Edit/EditController.jsx b/src/components/dashboard/machines/Form/Edit/EditController.jsx deleted file mode 100644 index a5f9c7f..0000000 --- a/src/components/dashboard/machines/Form/Edit/EditController.jsx +++ /dev/null @@ -1,77 +0,0 @@ -import DialogLoading from "@/core/components/DialogLoading"; -import { GET_TOLL_HOUSE_DETAILS, UPDATE_TOLL_HOUSE_ITEM } from "@/core/utils/routes"; -import { usePermissions } from "@/lib/hooks/usePermissions"; -import useRequest from "@/lib/hooks/useRequest"; -import { useEffect, useState } from "react"; -import EditMachineContent from "../CreateTollHouse/EditMachineContent"; - -const EditController = ({ rowId, mutate, setOpenEditDialog }) => { - const { data: userPermissions } = usePermissions(); - const hasCreateProvincePermission = userPermissions.some((item) => ["update-machine"].includes(item)); - const requestServer = useRequest(); - const [MachineItemDetails, setMachineItemDetails] = useState(null); - const [machineItemDetailsLoading, setMachineItemDetailsLoading] = useState(false); - - useEffect(() => { - setMachineItemDetailsLoading(true); - requestServer(`${GET_TOLL_HOUSE_DETAILS}/${rowId}`, "get") - .then((response) => { - setMachineItemDetails(response.data.data); - setMachineItemDetailsLoading(false); - }) - .catch((e) => { - setMachineItemDetailsLoading(false); - }); - }, [rowId]); - - const defaultData = { - is_province: !hasCreateProvincePermission, - province_id: MachineItemDetails?.province_id || null, - city_id: MachineItemDetails?.city_id || null, - status: MachineItemDetails?.status || "", - station_id: MachineItemDetails?.station_id || "", - }; - const HandleSubmit = async (result) => { - const fields = [ - "status", - "province_id", - "city_id", - "station_id", - ]; - const formData = new FormData(); - fields.forEach((field) => { - if (result[field] !== undefined && result[field] !== null) { - formData.append(field, result[field]); - } - }); - for (let i = 1; i <= 5; i++) { - if (result[`overview_files_${i}`] !== defaultData[`overview_files_${i}`]) { - formData.append(`overview_files_${i}`, result[`overview_files_${i}`]); - } - } - - await requestServer(`${UPDATE_TOLL_HOUSE_ITEM}/${rowId}`, "post", { - data: formData, - notificationSuccess: true, - }) - .then(() => { - mutate(); - setOpenEditDialog(false); - }) - .catch(() => {}); - }; - return ( - <> - {machineItemDetailsLoading ? ( - - ) : ( - - )} - - ); -}; -export default EditController; diff --git a/src/components/dashboard/machines/MachinesList.jsx b/src/components/dashboard/machines/MachinesList.jsx index bcfb104..880f0cb 100644 --- a/src/components/dashboard/machines/MachinesList.jsx +++ b/src/components/dashboard/machines/MachinesList.jsx @@ -1,15 +1,9 @@ "use client"; -import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; import DataTableWithAuth from "@/core/components/DataTableWithAuth"; import { GET_MACHINES_LIST } from "@/core/utils/routes"; -import { useAuth } from "@/lib/contexts/auth"; -import useEdaratLists from "@/lib/hooks/useEdaratLists"; -import { usePermissions } from "@/lib/hooks/usePermissions"; -import useProvinces from "@/lib/hooks/useProvince"; import { Box, Typography } from "@mui/material"; -import { useEffect, useMemo, useState } from "react"; +import { useMemo } from "react"; import RowActions from "./RowActions"; -import Toolbar from "./Toolbar"; const statusOptions = [ { value: "", label: "همه وضعیت ها" }, @@ -23,47 +17,7 @@ const statusOptions = [ ]; const MachinesList = () => { - const { data: userPermissions } = usePermissions(); - const hasCountryPermission = userPermissions?.includes("show-tollhouse"); - const { user } = useAuth(); - const columns = useMemo(() => { - const provinceColumn = { - accessorKey: "province_id", - 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 ( - - ); - }, - Cell: ({ row }) => <>{row.original.province_name}, - }; return [ { accessorKey: "id", @@ -75,7 +29,7 @@ const MachinesList = () => { sortDescFirst: false, columnFilterModeOptions: ["equals", "contains"], grow: false, - size: 100, + size: 50, }, { @@ -85,7 +39,6 @@ const MachinesList = () => { enableSorting: false, datatype: "text", grow: false, - size: 50, columns: [ { accessorKey: "car_name", @@ -135,65 +88,6 @@ const MachinesList = () => { grow: false, size: 100, }, - ...(hasCountryPermission ? [provinceColumn] : []), - { - accessorKey: "city_id", - header: "شهرستان", // Office - id: "city_id", - enableColumnFilter: true, - datatype: "numeric", - filterMode: "equals", - dependencyId: hasCountryPermission ? "province_id" : null, - grow: false, - size: 120, - ColumnSelectComponent: (props) => { - const { edaratList, loadingEdaratList, errorEdaratList } = useEdaratLists( - hasCountryPermission ? props.dependencyFieldValue.value : user.province_id - ); - const [prevDependency, setPrevDependency] = useState( - hasCountryPermission ? props.dependencyFieldValue.value : user.province_id - ); - - const getColumnSelectOptions = useMemo(() => { - if (hasCountryPermission && props.dependencyFieldValue.value === "") { - return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }]; - } - if (loadingEdaratList) { - return [{ value: "loading", label: "در حال بارگذاری..." }]; - } - if (errorEdaratList) { - return [{ value: "error", label: "خطا در بارگذاری" }]; - } - return [ - { value: "", label: "کل شهر ها" }, - ...edaratList.map((edare) => ({ - value: edare.id, - label: edare.name_fa, - })), - ]; - }, [edaratList, loadingEdaratList, errorEdaratList]); - useEffect(() => { - if (hasCountryPermission) return; - if (prevDependency === props.dependencyFieldValue?.value) return; - props.handleChange({ ...props.filterParameters, value: "" }); - setPrevDependency(props.dependencyFieldValue?.value); - }, [props.dependencyFieldValue?.value, hasCountryPermission]); - return ( - - ); - }, - Cell: ({ row }) => <>{row.original.city_name}, - }, { accessorKey: "status", header: "وضعیت", @@ -214,7 +108,6 @@ const MachinesList = () => { return {status?.label || ""}; }, }, - ], }, ]; @@ -230,7 +123,6 @@ const MachinesList = () => { page_name={"machines"} table_name={"machinesList"} sorting={[{ id: "id", desc: true }]} - TableToolbar={Toolbar} enableRowActions positionActionsColumn={"first"} RowActions={RowActions} diff --git a/src/components/dashboard/machines/RowActions/Edit/Form/index.jsx b/src/components/dashboard/machines/RowActions/Edit/Form/index.jsx new file mode 100644 index 0000000..6cfcd9d --- /dev/null +++ b/src/components/dashboard/machines/RowActions/Edit/Form/index.jsx @@ -0,0 +1,281 @@ +import StyledForm from "@/core/components/StyledForm"; +import { + GET_CITIES_LIST, + GET_PROVINCES_LIST, + GET_STATIONS_LIST, + UPDATE_MACHINE_STATUS_AND_LOCATION, +} from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { Beenhere, ExitToApp } from "@mui/icons-material"; +import { + Button, + CircularProgress, + DialogActions, + DialogContent, + DialogTitle, + FormControl, + InputLabel, + MenuItem, + Select, + Stack, +} from "@mui/material"; +import { DialogHeader } from "next/dist/client/components/react-dev-overlay/internal/components/Dialog"; +import { useEffect, useState } from "react"; +import { Controller, useForm, useWatch } from "react-hook-form"; +import { number, object } from "yup"; + +const statusOptions = [ + { value: 1, label: "آماده" }, + { value: 2, label: "رزرو" }, + { value: 3, label: "در ماموریت" }, + { value: 4, label: "خارج از رده" }, + { value: 5, label: "در تعمیر" }, + { value: 6, label: "فروخته شده" }, + { value: 7, label: "نیاز به تعمیر" }, +]; + +const validationSchema = object({ + status: number().required("انتخاب وضعیت الزامی است"), + province_id: number().required("انتخاب استان الزامی است"), + city_id: number().required("انتخاب شهر الزامی است"), + station_id: number().required("انتخاب راهداری الزامی است"), +}); + +const EditFormContent = ({ row, rowId, mutate, setOpen }) => { + const requestServer = useRequest(); + + const [provinces, setProvinces] = useState([]); + const [cities, setCities] = useState([]); + const [stations, setStations] = useState([]); + + const [loadingProvinces, setLoadingProvinces] = useState(false); + const [loadingCities, setLoadingCities] = useState(false); + const [loadingStations, setLoadingStations] = useState(false); + + const { + control, + handleSubmit, + setValue, + formState: { isSubmitting }, + } = useForm({ + defaultValues: { + status: row.original.status, + province_id: row.original.province_id, + city_id: row.original.city_id, + station_id: row.original.station_id, + }, + resolver: yupResolver(validationSchema), + mode: "all", + }); + + const provinceId = useWatch({ + control, + name: "province_id", + }); + + const cityId = useWatch({ + control, + name: "city_id", + }); + + const loadProvinces = async () => { + try { + setLoadingProvinces(true); + const response = await requestServer(GET_PROVINCES_LIST, "get"); + setProvinces(response.data?.data || []); + } finally { + setLoadingProvinces(false); + } + }; + + const loadCities = async (provinceId) => { + if (!provinceId) return; + + try { + setLoadingCities(true); + const response = await requestServer(`${GET_CITIES_LIST}?province_id=${provinceId}`, "get"); + setCities(response.data?.data || []); + } finally { + setLoadingCities(false); + } + }; + + const loadStations = async (cityId) => { + if (!cityId) return; + + try { + setLoadingStations(true); + const response = await requestServer(`${GET_STATIONS_LIST}/search_by_city?city_id=${cityId}`, "get"); + setStations(response.data?.data || []); + } finally { + setLoadingStations(false); + } + }; + + useEffect(() => { + loadProvinces(); + }, []); + + /** + * Initial edit mode loading + */ + useEffect(() => { + if (row.original.province_id) { + loadCities(row.original.province_id); + } + + if (row.original.city_id) { + loadStations(row.original.city_id); + } + }, []); + + useEffect(() => { + if (!provinceId) return; + + loadCities(provinceId); + + if (provinceId !== row.original.province_id) { + setValue("city_id", ""); + setValue("station_id", ""); + setStations([]); + } + }, [provinceId]); + + useEffect(() => { + if (!cityId) return; + + loadStations(cityId); + + if (cityId !== row.original.city_id) { + setValue("station_id", ""); + } + }, [cityId]); + + const onSubmit = async (data) => { + const formData = new FormData(); + + formData.append("status", String(data.status)); + formData.append("province_id", String(data.province_id)); + formData.append("city_id", String(data.city_id)); + formData.append("station_id", String(data.station_id)); + + try { + await requestServer(`${UPDATE_MACHINE_STATUS_AND_LOCATION}/${rowId}`, "post", { + data: formData, + }); + + mutate(); + setOpen(false); + } catch (error) {} + }; + + return ( + <> + + ویرایش ماشین + + + + + + ( + + استان + + + + )} + /> + + ( + + شهر + + + + )} + /> + + ( + + راهداری + + + + )} + /> + ( + + وضعیت + + + + )} + /> + + {(loadingCities || loadingStations) && ( + + + + )} + + + + + + + + + + + ); +}; + +export default EditFormContent; diff --git a/src/components/dashboard/machines/Form/Edit/index.jsx b/src/components/dashboard/machines/RowActions/Edit/index.jsx similarity index 54% rename from src/components/dashboard/machines/Form/Edit/index.jsx rename to src/components/dashboard/machines/RowActions/Edit/index.jsx index 53be78c..f3cec95 100644 --- a/src/components/dashboard/machines/Form/Edit/index.jsx +++ b/src/components/dashboard/machines/RowActions/Edit/index.jsx @@ -1,15 +1,15 @@ +import { SwapHoriz } from "@mui/icons-material"; +import CloseIcon from "@mui/icons-material/Close"; import { Dialog, IconButton, Tooltip } from "@mui/material"; import { useState } from "react"; -import BorderColorIcon from "@mui/icons-material/BorderColor"; -import EditController from "./EditController"; -import CloseIcon from "@mui/icons-material/Close"; +import EditFormContent from "./Form"; -const EditForm = ({ row, mutate, rowId }) => { +const Edit = ({ row, mutate, rowId }) => { const [openEditDialog, setOpenEditDialog] = useState(false); return ( <> - + { setOpenEditDialog(true); }} > - + - + setOpenEditDialog(false)} @@ -44,16 +35,10 @@ const EditForm = ({ row, mutate, rowId }) => { {openEditDialog && ( - + )} ); }; -export default EditForm; +export default Edit; diff --git a/src/components/dashboard/machines/RowActions/ImageForm/ImageFormContent.jsx b/src/components/dashboard/machines/RowActions/ImageForm/ImageFormContent.jsx deleted file mode 100644 index c8f22d0..0000000 --- a/src/components/dashboard/machines/RowActions/ImageForm/ImageFormContent.jsx +++ /dev/null @@ -1,45 +0,0 @@ -import { Box, Stack, Typography, useTheme } from "@mui/material"; -import Image from "next/image"; - -const ImageFormContent = ({ image, title }) => { - const theme = useTheme(); - return ( - - - {title} - - - Image - - - ); -}; -export default ImageFormContent; diff --git a/src/components/dashboard/machines/RowActions/ImageForm/ImagesContent.jsx b/src/components/dashboard/machines/RowActions/ImageForm/ImagesContent.jsx deleted file mode 100644 index 6e22c9a..0000000 --- a/src/components/dashboard/machines/RowActions/ImageForm/ImagesContent.jsx +++ /dev/null @@ -1,39 +0,0 @@ -import { useEffect, useState } from "react"; -import ImageFormContent from "./ImageFormContent"; -import DialogLoading from "@/core/components/DialogLoading"; -import useRequest from "@/lib/hooks/useRequest"; -import { GET_TOLL_HOUSE_IMAGES } from "@/core/utils/routes"; -import { Typography } from "@mui/material"; -const titles = ["نمای کلی از راهداری", "آشیانه ماشین آلات", "انباری شن و ماسه", "محیط کاری", "سایر تصاویر"]; - -const ImagesContent = ({ rowId }) => { - const requestServer = useRequest(); - const [tollHouseImages, setTollHouseImages] = useState(null); - const [tollHouseImagesLoading, setTollHouseImagesLoading] = useState(false); - useEffect(() => { - setTollHouseImagesLoading(true); - requestServer(`${GET_TOLL_HOUSE_IMAGES}/${rowId}`, "get") - .then((response) => { - setTollHouseImages(response.data.data); - setTollHouseImagesLoading(false); - }) - .catch((e) => { - setTollHouseImagesLoading(false); - }); - }, [rowId]); - - return ( - <> - {tollHouseImagesLoading ? ( - - ) : tollHouseImages ? ( - tollHouseImages.map((image, index) => { - return ; - }) - ) : ( - تصویری در سامانه یافت نشد - )} - - ); -}; -export default ImagesContent; diff --git a/src/components/dashboard/machines/RowActions/ImageForm/index.jsx b/src/components/dashboard/machines/RowActions/ImageForm/index.jsx deleted file mode 100644 index 6ac8d25..0000000 --- a/src/components/dashboard/machines/RowActions/ImageForm/index.jsx +++ /dev/null @@ -1,43 +0,0 @@ -import PhotoLibraryIcon from "@mui/icons-material/PhotoLibrary"; -import { Button, Dialog, DialogActions, DialogContent, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useEffect, useState } from "react"; -import ImagesContent from "./ImagesContent"; -import useRequest from "@/lib/hooks/useRequest"; -import { GET_TOLL_HOUSE_IMAGES } from "@/core/utils/routes"; -import DialogLoading from "@/core/components/DialogLoading"; - -const ImageDialog = ({ rowId }) => { - const [openImageDialog, setOpenImageDialog] = useState(false); - - return ( - <> - - setOpenImageDialog(true)}> - - - - setOpenImageDialog(false)} - PaperProps={{ - sx: { - boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", - }, - }} - maxWidth={"sm"} - scroll="paper" - > - تصاویر - {openImageDialog && } - - - - - - ); -}; - -export default ImageDialog; diff --git a/src/components/dashboard/machines/RowActions/LocationForm/LocationFormContent.jsx b/src/components/dashboard/machines/RowActions/LocationForm/LocationFormContent.jsx deleted file mode 100644 index 14b3db3..0000000 --- a/src/components/dashboard/machines/RowActions/LocationForm/LocationFormContent.jsx +++ /dev/null @@ -1,35 +0,0 @@ -"use client"; -import { Box, Button, DialogActions, DialogContent, Stack } from "@mui/material"; -import React from "react"; -import dynamic from "next/dynamic"; -import MapLoading from "@/core/components/MapLayer/Loading"; -import ShowLocationMarker from "@/core/components/ShowLocationMarker"; -const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { - loading: () => , - ssr: false, -}); - -const LocationFormContent = ({ setOpenLocationDialog, start_lat, start_lng, end_lat, end_lng }) => { - return ( - <> - - - - - - - - - - - - ); -}; -export default LocationFormContent; diff --git a/src/components/dashboard/machines/RowActions/LocationForm/index.jsx b/src/components/dashboard/machines/RowActions/LocationForm/index.jsx deleted file mode 100644 index f578ca8..0000000 --- a/src/components/dashboard/machines/RowActions/LocationForm/index.jsx +++ /dev/null @@ -1,38 +0,0 @@ -import React, { useState } from "react"; -import { Tooltip, IconButton, Dialog, DialogTitle } from "@mui/material"; -import ExploreIcon from "@mui/icons-material/Explore"; -import LocationFormContent from "./LocationFormContent"; -const LocationForm = ({ start_lat, start_lng, end_lat, end_lng }) => { - const [openLocationDialog, setOpenLocationDialog] = useState(false); - - return ( - <> - - setOpenLocationDialog(true)}> - - - - setOpenLocationDialog(false)} - PaperProps={{ - sx: { - boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", - }, - }} - dir="rtl" - maxWidth={"md"} - > - موقعیت - - - - ); -}; -export default LocationForm; diff --git a/src/components/dashboard/machines/RowActions/index.jsx b/src/components/dashboard/machines/RowActions/index.jsx index 8feb437..526fe10 100644 --- a/src/components/dashboard/machines/RowActions/index.jsx +++ b/src/components/dashboard/machines/RowActions/index.jsx @@ -1,15 +1,13 @@ import { usePermissions } from "@/lib/hooks/usePermissions"; import { Box } from "@mui/material"; -import EditForm from "../Form/Edit"; +import Edit from "./Edit"; const RowActions = ({ row, mutate }) => { const { data: userPermissions } = usePermissions(); - const hasEditPermission = userPermissions.some((item) => - ["update-machine"].includes(item) - ); + const hasEditPermission = userPermissions.some((item) => ["update-machine"].includes(item)); return ( - {hasEditPermission && } + {hasEditPermission && } ); }; diff --git a/src/components/dashboard/machines/Toolbar.jsx b/src/components/dashboard/machines/Toolbar.jsx deleted file mode 100644 index ae86ec0..0000000 --- a/src/components/dashboard/machines/Toolbar.jsx +++ /dev/null @@ -1,6 +0,0 @@ -import { Box } from "@mui/material"; - -const Toolbar = ({ table, filterData, mutate }) => { - return machines toolbar; -}; -export default Toolbar; diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index 4de64fe..c970699 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -278,7 +278,10 @@ export const CONFIRM_VERIFY_LICENSE_FORM = api + "/api/v3/harim/technical_deputy export const GET_HISTORY_LIST = api + "/api/v3/harim/detail/histories"; export const GET_REQUEST_INQUIRY_PRIVACY = api + "/api/v3/harim/technical_deputy"; - // Machines -export const GET_MACHINES_LIST = api + "/api/v3/cmms_machines" -export const UPDATE_CMMS_MACHINES = api + "/api/v3/cmms_machines" \ No newline at end of file +export const GET_MACHINES_LIST = api + "/api/v3/cmms_machines"; +export const UPDATE_CMMS_MACHINES = api + "/api/v3/cmms_machines"; +export const GET_PROVINCES_LIST = api + "/api/v3/provinces/list"; +export const GET_CITIES_LIST = api + "/api/v3/cities/list"; +export const GET_STATIONS_LIST = api + "/api/v3/road_maintenance_station"; +export const UPDATE_MACHINE_STATUS_AND_LOCATION = api + "/api/v3/cmms_machines"; From 01bb171ebbe6e54070c1ea0b88944eaf60ef2c80 Mon Sep 17 00:00:00 2001 From: baslani Date: Sat, 13 Jun 2026 11:01:50 +0330 Subject: [PATCH 15/35] build & format --- jsconfig.json | 38 +++++++++---------- .../dashboard/machines/page.jsx | 6 +-- src/core/utils/pageMenuDev.js | 2 +- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/jsconfig.json b/jsconfig.json index c136578..b51472a 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,27 +1,27 @@ // javascript for production -// { -// "compilerOptions": { -// "paths": { -// "@/*": ["./src/*"], -// "^/*": ["./public/*"] -// } -// } -// } - -// typescript for local development { "compilerOptions": { - "jsx": "react-jsx", - "noUnusedLocals": true, - "noImplicitAny": false, - "checkJs": true, - "allowJs": true, - "strict": true, - "baseUrl": ".", "paths": { "@/*": ["./src/*"], "^/*": ["./public/*"] } - }, - "exclude": ["node_modules"] + } } + +// typescript for local development +// { +// "compilerOptions": { +// "jsx": "react-jsx", +// "noUnusedLocals": true, +// "noImplicitAny": false, +// "checkJs": true, +// "allowJs": true, +// "strict": true, +// "baseUrl": ".", +// "paths": { +// "@/*": ["./src/*"], +// "^/*": ["./public/*"] +// } +// }, +// "exclude": ["node_modules"] +// } diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx b/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx index 53e7040..35c27ad 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx @@ -1,5 +1,5 @@ import WithPermission from "@/core/middlewares/withPermission"; -import MachinesPage from "@/components/dashboard/machines" +import MachinesPage from "@/components/dashboard/machines"; export const metadata = { title: "کارتابل ماشین‌ها", @@ -7,9 +7,7 @@ export const metadata = { const Page = () => { return ( <> - + diff --git a/src/core/utils/pageMenuDev.js b/src/core/utils/pageMenuDev.js index 08aaf62..4bc0665 100644 --- a/src/core/utils/pageMenuDev.js +++ b/src/core/utils/pageMenuDev.js @@ -682,7 +682,7 @@ export const pageMenuDev = [ icon: , permissions: ["manage-damage"], }, - { + { id: "machines", label: "ماشین‌ها", type: "page", From 05dc5505cd173da61cf8944a36194cdbf8f3fe2d Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sat, 13 Jun 2026 11:16:48 +0330 Subject: [PATCH 16/35] exit station time --- .../Actions/CreateViolation/Form/index.jsx | 2 +- .../CreateWithoutProcess/Form/index.jsx | 10 +- .../Actions/EditViolation/EditController.jsx | 6 +- .../EditViolation/MissionDates/index.jsx | 1 - .../violations/ViolationsList.jsx | 213 +++++++++++++----- 5 files changed, 160 insertions(+), 72 deletions(-) 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 ad34476..5d94b1f 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_time: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`, + exit_station: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`, }, }) .then((response) => { diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx index 76230ad..5460b5a 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx @@ -1,7 +1,6 @@ -import { AccessTime, Engineering, InsertDriveFile, Person, Verified } from "@mui/icons-material"; +import { Engineering, InsertDriveFile, Person, Verified } from "@mui/icons-material"; import { Box, Tab, Tabs } from "@mui/material"; import { useReducer, useState } from "react"; -import GetDateTime from "./GetDateTime"; import GetItemInfo from "./GetItemInfo"; import MachineAndDriver from "./MachineAndDriver"; import Rahdaran from "./Rahdaran"; @@ -42,7 +41,6 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState((t) => t - 1); } }; - return ( <> { setTabState={setTabState} /> - + { @@ -83,7 +81,7 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState={setTabState} /> - + { @@ -93,7 +91,7 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState={setTabState} /> - + diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx index ab16760..6b3bfa3 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx @@ -7,17 +7,17 @@ import moment from "jalali-moment"; const EditController = ({ rowId, mutate, setOpen, row }) => { const requestServer = useRequest({ notificationSuccess: true }); - const [endDate] = row?.original?.enter_time?.split(" ") || [null]; + const [endDate] = row?.original?.enter_station?.split(" ") || [null]; const defaultData = { end_date: endDate, - end_time: row?.original?.enter_time ? new Date(row.original.enter_time) : null, + end_time: row?.original?.enter_station ? new Date(row.original.enter_station) : null, }; const handleSubmit = async (result) => { const payload = {}; if (result.end_date && result.end_time) { - payload.enter_time = `${result.end_date} ${moment(result.end_time).format("HH:mm")}`; + payload.enter_station = `${result.end_date} ${moment(result.end_time).format("HH:mm")}`; } await requestServer(`${EDIT_VIOLATION}/${rowId}`, "post", { diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx index ba07a09..8b0eaa5 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx @@ -41,7 +41,6 @@ const MissionDates = ({ control }) => { name="end_time" error={error} value={field.value} - views={["hours"]} placeholder={"زمان پایان ماموریت را وارد کنید"} label={"زمان پایان ماموریت"} setFieldValue={(name, value) => field.onChange(value || null)} diff --git a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx index c78d6cc..11ccd46 100644 --- a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx +++ b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx @@ -7,75 +7,166 @@ import { useMemo } from "react"; import RowActions from "./RowActions"; import Toolbar from "./Toolbar"; import { violationsCategoryStatus } from "@/core/utils/violationsCategoryStatus"; +import useProvinces from "@/lib/hooks/useProvince"; +import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; +import useCities from "@/lib/hooks/useCities"; const ViolationsList = () => { const columns = useMemo( - () => [ - { - accessorKey: "id", - header: "کد یکتا", - id: "id", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - }, - { - accessorKey: "status", - header: "وضعیت", - id: "status", + () => { + const dynamicColumns = { + header: "استان", + id: "province_id", enableColumnFilter: true, datatype: "numeric", filterMode: "equals", - sortDescFirst: true, grow: false, - columnSelectOption: () => { - return violationsCategoryStatus.map((category) => ({ - value: category.id, - label: category.name_fa, - })); + 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 ( + + ); }, - Cell: ({ row }) => (row.original.type === 1 ? "خروج بدون مجوز" : "عدم تحرک"), - }, - { - accessorKey: "machine_code", - header: "کد خودرو", - id: "machine_code", - datatype: "text", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - }, - { - accessorKey: "machine", - header: "نام خودرو", - id: "machine", - datatype: "text", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - Cell: ({ row }) => row.original.machine?.car_name || "-", - }, - { - accessorKey: "mission_id", - header: "کد ماموریت", - id: "mission_id", - enableColumnFilter: false, - datatype: "numeric", - filterMode: "equals", - grow: false, - Cell: ({ row }) => row.original.mission_id || "-", - }, - { - accessorKey: "request_date", - header: "تاریخ تخلف", - id: "request_date", - enableColumnFilter: true, - datatype: "date", - filterMode: "between", - grow: false, - Cell: ({ row }) => moment(row.original.request_date).locale("fa").format("YYYY/MM/DD"), - }, - ], + Cell: ({ renderedCellValue, row }) => { + return <>{row.original.province_name}; + }, + }; + return [ + { + accessorKey: "id", + header: "کد یکتا", + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + }, + { + accessorKey: "status", + header: "وضعیت", + id: "status", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + sortDescFirst: true, + grow: false, + columnSelectOption: () => { + return violationsCategoryStatus.map((category) => ({ + value: category.id, + label: category.name_fa, + })); + }, + Cell: ({ row }) => (row.original.type === 1 ? "خروج بدون مجوز" : "عدم تحرک"), + }, + { + accessorKey: "machine_code", + header: "کد خودرو", + id: "machine_code", + datatype: "text", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + }, + ...[dynamicColumns], + { + header: "شهر", + id: "city_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + dependencyId: "province_id", + grow: false, + 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 ( + + ); + }, + Cell: ({ row }) => <>{row.original.city_name}, + }, + { + accessorKey: "machine", + header: "نام خودرو", + id: "machine", + datatype: "text", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + Cell: ({ row }) => row.original.machine?.car_name || "-", + }, + { + accessorKey: "mission_id", + header: "کد ماموریت", + id: "mission_id", + enableColumnFilter: false, + datatype: "numeric", + filterMode: "equals", + grow: false, + Cell: ({ row }) => row.original.mission_id || "-", + }, + { + accessorKey: "request_date", + header: "تاریخ تخلف", + id: "request_date", + enableColumnFilter: true, + datatype: "date", + filterMode: "between", + grow: false, + Cell: ({ row }) => moment(row.original.request_date).locale("fa").format("YYYY/MM/DD"), + }, + ]; + }, [] ); From dec752bc171b2b6fc605cec85d6aab03d72a857e Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sat, 13 Jun 2026 11:48:47 +0330 Subject: [PATCH 17/35] build and format --- .../dashboard/machines/loading.jsx | 14 +- .../dashboard/machines/page.jsx | 34 +- .../reports/missionsReports/page.js | 36 +- .../reports/violationsReports/page.js | 36 +- .../dashboard/machines/MachinesList.jsx | 268 ++++----- .../RowActions/DeleteDialog/DeleteContent.jsx | 78 +-- .../RowActions/DeleteDialog/index.jsx | 68 +-- .../machines/RowActions/Edit/Form/index.jsx | 562 +++++++++--------- .../machines/RowActions/Edit/index.jsx | 88 +-- .../dashboard/machines/RowActions/index.jsx | 28 +- .../machines/ShowProjectArea/ShowBound.jsx | 58 +- .../machines/ShowProjectArea/index.jsx | 130 ++-- src/components/dashboard/machines/index.jsx | 28 +- .../Create/Form/Area/Routing/AlarmText.jsx | 56 +- .../Create/Form/Area/Routing/DataBox.jsx | 106 ++-- .../Create/Form/Area/Routing/ShowRoute.jsx | 92 +-- .../Create/Form/Area/Routing/index.jsx | 438 +++++++------- .../operator/RowActions/RouteDetail/index.jsx | 114 ++-- .../taradodReports/ExcelPrint/index.jsx | 154 ++--- .../taradodReports/MissionsReportLists.jsx | 276 ++++----- .../Search/FromDateController.jsx | 54 +- .../Search/SearchReportField.jsx | 88 +-- .../taradodReports/Search/SelectProvince.jsx | 90 +-- .../Search/ToDateController.jsx | 60 +- .../reports/taradodReports/Search/index.jsx | 26 +- .../reports/taradodReports/Toolbar.jsx | 22 +- .../reports/taradodReports/index.jsx | 284 ++++----- .../violationsReports/ExcelPrint/index.jsx | 154 ++--- .../Search/FromDateController.jsx | 54 +- .../Search/SearchReportField.jsx | 88 +-- .../Search/SelectProvince.jsx | 90 +-- .../Search/ToDateController.jsx | 60 +- .../violationsReports/Search/index.jsx | 26 +- .../reports/violationsReports/Toolbar.jsx | 22 +- .../ViolationsReportsList.jsx | 196 +++--- .../reports/violationsReports/index.jsx | 282 ++++----- .../RowActions/RouteDetail/ShowRoute.jsx | 92 +-- .../RowActions/RouteDetail/index.jsx | 114 ++-- .../Form/Area/Routing/AlarmText.jsx | 56 +- .../Form/Area/Routing/DataBox.jsx | 106 ++-- .../Form/Area/Routing/ShowRoute.jsx | 92 +-- .../Form/Area/Routing/index.jsx | 438 +++++++------- .../dashboard/roadPatrols/reports/index.jsx | 4 +- 43 files changed, 2581 insertions(+), 2581 deletions(-) diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/loading.jsx b/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/loading.jsx index 4535a8d..c3935ed 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/loading.jsx +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/loading.jsx @@ -1,7 +1,7 @@ -"use client"; -import PageLoading from "@/core/components/PageLoading"; - -const Loading = () => { - return ; -}; -export default Loading; +"use client"; +import PageLoading from "@/core/components/PageLoading"; + +const Loading = () => { + return ; +}; +export default Loading; diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx b/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx index 35c27ad..ad5b6c2 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/machines/page.jsx @@ -1,17 +1,17 @@ -import WithPermission from "@/core/middlewares/withPermission"; -import MachinesPage from "@/components/dashboard/machines"; - -export const metadata = { - title: "کارتابل ماشین‌ها", -}; -const Page = () => { - return ( - <> - - - - - ); -}; - -export default Page; +import WithPermission from "@/core/middlewares/withPermission"; +import MachinesPage from "@/components/dashboard/machines"; + +export const metadata = { + title: "کارتابل ماشین‌ها", +}; +const Page = () => { + return ( + <> + + + + + ); +}; + +export default Page; diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js index 0fae9c1..f60b32b 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js @@ -1,18 +1,18 @@ -import WithPermission from "@/core/middlewares/withPermission"; -import MissionsReportPage from "@/components/dashboard/roadMissions/reports/taradodReports"; -export const metadata = { - title: "کارتابل گزارش ترددها", -}; -const Page = () => { - return ( - - - - ); -}; - -export default Page; +import WithPermission from "@/core/middlewares/withPermission"; +import MissionsReportPage from "@/components/dashboard/roadMissions/reports/taradodReports"; +export const metadata = { + title: "کارتابل گزارش ترددها", +}; +const Page = () => { + return ( + + + + ); +}; + +export default Page; diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js index 6aa2483..66bc585 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js @@ -1,18 +1,18 @@ -import ViolationsReportsPage from "@/components/dashboard/roadMissions/reports/violationsReports"; -import WithPermission from "@/core/middlewares/withPermission"; - -export const metadata = { - title: "کارتابل گزارش تخلفات", -}; - -export default function Page() { - return ( - - - - ); -} +import ViolationsReportsPage from "@/components/dashboard/roadMissions/reports/violationsReports"; +import WithPermission from "@/core/middlewares/withPermission"; + +export const metadata = { + title: "کارتابل گزارش تخلفات", +}; + +export default function Page() { + return ( + + + + ); +} diff --git a/src/components/dashboard/machines/MachinesList.jsx b/src/components/dashboard/machines/MachinesList.jsx index 880f0cb..ce787e0 100644 --- a/src/components/dashboard/machines/MachinesList.jsx +++ b/src/components/dashboard/machines/MachinesList.jsx @@ -1,134 +1,134 @@ -"use client"; -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import { GET_MACHINES_LIST } from "@/core/utils/routes"; -import { Box, Typography } from "@mui/material"; -import { useMemo } from "react"; -import RowActions from "./RowActions"; - -const statusOptions = [ - { value: "", label: "همه وضعیت ها" }, - { value: 1, label: "آماده" }, - { value: 2, label: "رزرو" }, - { value: 3, label: "در ماموریت" }, - { value: 4, label: "خارج از رده" }, - { value: 5, label: "در تعمیر" }, - { value: 6, label: "فروخته شده" }, - { value: 7, label: "نیاز به تعمیر" }, -]; - -const MachinesList = () => { - const columns = useMemo(() => { - return [ - { - accessorKey: "id", - header: "کد یکتا", // Unique Code - id: "id", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - sortDescFirst: false, - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 50, - }, - - { - header: "اطلاعات ماشین‌ها", - id: "machines_info", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - columns: [ - { - accessorKey: "car_name", - header: "نام ماشین", - id: "car_name", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - sortDescFirst: false, - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "car_type", - header: "نوع ماشین", - id: "car_type", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - sortDescFirst: false, - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "machine_code", - header: "کد ماشین", - id: "machine_code", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - sortDescFirst: false, - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "plak_number", - header: "پلاک", - id: "plak_number", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - sortDescFirst: false, - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "status", - header: "وضعیت", - id: "status", - enableColumnFilter: true, - datatype: "numeric", - filterMode: "equals", - grow: false, - size: 100, - columnSelectOption: () => { - return statusOptions.map((status) => ({ - value: status.value, - label: status.label, - })); - }, - Cell: ({ row }) => { - const status = statusOptions.find((option) => option.value == row.original.status); - return {status?.label || ""}; - }, - }, - ], - }, - ]; - }, []); - - return ( - <> - - - - - ); -}; -export default MachinesList; +"use client"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { GET_MACHINES_LIST } from "@/core/utils/routes"; +import { Box, Typography } from "@mui/material"; +import { useMemo } from "react"; +import RowActions from "./RowActions"; + +const statusOptions = [ + { value: "", label: "همه وضعیت ها" }, + { value: 1, label: "آماده" }, + { value: 2, label: "رزرو" }, + { value: 3, label: "در ماموریت" }, + { value: 4, label: "خارج از رده" }, + { value: 5, label: "در تعمیر" }, + { value: 6, label: "فروخته شده" }, + { value: 7, label: "نیاز به تعمیر" }, +]; + +const MachinesList = () => { + const columns = useMemo(() => { + return [ + { + accessorKey: "id", + header: "کد یکتا", // Unique Code + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 50, + }, + + { + header: "اطلاعات ماشین‌ها", + id: "machines_info", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + columns: [ + { + accessorKey: "car_name", + header: "نام ماشین", + id: "car_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "car_type", + header: "نوع ماشین", + id: "car_type", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "machine_code", + header: "کد ماشین", + id: "machine_code", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "plak_number", + header: "پلاک", + id: "plak_number", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "status", + header: "وضعیت", + id: "status", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + grow: false, + size: 100, + columnSelectOption: () => { + return statusOptions.map((status) => ({ + value: status.value, + label: status.label, + })); + }, + Cell: ({ row }) => { + const status = statusOptions.find((option) => option.value == row.original.status); + return {status?.label || ""}; + }, + }, + ], + }, + ]; + }, []); + + return ( + <> + + + + + ); +}; +export default MachinesList; diff --git a/src/components/dashboard/machines/RowActions/DeleteDialog/DeleteContent.jsx b/src/components/dashboard/machines/RowActions/DeleteDialog/DeleteContent.jsx index 3f3095a..bf0a3c5 100644 --- a/src/components/dashboard/machines/RowActions/DeleteDialog/DeleteContent.jsx +++ b/src/components/dashboard/machines/RowActions/DeleteDialog/DeleteContent.jsx @@ -1,39 +1,39 @@ -import { Button, DialogActions, DialogContent, Stack, Typography } from "@mui/material"; -import React, { useState } from "react"; -import useRequest from "@/lib/hooks/useRequest"; -import { DELETE_TOLL_HOUSE_ITEM } from "@/core/utils/routes"; - -const DeleteContent = ({ rowId, mutate, setOpenDeleteDialog }) => { - const [submitting, setSubmitting] = useState(false); - const requestServer = useRequest({ notificationSuccess: true }); - const handleClick = () => { - setSubmitting(true); - requestServer(`${DELETE_TOLL_HOUSE_ITEM}/${rowId}`, "delete") - .then(() => { - mutate(); - setOpenDeleteDialog(false); - setSubmitting(false); - }) - .catch(() => { - setSubmitting(false); - }); - }; - return ( - <> - - - آیا از حذف راهدارخانه اطمینان دارید؟ - - - - - - - - ); -}; -export default DeleteContent; +import { Button, DialogActions, DialogContent, Stack, Typography } from "@mui/material"; +import React, { useState } from "react"; +import useRequest from "@/lib/hooks/useRequest"; +import { DELETE_TOLL_HOUSE_ITEM } from "@/core/utils/routes"; + +const DeleteContent = ({ rowId, mutate, setOpenDeleteDialog }) => { + const [submitting, setSubmitting] = useState(false); + const requestServer = useRequest({ notificationSuccess: true }); + const handleClick = () => { + setSubmitting(true); + requestServer(`${DELETE_TOLL_HOUSE_ITEM}/${rowId}`, "delete") + .then(() => { + mutate(); + setOpenDeleteDialog(false); + setSubmitting(false); + }) + .catch(() => { + setSubmitting(false); + }); + }; + return ( + <> + + + آیا از حذف راهدارخانه اطمینان دارید؟ + + + + + + + + ); +}; +export default DeleteContent; diff --git a/src/components/dashboard/machines/RowActions/DeleteDialog/index.jsx b/src/components/dashboard/machines/RowActions/DeleteDialog/index.jsx index 54278bd..37eefdf 100644 --- a/src/components/dashboard/machines/RowActions/DeleteDialog/index.jsx +++ b/src/components/dashboard/machines/RowActions/DeleteDialog/index.jsx @@ -1,34 +1,34 @@ -import DeleteIcon from "@mui/icons-material/Delete"; -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useState } from "react"; -import DeleteContent from "./DeleteContent"; -const DeleteDialog = ({ rowId, mutate }) => { - const [openDeleteDialog, setOpenDeleteDialog] = useState(false); - - return ( - <> - - setOpenDeleteDialog(true)}> - - - - setOpenDeleteDialog(false)} - PaperProps={{ - sx: { - boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", - }, - }} - dir="rtl" - maxWidth={"md"} - > - حذف راهدارخانه - {openDeleteDialog && ( - - )} - - - ); -}; -export default DeleteDialog; +import DeleteIcon from "@mui/icons-material/Delete"; +import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import DeleteContent from "./DeleteContent"; +const DeleteDialog = ({ rowId, mutate }) => { + const [openDeleteDialog, setOpenDeleteDialog] = useState(false); + + return ( + <> + + setOpenDeleteDialog(true)}> + + + + setOpenDeleteDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"md"} + > + حذف راهدارخانه + {openDeleteDialog && ( + + )} + + + ); +}; +export default DeleteDialog; diff --git a/src/components/dashboard/machines/RowActions/Edit/Form/index.jsx b/src/components/dashboard/machines/RowActions/Edit/Form/index.jsx index 6cfcd9d..5608c57 100644 --- a/src/components/dashboard/machines/RowActions/Edit/Form/index.jsx +++ b/src/components/dashboard/machines/RowActions/Edit/Form/index.jsx @@ -1,281 +1,281 @@ -import StyledForm from "@/core/components/StyledForm"; -import { - GET_CITIES_LIST, - GET_PROVINCES_LIST, - GET_STATIONS_LIST, - UPDATE_MACHINE_STATUS_AND_LOCATION, -} from "@/core/utils/routes"; -import useRequest from "@/lib/hooks/useRequest"; -import { yupResolver } from "@hookform/resolvers/yup"; -import { Beenhere, ExitToApp } from "@mui/icons-material"; -import { - Button, - CircularProgress, - DialogActions, - DialogContent, - DialogTitle, - FormControl, - InputLabel, - MenuItem, - Select, - Stack, -} from "@mui/material"; -import { DialogHeader } from "next/dist/client/components/react-dev-overlay/internal/components/Dialog"; -import { useEffect, useState } from "react"; -import { Controller, useForm, useWatch } from "react-hook-form"; -import { number, object } from "yup"; - -const statusOptions = [ - { value: 1, label: "آماده" }, - { value: 2, label: "رزرو" }, - { value: 3, label: "در ماموریت" }, - { value: 4, label: "خارج از رده" }, - { value: 5, label: "در تعمیر" }, - { value: 6, label: "فروخته شده" }, - { value: 7, label: "نیاز به تعمیر" }, -]; - -const validationSchema = object({ - status: number().required("انتخاب وضعیت الزامی است"), - province_id: number().required("انتخاب استان الزامی است"), - city_id: number().required("انتخاب شهر الزامی است"), - station_id: number().required("انتخاب راهداری الزامی است"), -}); - -const EditFormContent = ({ row, rowId, mutate, setOpen }) => { - const requestServer = useRequest(); - - const [provinces, setProvinces] = useState([]); - const [cities, setCities] = useState([]); - const [stations, setStations] = useState([]); - - const [loadingProvinces, setLoadingProvinces] = useState(false); - const [loadingCities, setLoadingCities] = useState(false); - const [loadingStations, setLoadingStations] = useState(false); - - const { - control, - handleSubmit, - setValue, - formState: { isSubmitting }, - } = useForm({ - defaultValues: { - status: row.original.status, - province_id: row.original.province_id, - city_id: row.original.city_id, - station_id: row.original.station_id, - }, - resolver: yupResolver(validationSchema), - mode: "all", - }); - - const provinceId = useWatch({ - control, - name: "province_id", - }); - - const cityId = useWatch({ - control, - name: "city_id", - }); - - const loadProvinces = async () => { - try { - setLoadingProvinces(true); - const response = await requestServer(GET_PROVINCES_LIST, "get"); - setProvinces(response.data?.data || []); - } finally { - setLoadingProvinces(false); - } - }; - - const loadCities = async (provinceId) => { - if (!provinceId) return; - - try { - setLoadingCities(true); - const response = await requestServer(`${GET_CITIES_LIST}?province_id=${provinceId}`, "get"); - setCities(response.data?.data || []); - } finally { - setLoadingCities(false); - } - }; - - const loadStations = async (cityId) => { - if (!cityId) return; - - try { - setLoadingStations(true); - const response = await requestServer(`${GET_STATIONS_LIST}/search_by_city?city_id=${cityId}`, "get"); - setStations(response.data?.data || []); - } finally { - setLoadingStations(false); - } - }; - - useEffect(() => { - loadProvinces(); - }, []); - - /** - * Initial edit mode loading - */ - useEffect(() => { - if (row.original.province_id) { - loadCities(row.original.province_id); - } - - if (row.original.city_id) { - loadStations(row.original.city_id); - } - }, []); - - useEffect(() => { - if (!provinceId) return; - - loadCities(provinceId); - - if (provinceId !== row.original.province_id) { - setValue("city_id", ""); - setValue("station_id", ""); - setStations([]); - } - }, [provinceId]); - - useEffect(() => { - if (!cityId) return; - - loadStations(cityId); - - if (cityId !== row.original.city_id) { - setValue("station_id", ""); - } - }, [cityId]); - - const onSubmit = async (data) => { - const formData = new FormData(); - - formData.append("status", String(data.status)); - formData.append("province_id", String(data.province_id)); - formData.append("city_id", String(data.city_id)); - formData.append("station_id", String(data.station_id)); - - try { - await requestServer(`${UPDATE_MACHINE_STATUS_AND_LOCATION}/${rowId}`, "post", { - data: formData, - }); - - mutate(); - setOpen(false); - } catch (error) {} - }; - - return ( - <> - - ویرایش ماشین - - - - - - ( - - استان - - - - )} - /> - - ( - - شهر - - - - )} - /> - - ( - - راهداری - - - - )} - /> - ( - - وضعیت - - - - )} - /> - - {(loadingCities || loadingStations) && ( - - - - )} - - - - - - - - - - - ); -}; - -export default EditFormContent; +import StyledForm from "@/core/components/StyledForm"; +import { + GET_CITIES_LIST, + GET_PROVINCES_LIST, + GET_STATIONS_LIST, + UPDATE_MACHINE_STATUS_AND_LOCATION, +} from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { Beenhere, ExitToApp } from "@mui/icons-material"; +import { + Button, + CircularProgress, + DialogActions, + DialogContent, + DialogTitle, + FormControl, + InputLabel, + MenuItem, + Select, + Stack, +} from "@mui/material"; +import { DialogHeader } from "next/dist/client/components/react-dev-overlay/internal/components/Dialog"; +import { useEffect, useState } from "react"; +import { Controller, useForm, useWatch } from "react-hook-form"; +import { number, object } from "yup"; + +const statusOptions = [ + { value: 1, label: "آماده" }, + { value: 2, label: "رزرو" }, + { value: 3, label: "در ماموریت" }, + { value: 4, label: "خارج از رده" }, + { value: 5, label: "در تعمیر" }, + { value: 6, label: "فروخته شده" }, + { value: 7, label: "نیاز به تعمیر" }, +]; + +const validationSchema = object({ + status: number().required("انتخاب وضعیت الزامی است"), + province_id: number().required("انتخاب استان الزامی است"), + city_id: number().required("انتخاب شهر الزامی است"), + station_id: number().required("انتخاب راهداری الزامی است"), +}); + +const EditFormContent = ({ row, rowId, mutate, setOpen }) => { + const requestServer = useRequest(); + + const [provinces, setProvinces] = useState([]); + const [cities, setCities] = useState([]); + const [stations, setStations] = useState([]); + + const [loadingProvinces, setLoadingProvinces] = useState(false); + const [loadingCities, setLoadingCities] = useState(false); + const [loadingStations, setLoadingStations] = useState(false); + + const { + control, + handleSubmit, + setValue, + formState: { isSubmitting }, + } = useForm({ + defaultValues: { + status: row.original.status, + province_id: row.original.province_id, + city_id: row.original.city_id, + station_id: row.original.station_id, + }, + resolver: yupResolver(validationSchema), + mode: "all", + }); + + const provinceId = useWatch({ + control, + name: "province_id", + }); + + const cityId = useWatch({ + control, + name: "city_id", + }); + + const loadProvinces = async () => { + try { + setLoadingProvinces(true); + const response = await requestServer(GET_PROVINCES_LIST, "get"); + setProvinces(response.data?.data || []); + } finally { + setLoadingProvinces(false); + } + }; + + const loadCities = async (provinceId) => { + if (!provinceId) return; + + try { + setLoadingCities(true); + const response = await requestServer(`${GET_CITIES_LIST}?province_id=${provinceId}`, "get"); + setCities(response.data?.data || []); + } finally { + setLoadingCities(false); + } + }; + + const loadStations = async (cityId) => { + if (!cityId) return; + + try { + setLoadingStations(true); + const response = await requestServer(`${GET_STATIONS_LIST}/search_by_city?city_id=${cityId}`, "get"); + setStations(response.data?.data || []); + } finally { + setLoadingStations(false); + } + }; + + useEffect(() => { + loadProvinces(); + }, []); + + /** + * Initial edit mode loading + */ + useEffect(() => { + if (row.original.province_id) { + loadCities(row.original.province_id); + } + + if (row.original.city_id) { + loadStations(row.original.city_id); + } + }, []); + + useEffect(() => { + if (!provinceId) return; + + loadCities(provinceId); + + if (provinceId !== row.original.province_id) { + setValue("city_id", ""); + setValue("station_id", ""); + setStations([]); + } + }, [provinceId]); + + useEffect(() => { + if (!cityId) return; + + loadStations(cityId); + + if (cityId !== row.original.city_id) { + setValue("station_id", ""); + } + }, [cityId]); + + const onSubmit = async (data) => { + const formData = new FormData(); + + formData.append("status", String(data.status)); + formData.append("province_id", String(data.province_id)); + formData.append("city_id", String(data.city_id)); + formData.append("station_id", String(data.station_id)); + + try { + await requestServer(`${UPDATE_MACHINE_STATUS_AND_LOCATION}/${rowId}`, "post", { + data: formData, + }); + + mutate(); + setOpen(false); + } catch (error) {} + }; + + return ( + <> + + ویرایش ماشین + + + + + + ( + + استان + + + + )} + /> + + ( + + شهر + + + + )} + /> + + ( + + راهداری + + + + )} + /> + ( + + وضعیت + + + + )} + /> + + {(loadingCities || loadingStations) && ( + + + + )} + + + + + + + + + + + ); +}; + +export default EditFormContent; diff --git a/src/components/dashboard/machines/RowActions/Edit/index.jsx b/src/components/dashboard/machines/RowActions/Edit/index.jsx index f3cec95..b777d54 100644 --- a/src/components/dashboard/machines/RowActions/Edit/index.jsx +++ b/src/components/dashboard/machines/RowActions/Edit/index.jsx @@ -1,44 +1,44 @@ -import { SwapHoriz } from "@mui/icons-material"; -import CloseIcon from "@mui/icons-material/Close"; -import { Dialog, IconButton, Tooltip } from "@mui/material"; -import { useState } from "react"; -import EditFormContent from "./Form"; - -const Edit = ({ row, mutate, rowId }) => { - const [openEditDialog, setOpenEditDialog] = useState(false); - - return ( - <> - - { - setOpenEditDialog(true); - }} - > - - - - - setOpenEditDialog(false)} - sx={(theme) => ({ - position: "absolute", - right: 8, - top: 8, - zIndex: 50, - color: theme.palette.grey[500], - })} - > - - - {openEditDialog && ( - - )} - - - ); -}; -export default Edit; +import { SwapHoriz } from "@mui/icons-material"; +import CloseIcon from "@mui/icons-material/Close"; +import { Dialog, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import EditFormContent from "./Form"; + +const Edit = ({ row, mutate, rowId }) => { + const [openEditDialog, setOpenEditDialog] = useState(false); + + return ( + <> + + { + setOpenEditDialog(true); + }} + > + + + + + setOpenEditDialog(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + {openEditDialog && ( + + )} + + + ); +}; +export default Edit; diff --git a/src/components/dashboard/machines/RowActions/index.jsx b/src/components/dashboard/machines/RowActions/index.jsx index 526fe10..1e1d4eb 100644 --- a/src/components/dashboard/machines/RowActions/index.jsx +++ b/src/components/dashboard/machines/RowActions/index.jsx @@ -1,14 +1,14 @@ -import { usePermissions } from "@/lib/hooks/usePermissions"; -import { Box } from "@mui/material"; -import Edit from "./Edit"; - -const RowActions = ({ row, mutate }) => { - const { data: userPermissions } = usePermissions(); - const hasEditPermission = userPermissions.some((item) => ["update-machine"].includes(item)); - return ( - - {hasEditPermission && } - - ); -}; -export default RowActions; +import { usePermissions } from "@/lib/hooks/usePermissions"; +import { Box } from "@mui/material"; +import Edit from "./Edit"; + +const RowActions = ({ row, mutate }) => { + const { data: userPermissions } = usePermissions(); + const hasEditPermission = userPermissions.some((item) => ["update-machine"].includes(item)); + return ( + + {hasEditPermission && } + + ); +}; +export default RowActions; diff --git a/src/components/dashboard/machines/ShowProjectArea/ShowBound.jsx b/src/components/dashboard/machines/ShowProjectArea/ShowBound.jsx index 24db476..43dd0b8 100644 --- a/src/components/dashboard/machines/ShowProjectArea/ShowBound.jsx +++ b/src/components/dashboard/machines/ShowProjectArea/ShowBound.jsx @@ -1,29 +1,29 @@ -import { useEffect, useRef } from "react"; -import { FeatureGroup, useMap } from "react-leaflet"; - -const ShowBound = ({ bound }) => { - const map = useMap(); - const featureRef = useRef(null); - - const safeFitBounds = (layer) => { - if (!layer || !map) return; - try { - const latLngs = layer.getLatLngs(); - map.fitBounds(latLngs, { - paddingTopLeft: [20, 20], - paddingBottomRight: [20, 20], - }); - } catch (e) { - console.warn("fitBounds failed:", e); - } - }; - - useEffect(() => { - bound?.editing?.disable(); - featureRef.current.addLayer(bound); - safeFitBounds(bound); - }, []); - - return ; -}; -export default ShowBound; +import { useEffect, useRef } from "react"; +import { FeatureGroup, useMap } from "react-leaflet"; + +const ShowBound = ({ bound }) => { + const map = useMap(); + const featureRef = useRef(null); + + const safeFitBounds = (layer) => { + if (!layer || !map) return; + try { + const latLngs = layer.getLatLngs(); + map.fitBounds(latLngs, { + paddingTopLeft: [20, 20], + paddingBottomRight: [20, 20], + }); + } catch (e) { + console.warn("fitBounds failed:", e); + } + }; + + useEffect(() => { + bound?.editing?.disable(); + featureRef.current.addLayer(bound); + safeFitBounds(bound); + }, []); + + return ; +}; +export default ShowBound; diff --git a/src/components/dashboard/machines/ShowProjectArea/index.jsx b/src/components/dashboard/machines/ShowProjectArea/index.jsx index 250cd52..29f2697 100644 --- a/src/components/dashboard/machines/ShowProjectArea/index.jsx +++ b/src/components/dashboard/machines/ShowProjectArea/index.jsx @@ -1,65 +1,65 @@ -const { IconButton, Tooltip, Box, Dialog, DialogTitle, Typography, DialogContent } = require("@mui/material"); -import MapLayer from "@/core/components/MapLayer"; -import CloseIcon from "@mui/icons-material/Close"; -import LayersIcon from "@mui/icons-material/Layers"; -import L from "leaflet"; -import { useMemo, useState } from "react"; -import ShowBound from "./ShowBound"; - -const ShowProjectArea = ({ primaryArea }) => { - const [openShowAreaDialog, setOpenShowAreaDialog] = useState(false); - const bound = useMemo(() => { - const coordinates = Object.values(primaryArea.coordinates); - - const latLngCoords = coordinates.map(([lat, lng]) => [parseFloat(lng), parseFloat(lat)]); - - return primaryArea.type === "polygon" - ? L.polygon(latLngCoords, { color: "#ff5555" }) - : L.polyline(latLngCoords); - }, [primaryArea]); - - return ( - - - setOpenShowAreaDialog(true)}> - - - - setOpenShowAreaDialog(false)} - PaperProps={{ - sx: { - transition: "all .3s", - boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", - borderRadius: 2, - padding: 1, - }, - }} - maxWidth="sm" - fullWidth - dir="rtl" - > - - - محدوده طرح - - setOpenShowAreaDialog(false)} size="small"> - - - - - - - - - - - - - - - ); -}; - -export default ShowProjectArea; +const { IconButton, Tooltip, Box, Dialog, DialogTitle, Typography, DialogContent } = require("@mui/material"); +import MapLayer from "@/core/components/MapLayer"; +import CloseIcon from "@mui/icons-material/Close"; +import LayersIcon from "@mui/icons-material/Layers"; +import L from "leaflet"; +import { useMemo, useState } from "react"; +import ShowBound from "./ShowBound"; + +const ShowProjectArea = ({ primaryArea }) => { + const [openShowAreaDialog, setOpenShowAreaDialog] = useState(false); + const bound = useMemo(() => { + const coordinates = Object.values(primaryArea.coordinates); + + const latLngCoords = coordinates.map(([lat, lng]) => [parseFloat(lng), parseFloat(lat)]); + + return primaryArea.type === "polygon" + ? L.polygon(latLngCoords, { color: "#ff5555" }) + : L.polyline(latLngCoords); + }, [primaryArea]); + + return ( + + + setOpenShowAreaDialog(true)}> + + + + setOpenShowAreaDialog(false)} + PaperProps={{ + sx: { + transition: "all .3s", + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + borderRadius: 2, + padding: 1, + }, + }} + maxWidth="sm" + fullWidth + dir="rtl" + > + + + محدوده طرح + + setOpenShowAreaDialog(false)} size="small"> + + + + + + + + + + + + + + + ); +}; + +export default ShowProjectArea; diff --git a/src/components/dashboard/machines/index.jsx b/src/components/dashboard/machines/index.jsx index ed3db7c..6074488 100644 --- a/src/components/dashboard/machines/index.jsx +++ b/src/components/dashboard/machines/index.jsx @@ -1,14 +1,14 @@ -"use client"; -import PageTitle from "@/core/components/PageTitle"; -import { Stack } from "@mui/material"; -import MachinesList from "./MachinesList"; - -const MachinesPage = () => { - return ( - - - - - ); -}; -export default MachinesPage; +"use client"; +import PageTitle from "@/core/components/PageTitle"; +import { Stack } from "@mui/material"; +import MachinesList from "./MachinesList"; + +const MachinesPage = () => { + return ( + + + + + ); +}; +export default MachinesPage; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/AlarmText.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/AlarmText.jsx index 0a3be1b..0ddf8a0 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/AlarmText.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/AlarmText.jsx @@ -1,28 +1,28 @@ -import { Box, Typography } from "@mui/material"; - -const AlarmText = ({ isSource }) => { - if (isSource) return null; - return ( - - - با کلیک بر روی مارکر موقعیت را انتخاب کنید - - - ); -}; - -export default AlarmText; +import { Box, Typography } from "@mui/material"; + +const AlarmText = ({ isSource }) => { + if (isSource) return null; + return ( + + + با کلیک بر روی مارکر موقعیت را انتخاب کنید + + + ); +}; + +export default AlarmText; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx index c19cb6f..5768f75 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/DataBox.jsx @@ -1,53 +1,53 @@ -import { Box, Button, TextField } from "@mui/material"; - -const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => { - if (!isSource) return null; - - return ( - -
- - {isSource && isDest && ( - - )} -
- {isDest && ( -
- - -
- )} - - ); -}; - -export default DataBox; +import { Box, Button, TextField } from "@mui/material"; + +const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => { + if (!isSource) return null; + + return ( + +
+ + {isSource && isDest && ( + + )} +
+ {isDest && ( +
+ + +
+ )} + + ); +}; + +export default DataBox; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/ShowRoute.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/ShowRoute.jsx index 8cc7e90..7d47ba8 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/ShowRoute.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/ShowRoute.jsx @@ -1,46 +1,46 @@ -import { useEffect, useRef } from "react"; -import { Marker, Polyline, useMap } from "react-leaflet"; -import L from "leaflet"; -import polyline from "@mapbox/polyline"; -import SourceIcon from "@/assets/images/source-icon.svg"; -import DestIcon from "@/assets/images/destination-icon.svg"; - -const ShowRoute = ({ area }) => { - const map = useMap(); - const defaultIconSize = [35, 35]; - - const createCustomIcon = (size, iconUrl) => { - return L.icon({ - iconUrl: iconUrl, - iconSize: size, - iconAnchor: [size[0] / 2, size[1]], - popupAnchor: [0, -size[1]], - }); - }; - - 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]; - useEffect(() => { - if (coords.length > 0) { - map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); - } - }, [area]); - - return ( - <> - - - - - ); -}; - -export default ShowRoute; +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); + const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); + + if (!area) return null; + const coords = polyline.decode(area, 6); + + if (coords.length === 0) return null; + + const sourcePosition = coords[0]; + const destPosition = coords[coords.length - 1]; + + return ( + <> + + + + + ); +}; + +export default ShowRoute; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx index 06e7c9b..49c4651 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/Routing/index.jsx @@ -1,219 +1,219 @@ -import { Marker, Polyline, useMapEvents } from "react-leaflet"; -import L from "leaflet"; -import polyline from "@mapbox/polyline"; -import SourceIcon from "@/assets/images/source-icon.svg"; -import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; -import PrevDestIcon from "@/assets/images/prev-destination-icon.svg"; -import DestIcon from "@/assets/images/destination-icon.svg"; -import { useEffect, useRef, useState } from "react"; -import DataBox from "./DataBox"; -import AlarmText from "./AlarmText"; - -const Routing = ({ setArea, setLocations, locations, area }) => { - const mapPrevSourceMarker = useRef(); - const mapPrevDestMarker = useRef(); - const mapRef = useRef(null); - const defaultIconSize = [35, 35]; - const [isSource, setIsSource] = useState(false); - const [sourcePosition, setSourcePosition] = useState(null); - const [isDest, setIsDest] = useState(false); - const [destPosition, setDestPosition] = useState(null); - const [routeCoords, setRouteCoords] = useState([]); - const [alternateCoords, setAlternateCoords] = useState([]); - const [editingTarget, setEditingTarget] = useState(null); - const [selectedRoute, setSelectedRoute] = useState(null); - - const createCustomIcon = (size, iconUrl) => { - return L.icon({ - iconUrl: iconUrl, - iconSize: size, - iconAnchor: [size[0] / 2, size[1]], - popupAnchor: [0, -size[1]], - }); - }; - - const defaultIcon = createCustomIcon( - defaultIconSize, - isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src - ); - - const prevDestIcon = createCustomIcon( - defaultIconSize, - isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src - ); - - const isMovingSource = !isSource || editingTarget === "source"; - const isMovingDest = isSource && (!isDest || editingTarget === "dest"); - - const map = useMapEvents({ - move(e) { - if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); - if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter()); - }, - movestart() { - if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); - if (isMovingDest && mapPrevDestMarker.current) - mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); - }, - moveend() { - if (isMovingSource) - mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); - if (isMovingDest && mapPrevDestMarker.current) - mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); - }, - }); - - useEffect(() => { - mapRef.current = map; - }, [map]); - - useEffect(() => { - if (locations.length < 2) return; - const restoredSource = { lat: locations[0].lat, lng: locations[0].lon }; - const restoredDest = { lat: locations[1].lat, lng: locations[1].lon }; - setSourcePosition(restoredSource); - setDestPosition(restoredDest); - setIsSource(true); - setIsDest(true); - if (area) { - const decoded = polyline.decode(area, 6); - setRouteCoords(decoded); - setSelectedRoute({ index: "main", coords: decoded }); - setTimeout(() => { - mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); - }, 100); - } else { - fetchRoute(restoredSource, restoredDest); - } - }, []); - - const fetchRoute = async (source, dest) => { - const locs = [ - { lat: source.lat, lon: source.lng }, - { lat: dest.lat, lon: dest.lng }, - ]; - try { - const response = await fetch("https://jouya.141.ir/api/router/drive", { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ locations: locs }), - }); - const data = await response.json(); - const shape = data.trip.legs[0].shape; - setLocations(locs); - setArea(shape); - const decoded = polyline.decode(shape, 6); - setRouteCoords(decoded); - setSelectedRoute({ index: "main", coords: decoded }); - - if (data.alternates?.length > 0) { - const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); - setAlternateCoords(decodedAlternates); - } else { - setAlternateCoords([]); - } - map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); - } catch (error) { - console.error("Routing error:", error); - } - }; - - const handleMarkerClick = async () => { - if (!isSource || editingTarget === "source") { - const clickedPosition = mapPrevSourceMarker.current.getLatLng(); - setSourcePosition(clickedPosition); - setIsSource(true); - setEditingTarget(null); - setRouteCoords([]); - setAlternateCoords([]); - setSelectedRoute(null); - - if (editingTarget === "source" && destPosition) { - await fetchRoute(clickedPosition, destPosition); - } - } - }; - - const handleDestMarkerClick = async () => { - if (!isDest || editingTarget === "dest") { - const clickedPosition = mapPrevDestMarker.current.getLatLng(); - setDestPosition(clickedPosition); - setIsDest(true); - setEditingTarget(null); - - await fetchRoute(sourcePosition, clickedPosition); - } - }; - - const handleEditSource = () => { - setEditingTarget("source"); - setRouteCoords([]); - setAlternateCoords([]); - setSelectedRoute(null); - }; - - const handleEditDest = () => { - setEditingTarget("dest"); - setRouteCoords([]); - setAlternateCoords([]); - setSelectedRoute(null); - }; - - const handleSelectRoute = (index, coords) => { - setSelectedRoute({ index, coords }); - const encoded = polyline.encode(coords, 6); - setArea(encoded); - map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); - }; - - return ( - <> - - - - {isSource && ( - - )} - {alternateCoords.map((coords, index) => ( - handleSelectRoute(index, coords) }} - /> - ))} - {routeCoords.length > 0 && ( - handleSelectRoute("main", routeCoords) }} - /> - )} - - ); -}; - -export default Routing; +import { Marker, Polyline, useMapEvents } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; +import PrevDestIcon from "@/assets/images/prev-destination-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; +import { useEffect, useRef, useState } from "react"; +import DataBox from "./DataBox"; +import AlarmText from "./AlarmText"; + +const Routing = ({ setArea, setLocations, locations, area }) => { + const mapPrevSourceMarker = useRef(); + const mapPrevDestMarker = useRef(); + const mapRef = useRef(null); + const defaultIconSize = [35, 35]; + const [isSource, setIsSource] = useState(false); + const [sourcePosition, setSourcePosition] = useState(null); + const [isDest, setIsDest] = useState(false); + const [destPosition, setDestPosition] = useState(null); + const [routeCoords, setRouteCoords] = useState([]); + const [alternateCoords, setAlternateCoords] = useState([]); + const [editingTarget, setEditingTarget] = useState(null); + const [selectedRoute, setSelectedRoute] = useState(null); + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + const defaultIcon = createCustomIcon( + defaultIconSize, + isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src + ); + + const prevDestIcon = createCustomIcon( + defaultIconSize, + isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src + ); + + const isMovingSource = !isSource || editingTarget === "source"; + const isMovingDest = isSource && (!isDest || editingTarget === "dest"); + + const map = useMapEvents({ + move(e) { + if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); + if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter()); + }, + movestart() { + if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); + }, + moveend() { + if (isMovingSource) + mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); + }, + }); + + useEffect(() => { + mapRef.current = map; + }, [map]); + + useEffect(() => { + if (locations.length < 2) return; + const restoredSource = { lat: locations[0].lat, lng: locations[0].lon }; + const restoredDest = { lat: locations[1].lat, lng: locations[1].lon }; + setSourcePosition(restoredSource); + setDestPosition(restoredDest); + setIsSource(true); + setIsDest(true); + if (area) { + const decoded = polyline.decode(area, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + setTimeout(() => { + mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + }, 100); + } else { + fetchRoute(restoredSource, restoredDest); + } + }, []); + + const fetchRoute = async (source, dest) => { + const locs = [ + { lat: source.lat, lon: source.lng }, + { lat: dest.lat, lon: dest.lng }, + ]; + try { + const response = await fetch("https://jouya.141.ir/api/router/drive", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ locations: locs }), + }); + const data = await response.json(); + const shape = data.trip.legs[0].shape; + setLocations(locs); + setArea(shape); + const decoded = polyline.decode(shape, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + + if (data.alternates?.length > 0) { + const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); + setAlternateCoords(decodedAlternates); + } else { + setAlternateCoords([]); + } + map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + } catch (error) { + console.error("Routing error:", error); + } + }; + + const handleMarkerClick = async () => { + if (!isSource || editingTarget === "source") { + const clickedPosition = mapPrevSourceMarker.current.getLatLng(); + setSourcePosition(clickedPosition); + setIsSource(true); + setEditingTarget(null); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + + if (editingTarget === "source" && destPosition) { + await fetchRoute(clickedPosition, destPosition); + } + } + }; + + const handleDestMarkerClick = async () => { + if (!isDest || editingTarget === "dest") { + const clickedPosition = mapPrevDestMarker.current.getLatLng(); + setDestPosition(clickedPosition); + setIsDest(true); + setEditingTarget(null); + + await fetchRoute(sourcePosition, clickedPosition); + } + }; + + const handleEditSource = () => { + setEditingTarget("source"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleEditDest = () => { + setEditingTarget("dest"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleSelectRoute = (index, coords) => { + setSelectedRoute({ index, coords }); + const encoded = polyline.encode(coords, 6); + setArea(encoded); + map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); + }; + + return ( + <> + + + + {isSource && ( + + )} + {alternateCoords.map((coords, index) => ( + handleSelectRoute(index, coords) }} + /> + ))} + {routeCoords.length > 0 && ( + handleSelectRoute("main", routeCoords) }} + /> + )} + + ); +}; + +export default Routing; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/RouteDetail/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/RouteDetail/index.jsx index e345bf9..10a3f0b 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/RouteDetail/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/RouteDetail/index.jsx @@ -1,57 +1,57 @@ -import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useState } from "react"; -import MapIcon from "@mui/icons-material/Map"; -import MapLayer from "@/core/components/MapLayer"; -import ShowRoute from "../../Actions/Create/Form/Area/Routing/ShowRoute"; - -const RouteDetail = ({ encoded_route }) => { - const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false); - return ( - <> - - setOpenRouteDetailDialog(true)}> - - - - setOpenRouteDetailDialog(false)} - PaperProps={{ - sx: { - boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", - }, - }} - dir="rtl" - maxWidth={"sm"} - > - مسیر انتخابی - - - - - - - - - - - - - ); -}; -export default RouteDetail; +import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import MapIcon from "@mui/icons-material/Map"; +import MapLayer from "@/core/components/MapLayer"; +import ShowRoute from "../../Actions/Create/Form/Area/Routing/ShowRoute"; + +const RouteDetail = ({ encoded_route }) => { + const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false); + return ( + <> + + setOpenRouteDetailDialog(true)}> + + + + setOpenRouteDetailDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"sm"} + > + مسیر انتخابی + + + + + + + + + + + + + ); +}; +export default RouteDetail; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx index b398579..938d1e7 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx @@ -1,77 +1,77 @@ -"use client"; -import { - EXPORT_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY, - EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY, -} 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_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY - : EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY; - 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 ? ( - - - - ) : ( - - )} - - ); -}; -export default PrintExcel; +"use client"; +import { + EXPORT_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY, + EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY, +} 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_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY + : EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY; + 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 ? ( + + + + ) : ( + + )} + + ); +}; +export default PrintExcel; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx index 12de496..a80cabb 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx @@ -1,138 +1,138 @@ -"use client"; -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import { Box } from "@mui/material"; -import { useEffect, useMemo } from "react"; -import Toolbar from "./Toolbar"; - -const TaradodReportLists = ({ data, specialFilter }) => { - const columns = useMemo(() => { - return [ - { - accessorKey: "edare_name", - header: "اداره کل", - id: "edare_name", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "total", - header: "کل ماموریت ها", - id: "total", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "khareg_mahdode", - header: "تردد خارج از محدوده", - id: "khareg_mahdode", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "durations", - header: "جمع ساعات ماموریت", - id: "duration", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "gps", - header: "جمع ساعات gps", - id: "gps", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "far_h", - header: "با فرایند ساعتی", - id: "far_h", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "far_d", - header: "با فرایند روزانه", - id: "far_d", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "un_far_h", - header: "بدون فرایند ساعتی", - id: "un_far_h", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "un_far_d", - header: "بدون فرایند روزانه", - id: "un_far_d", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "item", - header: "فعالیت روزانه", - id: "item", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "patrol", - header: "گشت راهداری", - id: "patrol", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - ]; - }, []); - - return ( - - - - ); -}; - -export default TaradodReportLists; +"use client"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useEffect, useMemo } from "react"; +import Toolbar from "./Toolbar"; + +const TaradodReportLists = ({ data, specialFilter }) => { + const columns = useMemo(() => { + return [ + { + accessorKey: "edare_name", + header: "اداره کل", + id: "edare_name", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "total", + header: "کل ماموریت ها", + id: "total", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "khareg_mahdode", + header: "تردد خارج از محدوده", + id: "khareg_mahdode", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "durations", + header: "جمع ساعات ماموریت", + id: "duration", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "gps", + header: "جمع ساعات gps", + id: "gps", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "far_h", + header: "با فرایند ساعتی", + id: "far_h", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "far_d", + header: "با فرایند روزانه", + id: "far_d", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "un_far_h", + header: "بدون فرایند ساعتی", + id: "un_far_h", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "un_far_d", + header: "بدون فرایند روزانه", + id: "un_far_d", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "item", + header: "فعالیت روزانه", + id: "item", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "patrol", + header: "گشت راهداری", + id: "patrol", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + ]; + }, []); + + return ( + + + + ); +}; + +export default TaradodReportLists; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx index 490ee7b..0a81488 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx @@ -1,27 +1,27 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller } from "react-hook-form"; - -const FromDateController = ({ control }) => { - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default FromDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller } from "react-hook-form"; + +const FromDateController = ({ control }) => { + return ( + ( + { + 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/taradodReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx index bde2a4c..e1b71cd 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx @@ -1,44 +1,44 @@ -import SearchIcon from "@mui/icons-material/Search"; -import { Button, Grid } from "@mui/material"; -import { Controller } from "react-hook-form"; -import FromDateController from "./FromDateController"; -import SelectProvince from "./SelectProvince"; -import ToDateController from "./ToDateController"; - -const SearchReportField = ({ control, hasProvincesPermission }) => { - return ( - - - - - - - - {hasProvincesPermission && ( - - - - )} - - ( - - )} - /> - - - ); -}; - -export default SearchReportField; +import SearchIcon from "@mui/icons-material/Search"; +import { Button, Grid } from "@mui/material"; +import { Controller } from "react-hook-form"; +import FromDateController from "./FromDateController"; +import SelectProvince from "./SelectProvince"; +import ToDateController from "./ToDateController"; + +const SearchReportField = ({ control, hasProvincesPermission }) => { + return ( + + + + + + + + {hasProvincesPermission && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +export default SearchReportField; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx index 2b24d67..89395f0 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx @@ -1,45 +1,45 @@ -import useProvinces from "@/lib/hooks/useProvince"; -import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; -import { Controller } from "react-hook-form"; - -const SelectProvince = ({ control }) => { - const { provinces, loadingProvinces, errorProvinces } = useProvinces(); - return ( - ( - - استان - - {error && {error.message}} - - )} - /> - ); -}; -export default SelectProvince; +import useProvinces from "@/lib/hooks/useProvince"; +import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; +import { Controller } from "react-hook-form"; + +const SelectProvince = ({ control }) => { + const { provinces, loadingProvinces, errorProvinces } = useProvinces(); + return ( + ( + + استان + + {error && {error.message}} + + )} + /> + ); +}; +export default SelectProvince; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx index fc4a776..ef3ff49 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx @@ -1,30 +1,30 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller, useWatch } from "react-hook-form"; - -const ToDateController = ({ control }) => { - const minDate = useWatch({ control, name: "from_date" }); - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default ToDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller, useWatch } from "react-hook-form"; + +const ToDateController = ({ control }) => { + const minDate = useWatch({ control, name: "from_date" }); + return ( + ( + { + 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/taradodReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx index f29d302..9d504f2 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx @@ -1,13 +1,13 @@ -import StyledForm from "@/core/components/StyledForm"; -import SearchReportField from "./SearchReportField"; - -const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => { - return ( - <> - - - - - ); -}; -export default SearchReportList; +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/taradodReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx index 0f726c7..afc132c 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx @@ -1,11 +1,11 @@ -import { Box } from "@mui/material"; -import PrintExcel from "./ExcelPrint"; - -const Toolbar = ({ table, filterData, mutate }) => { - return ( - - - - ); -}; -export default Toolbar; +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/taradodReports/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx index ce41101..1af4608 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx @@ -1,142 +1,142 @@ -"use client"; -import PageTitle from "@/core/components/PageTitle"; -import { - GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY, - GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY, -} 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 TaradodReportLists from "./MissionsReportLists"; -import SearchReportList from "./Search"; - -const TaradodReportPage = () => { - const [data, setData] = useState(null); - const { data: userPermissions } = usePermissions(); - const { user } = useAuth(); - const requestServer = useRequest(); - const [provinceId, setProvinceId] = useState(user.province_id || "-1"); - 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: provinceId, - }; - 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}`); - params.set("date_to", `${data.date_to}`); - 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 { - // params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY}?${params}`); - const result = response.data.data; - const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); - const nationalReport = { - edare_name: "کل کشور", - ...nationalReportForItem, - }; - - setData({ - data: [ - nationalReport, - ...result.provinces.map((province) => { - const filteredReports = result.activities.find( - (report) => report.province_id == province.id - ); - return { - ...filteredReports, - edare_name: province.name_fa, - }; - }), - ], - filters: data, - }); - } catch (e) {} - } else { - try { - params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY}?${params}`); - const result = response.data.data; - - const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); - - const nationalReport = { - ...nationalReportForItem, - edare_name: "کل استان", - }; - setData({ - data: [ - nationalReport, - ...result.city.map((city) => { - const filteredReports = result.activities.find((report) => report.city_id == city.id); - return { - edare_name: city.name_fa, - ...filteredReports, - }; - }), - ], - 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 TaradodReportPage; +"use client"; +import PageTitle from "@/core/components/PageTitle"; +import { + GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY, + GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY, +} 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 TaradodReportLists from "./MissionsReportLists"; +import SearchReportList from "./Search"; + +const TaradodReportPage = () => { + const [data, setData] = useState(null); + const { data: userPermissions } = usePermissions(); + const { user } = useAuth(); + const requestServer = useRequest(); + const [provinceId, setProvinceId] = useState(user.province_id || "-1"); + 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: provinceId, + }; + 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}`); + params.set("date_to", `${data.date_to}`); + 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 { + // params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY}?${params}`); + const result = response.data.data; + const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); + const nationalReport = { + edare_name: "کل کشور", + ...nationalReportForItem, + }; + + setData({ + data: [ + nationalReport, + ...result.provinces.map((province) => { + const filteredReports = result.activities.find( + (report) => report.province_id == province.id + ); + return { + ...filteredReports, + edare_name: province.name_fa, + }; + }), + ], + filters: data, + }); + } catch (e) {} + } else { + try { + params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY}?${params}`); + const result = response.data.data; + + const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); + + const nationalReport = { + ...nationalReportForItem, + edare_name: "کل استان", + }; + setData({ + data: [ + nationalReport, + ...result.city.map((city) => { + const filteredReports = result.activities.find((report) => report.city_id == city.id); + return { + edare_name: city.name_fa, + ...filteredReports, + }; + }), + ], + 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 TaradodReportPage; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx index b7487f6..3968fff 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx @@ -1,77 +1,77 @@ -"use client"; -import { - EXPORT_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY, - EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY, -} 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_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY - : EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY; - 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 ? ( - - - - ) : ( - - )} - - ); -}; -export default PrintExcel; +"use client"; +import { + EXPORT_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY, + EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY, +} 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_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY + : EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY; + 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 ? ( + + + + ) : ( + + )} + + ); +}; +export default PrintExcel; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx index 490ee7b..0a81488 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx @@ -1,27 +1,27 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller } from "react-hook-form"; - -const FromDateController = ({ control }) => { - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default FromDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller } from "react-hook-form"; + +const FromDateController = ({ control }) => { + return ( + ( + { + 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/violationsReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SearchReportField.jsx index bde2a4c..e1b71cd 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/SearchReportField.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SearchReportField.jsx @@ -1,44 +1,44 @@ -import SearchIcon from "@mui/icons-material/Search"; -import { Button, Grid } from "@mui/material"; -import { Controller } from "react-hook-form"; -import FromDateController from "./FromDateController"; -import SelectProvince from "./SelectProvince"; -import ToDateController from "./ToDateController"; - -const SearchReportField = ({ control, hasProvincesPermission }) => { - return ( - - - - - - - - {hasProvincesPermission && ( - - - - )} - - ( - - )} - /> - - - ); -}; - -export default SearchReportField; +import SearchIcon from "@mui/icons-material/Search"; +import { Button, Grid } from "@mui/material"; +import { Controller } from "react-hook-form"; +import FromDateController from "./FromDateController"; +import SelectProvince from "./SelectProvince"; +import ToDateController from "./ToDateController"; + +const SearchReportField = ({ control, hasProvincesPermission }) => { + return ( + + + + + + + + {hasProvincesPermission && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +export default SearchReportField; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx index 2b24d67..89395f0 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx @@ -1,45 +1,45 @@ -import useProvinces from "@/lib/hooks/useProvince"; -import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; -import { Controller } from "react-hook-form"; - -const SelectProvince = ({ control }) => { - const { provinces, loadingProvinces, errorProvinces } = useProvinces(); - return ( - ( - - استان - - {error && {error.message}} - - )} - /> - ); -}; -export default SelectProvince; +import useProvinces from "@/lib/hooks/useProvince"; +import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; +import { Controller } from "react-hook-form"; + +const SelectProvince = ({ control }) => { + const { provinces, loadingProvinces, errorProvinces } = useProvinces(); + return ( + ( + + استان + + {error && {error.message}} + + )} + /> + ); +}; +export default SelectProvince; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx index 2dd7263..9b9ac81 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx @@ -1,30 +1,30 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller, useWatch } from "react-hook-form"; - -const ToDateController = ({ control }) => { - const minDate = useWatch({ control, name: "from_date" }); - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default ToDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller, useWatch } from "react-hook-form"; + +const ToDateController = ({ control }) => { + const minDate = useWatch({ control, name: "from_date" }); + return ( + ( + { + 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/violationsReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx index f29d302..9d504f2 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx @@ -1,13 +1,13 @@ -import StyledForm from "@/core/components/StyledForm"; -import SearchReportField from "./SearchReportField"; - -const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => { - return ( - <> - - - - - ); -}; -export default SearchReportList; +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/violationsReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Toolbar.jsx index 0f726c7..afc132c 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Toolbar.jsx @@ -1,11 +1,11 @@ -import { Box } from "@mui/material"; -import PrintExcel from "./ExcelPrint"; - -const Toolbar = ({ table, filterData, mutate }) => { - return ( - - - - ); -}; -export default Toolbar; +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/violationsReports/ViolationsReportsList.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx index 60966f8..61f7282 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx @@ -1,98 +1,98 @@ -"use client"; -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import { Box } from "@mui/material"; -import { useEffect, useMemo } from "react"; -import Toolbar from "./Toolbar"; - -const ViolationsReportsList = ({ data, specialFilter }) => { - const columns = useMemo(() => { - return [ - { - accessorKey: "edare_name", - header: "اداره کل", - id: "edare_name", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "total", - header: "کل تخلفات", - id: "total", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "done", - header: "اقدام شده", - id: "done", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "undone", - header: "اقدام نشده", - id: "un_done", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "gps", - header: "GPS", - id: "gps", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "herasat", - header: "ثبت حراست", - id: "herasat", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "mil_gps", - header: "کیلومتر GPS", - id: "mil_gps", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - ]; - }, []); - - return ( - - - - ); -}; - -export default ViolationsReportsList; +"use client"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useEffect, useMemo } from "react"; +import Toolbar from "./Toolbar"; + +const ViolationsReportsList = ({ data, specialFilter }) => { + const columns = useMemo(() => { + return [ + { + accessorKey: "edare_name", + header: "اداره کل", + id: "edare_name", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "total", + header: "کل تخلفات", + id: "total", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "done", + header: "اقدام شده", + id: "done", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "undone", + header: "اقدام نشده", + id: "un_done", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "gps", + header: "GPS", + id: "gps", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "herasat", + header: "ثبت حراست", + id: "herasat", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "mil_gps", + header: "کیلومتر GPS", + id: "mil_gps", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + ]; + }, []); + + return ( + + + + ); +}; + +export default ViolationsReportsList; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx index 37d765f..d7f9a5a 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx @@ -1,141 +1,141 @@ -"use client"; -import PageTitle from "@/core/components/PageTitle"; -import { - GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY, - GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY, -} 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 ViolationsReportsList from "./ViolationsReportsList"; -import SearchReportList from "./Search"; - -const ViolationsReportsPage = () => { - 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}`); - params.set("date_to", `${data.date_to}`); - 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 { - // params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY}?${params}`); - const result = response.data.data; - const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); - const nationalReport = { - edare_name: "کل کشور", - ...nationalReportForItem, - }; - - setData({ - data: [ - nationalReport, - ...result.provinces.map((province) => { - const filteredReports = result.activities.find( - (report) => report.province_id == province.id - ); - return { - ...filteredReports, - edare_name: province.name_fa, - }; - }), - ], - filters: data, - }); - } catch (e) {} - } else { - try { - params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY}?${params}`); - const result = response.data.data; - - const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); - - const nationalReport = { - ...nationalReportForItem, - edare_name: "کل استان", - }; - setData({ - data: [ - nationalReport, - ...result.city.map((city) => { - const filteredReports = result.activities.find((report) => report.city_id == city.id); - return { - edare_name: city.name_fa, - ...filteredReports, - }; - }), - ], - 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 ViolationsReportsPage; +"use client"; +import PageTitle from "@/core/components/PageTitle"; +import { + GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY, + GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY, +} 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 ViolationsReportsList from "./ViolationsReportsList"; +import SearchReportList from "./Search"; + +const ViolationsReportsPage = () => { + 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}`); + params.set("date_to", `${data.date_to}`); + 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 { + // params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY}?${params}`); + const result = response.data.data; + const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); + const nationalReport = { + edare_name: "کل کشور", + ...nationalReportForItem, + }; + + setData({ + data: [ + nationalReport, + ...result.provinces.map((province) => { + const filteredReports = result.activities.find( + (report) => report.province_id == province.id + ); + return { + ...filteredReports, + edare_name: province.name_fa, + }; + }), + ], + filters: data, + }); + } catch (e) {} + } else { + try { + params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY}?${params}`); + const result = response.data.data; + + const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); + + const nationalReport = { + ...nationalReportForItem, + edare_name: "کل استان", + }; + setData({ + data: [ + nationalReport, + ...result.city.map((city) => { + const filteredReports = result.activities.find((report) => report.city_id == city.id); + return { + edare_name: city.name_fa, + ...filteredReports, + }; + }), + ], + 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 ViolationsReportsPage; diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/ShowRoute.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/ShowRoute.jsx index 8cc7e90..7d47ba8 100644 --- a/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/ShowRoute.jsx +++ b/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/ShowRoute.jsx @@ -1,46 +1,46 @@ -import { useEffect, useRef } from "react"; -import { Marker, Polyline, useMap } from "react-leaflet"; -import L from "leaflet"; -import polyline from "@mapbox/polyline"; -import SourceIcon from "@/assets/images/source-icon.svg"; -import DestIcon from "@/assets/images/destination-icon.svg"; - -const ShowRoute = ({ area }) => { - const map = useMap(); - const defaultIconSize = [35, 35]; - - const createCustomIcon = (size, iconUrl) => { - return L.icon({ - iconUrl: iconUrl, - iconSize: size, - iconAnchor: [size[0] / 2, size[1]], - popupAnchor: [0, -size[1]], - }); - }; - - 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]; - useEffect(() => { - if (coords.length > 0) { - map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); - } - }, [area]); - - return ( - <> - - - - - ); -}; - -export default ShowRoute; +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); + const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); + + if (!area) return null; + const coords = polyline.decode(area, 6); + + if (coords.length === 0) return null; + + const sourcePosition = coords[0]; + const destPosition = coords[coords.length - 1]; + + return ( + <> + + + + + ); +}; + +export default ShowRoute; diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/index.jsx index 4501d35..48b84a2 100644 --- a/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/index.jsx +++ b/src/components/dashboard/roadMissions/transportation/RowActions/RouteDetail/index.jsx @@ -1,57 +1,57 @@ -import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useState } from "react"; -import MapIcon from "@mui/icons-material/Map"; -import MapLayer from "@/core/components/MapLayer"; -import ShowRoute from "./ShowRoute"; - -const RouteDetail = ({ encoded_route }) => { - const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false); - return ( - <> - - setOpenRouteDetailDialog(true)}> - - - - setOpenRouteDetailDialog(false)} - PaperProps={{ - sx: { - boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", - }, - }} - dir="rtl" - maxWidth={"sm"} - > - مسیر انتخابی - - - - - - - - - - - - - ); -}; -export default RouteDetail; +import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import MapIcon from "@mui/icons-material/Map"; +import MapLayer from "@/core/components/MapLayer"; +import ShowRoute from "./ShowRoute"; + +const RouteDetail = ({ encoded_route }) => { + const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false); + return ( + <> + + setOpenRouteDetailDialog(true)}> + + + + setOpenRouteDetailDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"sm"} + > + مسیر انتخابی + + + + + + + + + + + + + ); +}; +export default RouteDetail; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/AlarmText.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/AlarmText.jsx index 0a3be1b..0ddf8a0 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/AlarmText.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/AlarmText.jsx @@ -1,28 +1,28 @@ -import { Box, Typography } from "@mui/material"; - -const AlarmText = ({ isSource }) => { - if (isSource) return null; - return ( - - - با کلیک بر روی مارکر موقعیت را انتخاب کنید - - - ); -}; - -export default AlarmText; +import { Box, Typography } from "@mui/material"; + +const AlarmText = ({ isSource }) => { + if (isSource) return null; + return ( + + + با کلیک بر روی مارکر موقعیت را انتخاب کنید + + + ); +}; + +export default AlarmText; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/DataBox.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/DataBox.jsx index c19cb6f..5768f75 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/DataBox.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/DataBox.jsx @@ -1,53 +1,53 @@ -import { Box, Button, TextField } from "@mui/material"; - -const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => { - if (!isSource) return null; - - return ( - -
- - {isSource && isDest && ( - - )} -
- {isDest && ( -
- - -
- )} - - ); -}; - -export default DataBox; +import { Box, Button, TextField } from "@mui/material"; + +const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => { + if (!isSource) return null; + + return ( + +
+ + {isSource && isDest && ( + + )} +
+ {isDest && ( +
+ + +
+ )} + + ); +}; + +export default DataBox; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/ShowRoute.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/ShowRoute.jsx index 8cc7e90..6827cde 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/ShowRoute.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/ShowRoute.jsx @@ -1,46 +1,46 @@ -import { useEffect, useRef } from "react"; -import { Marker, Polyline, useMap } from "react-leaflet"; -import L from "leaflet"; -import polyline from "@mapbox/polyline"; -import SourceIcon from "@/assets/images/source-icon.svg"; -import DestIcon from "@/assets/images/destination-icon.svg"; - -const ShowRoute = ({ area }) => { - const map = useMap(); - const defaultIconSize = [35, 35]; - - const createCustomIcon = (size, iconUrl) => { - return L.icon({ - iconUrl: iconUrl, - iconSize: size, - iconAnchor: [size[0] / 2, size[1]], - popupAnchor: [0, -size[1]], - }); - }; - - 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]; - useEffect(() => { - if (coords.length > 0) { - map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); - } - }, [area]); - - return ( - <> - - - - - ); -}; - -export default ShowRoute; +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); + const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + + 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/violations/Actions/CreateWithoutProcess/Form/Area/Routing/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/index.jsx index 06e7c9b..49c4651 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/Area/Routing/index.jsx @@ -1,219 +1,219 @@ -import { Marker, Polyline, useMapEvents } from "react-leaflet"; -import L from "leaflet"; -import polyline from "@mapbox/polyline"; -import SourceIcon from "@/assets/images/source-icon.svg"; -import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; -import PrevDestIcon from "@/assets/images/prev-destination-icon.svg"; -import DestIcon from "@/assets/images/destination-icon.svg"; -import { useEffect, useRef, useState } from "react"; -import DataBox from "./DataBox"; -import AlarmText from "./AlarmText"; - -const Routing = ({ setArea, setLocations, locations, area }) => { - const mapPrevSourceMarker = useRef(); - const mapPrevDestMarker = useRef(); - const mapRef = useRef(null); - const defaultIconSize = [35, 35]; - const [isSource, setIsSource] = useState(false); - const [sourcePosition, setSourcePosition] = useState(null); - const [isDest, setIsDest] = useState(false); - const [destPosition, setDestPosition] = useState(null); - const [routeCoords, setRouteCoords] = useState([]); - const [alternateCoords, setAlternateCoords] = useState([]); - const [editingTarget, setEditingTarget] = useState(null); - const [selectedRoute, setSelectedRoute] = useState(null); - - const createCustomIcon = (size, iconUrl) => { - return L.icon({ - iconUrl: iconUrl, - iconSize: size, - iconAnchor: [size[0] / 2, size[1]], - popupAnchor: [0, -size[1]], - }); - }; - - const defaultIcon = createCustomIcon( - defaultIconSize, - isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src - ); - - const prevDestIcon = createCustomIcon( - defaultIconSize, - isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src - ); - - const isMovingSource = !isSource || editingTarget === "source"; - const isMovingDest = isSource && (!isDest || editingTarget === "dest"); - - const map = useMapEvents({ - move(e) { - if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); - if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter()); - }, - movestart() { - if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); - if (isMovingDest && mapPrevDestMarker.current) - mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); - }, - moveend() { - if (isMovingSource) - mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); - if (isMovingDest && mapPrevDestMarker.current) - mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); - }, - }); - - useEffect(() => { - mapRef.current = map; - }, [map]); - - useEffect(() => { - if (locations.length < 2) return; - const restoredSource = { lat: locations[0].lat, lng: locations[0].lon }; - const restoredDest = { lat: locations[1].lat, lng: locations[1].lon }; - setSourcePosition(restoredSource); - setDestPosition(restoredDest); - setIsSource(true); - setIsDest(true); - if (area) { - const decoded = polyline.decode(area, 6); - setRouteCoords(decoded); - setSelectedRoute({ index: "main", coords: decoded }); - setTimeout(() => { - mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); - }, 100); - } else { - fetchRoute(restoredSource, restoredDest); - } - }, []); - - const fetchRoute = async (source, dest) => { - const locs = [ - { lat: source.lat, lon: source.lng }, - { lat: dest.lat, lon: dest.lng }, - ]; - try { - const response = await fetch("https://jouya.141.ir/api/router/drive", { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ locations: locs }), - }); - const data = await response.json(); - const shape = data.trip.legs[0].shape; - setLocations(locs); - setArea(shape); - const decoded = polyline.decode(shape, 6); - setRouteCoords(decoded); - setSelectedRoute({ index: "main", coords: decoded }); - - if (data.alternates?.length > 0) { - const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); - setAlternateCoords(decodedAlternates); - } else { - setAlternateCoords([]); - } - map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); - } catch (error) { - console.error("Routing error:", error); - } - }; - - const handleMarkerClick = async () => { - if (!isSource || editingTarget === "source") { - const clickedPosition = mapPrevSourceMarker.current.getLatLng(); - setSourcePosition(clickedPosition); - setIsSource(true); - setEditingTarget(null); - setRouteCoords([]); - setAlternateCoords([]); - setSelectedRoute(null); - - if (editingTarget === "source" && destPosition) { - await fetchRoute(clickedPosition, destPosition); - } - } - }; - - const handleDestMarkerClick = async () => { - if (!isDest || editingTarget === "dest") { - const clickedPosition = mapPrevDestMarker.current.getLatLng(); - setDestPosition(clickedPosition); - setIsDest(true); - setEditingTarget(null); - - await fetchRoute(sourcePosition, clickedPosition); - } - }; - - const handleEditSource = () => { - setEditingTarget("source"); - setRouteCoords([]); - setAlternateCoords([]); - setSelectedRoute(null); - }; - - const handleEditDest = () => { - setEditingTarget("dest"); - setRouteCoords([]); - setAlternateCoords([]); - setSelectedRoute(null); - }; - - const handleSelectRoute = (index, coords) => { - setSelectedRoute({ index, coords }); - const encoded = polyline.encode(coords, 6); - setArea(encoded); - map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); - }; - - return ( - <> - - - - {isSource && ( - - )} - {alternateCoords.map((coords, index) => ( - handleSelectRoute(index, coords) }} - /> - ))} - {routeCoords.length > 0 && ( - handleSelectRoute("main", routeCoords) }} - /> - )} - - ); -}; - -export default Routing; +import { Marker, Polyline, useMapEvents } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; +import PrevDestIcon from "@/assets/images/prev-destination-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; +import { useEffect, useRef, useState } from "react"; +import DataBox from "./DataBox"; +import AlarmText from "./AlarmText"; + +const Routing = ({ setArea, setLocations, locations, area }) => { + const mapPrevSourceMarker = useRef(); + const mapPrevDestMarker = useRef(); + const mapRef = useRef(null); + const defaultIconSize = [35, 35]; + const [isSource, setIsSource] = useState(false); + const [sourcePosition, setSourcePosition] = useState(null); + const [isDest, setIsDest] = useState(false); + const [destPosition, setDestPosition] = useState(null); + const [routeCoords, setRouteCoords] = useState([]); + const [alternateCoords, setAlternateCoords] = useState([]); + const [editingTarget, setEditingTarget] = useState(null); + const [selectedRoute, setSelectedRoute] = useState(null); + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + const defaultIcon = createCustomIcon( + defaultIconSize, + isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src + ); + + const prevDestIcon = createCustomIcon( + defaultIconSize, + isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src + ); + + const isMovingSource = !isSource || editingTarget === "source"; + const isMovingDest = isSource && (!isDest || editingTarget === "dest"); + + const map = useMapEvents({ + move(e) { + if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); + if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter()); + }, + movestart() { + if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); + }, + moveend() { + if (isMovingSource) + mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); + }, + }); + + useEffect(() => { + mapRef.current = map; + }, [map]); + + useEffect(() => { + if (locations.length < 2) return; + const restoredSource = { lat: locations[0].lat, lng: locations[0].lon }; + const restoredDest = { lat: locations[1].lat, lng: locations[1].lon }; + setSourcePosition(restoredSource); + setDestPosition(restoredDest); + setIsSource(true); + setIsDest(true); + if (area) { + const decoded = polyline.decode(area, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + setTimeout(() => { + mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + }, 100); + } else { + fetchRoute(restoredSource, restoredDest); + } + }, []); + + const fetchRoute = async (source, dest) => { + const locs = [ + { lat: source.lat, lon: source.lng }, + { lat: dest.lat, lon: dest.lng }, + ]; + try { + const response = await fetch("https://jouya.141.ir/api/router/drive", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ locations: locs }), + }); + const data = await response.json(); + const shape = data.trip.legs[0].shape; + setLocations(locs); + setArea(shape); + const decoded = polyline.decode(shape, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + + if (data.alternates?.length > 0) { + const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); + setAlternateCoords(decodedAlternates); + } else { + setAlternateCoords([]); + } + map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + } catch (error) { + console.error("Routing error:", error); + } + }; + + const handleMarkerClick = async () => { + if (!isSource || editingTarget === "source") { + const clickedPosition = mapPrevSourceMarker.current.getLatLng(); + setSourcePosition(clickedPosition); + setIsSource(true); + setEditingTarget(null); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + + if (editingTarget === "source" && destPosition) { + await fetchRoute(clickedPosition, destPosition); + } + } + }; + + const handleDestMarkerClick = async () => { + if (!isDest || editingTarget === "dest") { + const clickedPosition = mapPrevDestMarker.current.getLatLng(); + setDestPosition(clickedPosition); + setIsDest(true); + setEditingTarget(null); + + await fetchRoute(sourcePosition, clickedPosition); + } + }; + + const handleEditSource = () => { + setEditingTarget("source"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleEditDest = () => { + setEditingTarget("dest"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleSelectRoute = (index, coords) => { + setSelectedRoute({ index, coords }); + const encoded = polyline.encode(coords, 6); + setArea(encoded); + map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); + }; + + return ( + <> + + + + {isSource && ( + + )} + {alternateCoords.map((coords, index) => ( + handleSelectRoute(index, coords) }} + /> + ))} + {routeCoords.length > 0 && ( + handleSelectRoute("main", routeCoords) }} + /> + )} + + ); +}; + +export default Routing; diff --git a/src/components/dashboard/roadPatrols/reports/index.jsx b/src/components/dashboard/roadPatrols/reports/index.jsx index a77efac..0731eb6 100644 --- a/src/components/dashboard/roadPatrols/reports/index.jsx +++ b/src/components/dashboard/roadPatrols/reports/index.jsx @@ -5,7 +5,7 @@ import SearchReportList from "./Search"; import { useEffect, useState } from "react"; import ReportLists from "./ReportLists"; import useRequest from "@/lib/hooks/useRequest"; -import { GET_CITY_ACTIVITY_REPORT, GET_PROVINCE_ACTIVITY_REPORT } from "@/core/utils/routes"; +import { GET_COUNTRY_ACTIVITY_REPORT, GET_PROVINCE_ACTIVITY_REPORT } from "@/core/utils/routes"; import moment from "jalali-moment"; import * as yup from "yup"; import { useForm } from "react-hook-form"; @@ -70,7 +70,7 @@ const ReportPage = () => { } else { try { params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_CITY_ACTIVITY_REPORT}?${params}`); + const response = await requestServer(`${GET_COUNTRY_ACTIVITY_REPORT}?${params}`); const result = response.data.data; const nationalReportForItem = result.activities.find((report) => report.edare_id === "-1"); const nationalReport = { From c6283ae1301b2fe5a2441baf6ed75d96eb11d1ef Mon Sep 17 00:00:00 2001 From: baslani Date: Sat, 13 Jun 2026 14:03:47 +0330 Subject: [PATCH 18/35] [wip] implementing machines reports --- jsconfig.json | 38 +++--- .../reports/machinesReports/page.js | 18 +++ .../machinesReports/ExcelPrint/index.jsx | 77 +++++++++++++ .../machinesReports/MachinesReportsList.jsx | 78 +++++++++++++ .../Search/FromDateController.jsx | 27 +++++ .../Search/SearchReportField.jsx | 44 +++++++ .../machinesReports/Search/SelectProvince.jsx | 45 ++++++++ .../Search/ToDateController.jsx | 30 +++++ .../reports/machinesReports/Search/index.jsx | 13 +++ .../reports/machinesReports/Toolbar.jsx | 11 ++ .../reports/machinesReports/index.jsx | 109 ++++++++++++++++++ src/core/utils/pageMenu.js | 9 ++ src/core/utils/pageMenuDev.js | 9 ++ src/core/utils/routes.js | 6 + 14 files changed, 495 insertions(+), 19 deletions(-) create mode 100644 src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machinesReports/page.js create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/ExcelPrint/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/Search/FromDateController.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/Search/SearchReportField.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/Search/SelectProvince.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/Search/ToDateController.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/Search/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/Toolbar.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/index.jsx diff --git a/jsconfig.json b/jsconfig.json index b51472a..c136578 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,27 +1,27 @@ // javascript for production -{ - "compilerOptions": { - "paths": { - "@/*": ["./src/*"], - "^/*": ["./public/*"] - } - } -} - -// typescript for local development // { // "compilerOptions": { -// "jsx": "react-jsx", -// "noUnusedLocals": true, -// "noImplicitAny": false, -// "checkJs": true, -// "allowJs": true, -// "strict": true, -// "baseUrl": ".", // "paths": { // "@/*": ["./src/*"], // "^/*": ["./public/*"] // } -// }, -// "exclude": ["node_modules"] +// } // } + +// typescript for local development +{ + "compilerOptions": { + "jsx": "react-jsx", + "noUnusedLocals": true, + "noImplicitAny": false, + "checkJs": true, + "allowJs": true, + "strict": true, + "baseUrl": ".", + "paths": { + "@/*": ["./src/*"], + "^/*": ["./public/*"] + } + }, + "exclude": ["node_modules"] +} diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machinesReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machinesReports/page.js new file mode 100644 index 0000000..0656840 --- /dev/null +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machinesReports/page.js @@ -0,0 +1,18 @@ +import MachinesReportsPage from "@/components/dashboard/roadMissions/reports/machinesReports"; +import WithPermission from "@/core/middlewares/withPermission"; + +export const metadata = { + title: "کارتابل گزارش ماشین‌ها", +}; + +export default function Page() { + return ( + + + + ); +} diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/ExcelPrint/index.jsx new file mode 100644 index 0000000..ef85a7f --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/ExcelPrint/index.jsx @@ -0,0 +1,77 @@ +"use client"; +import { + EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT, + EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT, +} from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import { useTheme } from "@emotion/react"; +import DescriptionIcon from "@mui/icons-material/Description"; +import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material"; +import FileSaver from "file-saver"; +import moment from "jalali-moment"; +import { useMemo, useState } from "react"; + +const PrintExcel = ({ table, filterData }) => { + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down("sm")); + const [loading, setLoading] = useState(false); + const requestServer = useRequest({ notificationSuccess: true }); + const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => { + if (filter.value) { + acc.push({ id: filter.id, value: filter.value }); + } + return acc; + }, []); + + const filterParams = useMemo(() => { + const params = new URLSearchParams(); + activeFilters.length > 0 && + activeFilters.map((filter, index) => { + params.set(`${filter.id}`, filter.value); + }); + return params; + }, [activeFilters]); + + const clickHandler = () => { + setLoading(true); + const CountryOrProvince = activeFilters.find((item) => item.id === "province_id"); + const requestUrl = + CountryOrProvince.value === "-1" + ? EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT + : EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT; + requestServer(`${requestUrl}?${filterParams}`, "get", { + requestOptions: { responseType: "blob" }, + }) + .then((response) => { + const filename = `خروجی کارتابل گزارشات گشت راهداری تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`; + FileSaver.saveAs(response.data, filename); + }) + .catch(() => {}) + .finally(() => { + setLoading(false); + }); + }; + + return ( + <> + {isMobile ? ( + + + + ) : ( + + )} + + ); +}; +export default PrintExcel; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx new file mode 100644 index 0000000..4eaae92 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx @@ -0,0 +1,78 @@ +"use client"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; +import Toolbar from "./Toolbar"; + +const MachinesReportsList = ({ data, specialFilter }) => { + const columns = useMemo(() => { + return [ + { + accessorKey: "machine_id", + header: "کد یکتا", + id: "machine_id", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "car_name", + header: "مدل ماشین", + id: "car_name", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "machine_code", + header: "کد ماشین", + id: "machine_code", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "func", + header: "کارکرد", + id: "func", + enableColumnFilter: false, + enableSorting: false, + datatype: "number", + grow: false, + size: 50, + }, + { + accessorKey: "missions", + header: "تعداد ماموریت", + id: "missions", + enableColumnFilter: false, + enableSorting: false, + datatype: "number", + grow: false, + size: 50, + }, + ]; + }, []); + + return ( + + + + ); +}; + +export default MachinesReportsList; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Search/FromDateController.jsx new file mode 100644 index 0000000..490ee7b --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/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/machinesReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Search/SearchReportField.jsx new file mode 100644 index 0000000..bde2a4c --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/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 && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +export default SearchReportField; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Search/SelectProvince.jsx new file mode 100644 index 0000000..2b24d67 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/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/machinesReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Search/ToDateController.jsx new file mode 100644 index 0000000..fc4a776 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/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/machinesReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Search/index.jsx new file mode 100644 index 0000000..f29d302 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/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/machinesReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Toolbar.jsx new file mode 100644 index 0000000..0f726c7 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/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/machinesReports/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/index.jsx new file mode 100644 index 0000000..594fdb1 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/index.jsx @@ -0,0 +1,109 @@ +"use client"; +import PageTitle from "@/core/components/PageTitle"; +import { GET_MACHINES_COUNTRY_ACTIVITY_REPORT, GET_MACHINES_PROVINCE_ACTIVITY_REPORT } from "@/core/utils/routes"; +import { useAuth } from "@/lib/contexts/auth"; +import { usePermissions } from "@/lib/hooks/usePermissions"; +import useRequest from "@/lib/hooks/useRequest"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { LinearProgress, Stack } from "@mui/material"; +import moment from "jalali-moment"; +import { useEffect, useState } from "react"; +import { useForm } from "react-hook-form"; +import * as yup from "yup"; +import MachinesReportsList from "./MachinesReportsList"; +import SearchReportList from "./Search"; + +const MachinesReportsPage = () => { + const [data, setData] = useState(null); + const { data: userPermissions } = usePermissions(); + const { user } = useAuth(); + const requestServer = useRequest(); + const hasProvincesPermission = userPermissions?.includes("mission-report-country"); + + const defaultValues = { + from_date: moment(new Date()).format("YYYY-MM-DD"), + date_to: moment(new Date()).format("YYYY-MM-DD"), + province_id: user.province_id || "-1", + }; + const defaultFilter = [ + { value: `${defaultValues.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, + { value: `${defaultValues.from_date}`, datatype: "date", id: "from_date", fn: "between" }, + { value: `${defaultValues.date_to}`, datatype: "date", id: "date_to", fn: "between" }, + ]; + const [specialFilter, setSpecialFilter] = useState(defaultFilter); + + const onSearchSubmit = async (data) => { + const params = new URLSearchParams(); + params.set("from_date", `${data.from_date} 00:00:00`); + params.set("date_to", `${data.date_to} 23:59:59`); + setSpecialFilter([ + { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, + { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" }, + { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" }, + ]); + if (data.province_id === "-1") { + try { + const response = await requestServer(`${GET_MACHINES_COUNTRY_ACTIVITY_REPORT}?${params}`); + const result = response.data.data; + + setData({ + data: result.activities, + filters: data, + }); + } catch (e) {} + } else { + try { + params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MACHINES_PROVINCE_ACTIVITY_REPORT}?${params}`); + + const result = response.data.data; + + setData({ + data: result.activities, + filters: data, + }); + } catch (e) {} + } + }; + + useEffect(() => { + if (!userPermissions) return; + onSearchSubmit(defaultValues); + }, [userPermissions]); + + const validationSchema = yup.object().shape({ + from_date: yup + .string() + .required("تاریخ شروع الزامی است!") + .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ شروع الزامی است!") + .test("is-valid-date", "تاریخ شروع معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), + date_to: yup + .string() + .required("تاریخ پایان الزامی است!") + .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ پایان الزامی است!") + .test("is-valid-date", "تاریخ پایان معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), + province_id: yup.string().nullable(), + }); + + const { control, handleSubmit } = useForm({ + defaultValues, + resolver: yupResolver(validationSchema), + mode: "all", + }); + + console.log(data); + + return ( + + + + {!data ? : } + + ); +}; +export default MachinesReportsPage; diff --git a/src/core/utils/pageMenu.js b/src/core/utils/pageMenu.js index 99366c4..bd24701 100644 --- a/src/core/utils/pageMenu.js +++ b/src/core/utils/pageMenu.js @@ -192,6 +192,15 @@ export const pageMenu = [ badges: [{ key: "mission.request_portal" }], permissions: ["all"], }, + { + id: "machinesReports", + label: "ماشین‌ها", + icon: , + type: "page", + route: "/dashboard/road-missions/reports/machinesReports", + badges: [{ key: "mission.request_portal" }], + permissions: ["all"], + }, ], }, ], diff --git a/src/core/utils/pageMenuDev.js b/src/core/utils/pageMenuDev.js index 4bc0665..ab888c7 100644 --- a/src/core/utils/pageMenuDev.js +++ b/src/core/utils/pageMenuDev.js @@ -190,6 +190,15 @@ export const pageMenuDev = [ badges: [{ key: "mission.request_portal" }], permissions: ["all"], }, + { + id: "machinesReports", + label: "ماشین‌ها", + icon: , + type: "page", + route: "/dashboard/road-missions/reports/machinesReports", + badges: [{ key: "mission.request_portal" }], + permissions: ["all"], + }, ], }, ], diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index c970699..2bac1c4 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -247,6 +247,12 @@ export const FINISH_MISSION = api + "/api/v3/missions/control_unit/finish"; export const GET_ROAD_MISSIONS_VIOLATIONS_LIST = api + "/api/v3/missions/violation_management"; export const GET_MISSION_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/missions/report/country_activity"; export const GET_MISSION_CITY_ACTIVITY_REPORT = api + "/api/v3/missions/report/country_activity"; +export const GET_MACHINES_COUNTRY_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/country_machines_activity"; +export const GET_MACHINES_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/province_machines_activity"; +export const EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT = + api + "/api/v3/missions/report_machine/country_machines_activity_excel"; +export const EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT = + api + "/api/v3/missions/report_machine/province_machines_activity_excel"; export const CREATE_VIOLATION = api + "/api/v3/missions/violation_management"; export const EDIT_VIOLATION = api + "/api/v3/missions/violation_management"; export const EXPORT_COUNTRY_ROAD_MISSIONS_REPORTS = api + "/api/v3/missions/report/country_excel_activity"; From 1261c9dcc239921c6efac59bfcbf3f69da004cfa Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sat, 13 Jun 2026 15:09:12 +0330 Subject: [PATCH 19/35] operator violations page --- .../operator/Actions/Violations/Dialog.jsx | 28 ++ .../Form/Area/Routing/AlarmText.jsx | 28 ++ .../Form/Area/Routing/DataBox.jsx | 53 ++++ .../Form/Area/Routing/ShowRoute.jsx | 46 +++ .../Form/Area/Routing/index.jsx | 219 ++++++++++++++ .../MissionCorrection/Form/Area/index.jsx | 43 +++ .../Form/GetDateTime/MissionDates/index.jsx | 119 ++++++++ .../Form/GetDateTime/index.jsx | 59 ++++ .../Dialog/List/RowActions/SelectId/index.jsx | 20 ++ .../Dialog/List/RowActions/index.jsx | 10 + .../FastReactCode/Dialog/List/index.jsx | 274 ++++++++++++++++++ .../FastReactCode/Dialog/index.jsx | 49 ++++ .../Form/GetItemInfo/FastReactCode/index.jsx | 22 ++ .../Form/GetItemInfo/index.jsx | 150 ++++++++++ .../DriversSearch/Form/index.jsx | 61 ++++ .../DriversDialog/DriversSearch/index.jsx | 11 + .../MachineAndDriver/DriversDialog/index.jsx | 41 +++ .../MachineList/RowActions/Allocate/index.jsx | 20 ++ .../MachineList/RowActions/index.jsx | 6 + .../MachinesDialog/MachineList/index.jsx | 68 +++++ .../MachineAndDriver/MachinesDialog/index.jsx | 40 +++ .../Form/MachineAndDriver/index.jsx | 48 +++ .../Form/Rahdaran/Form/index.jsx | 66 +++++ .../Form/Rahdaran/List/index.jsx | 56 ++++ .../MissionCorrection/Form/Rahdaran/index.jsx | 36 +++ .../MissionCorrection/Form/Verify/index.jsx | 128 ++++++++ .../MissionCorrection/Form/index.jsx | 114 ++++++++ .../RowActions/MissionCorrection/index.jsx | 86 ++++++ .../Actions/Violations/RowActions/index.jsx | 9 + .../Actions/Violations/ViolationsList.jsx | 141 +++++++++ .../operator/Actions/Violations/index.jsx | 33 +++ .../RowActions/ChangeStatus/Dialog.jsx | 26 ++ .../operator/RowActions/ChangeStatus/Form.jsx | 111 +++++++ .../RowActions/ChangeStatus/index.jsx | 19 ++ .../operator/RowActions/index.jsx | 5 + .../roadMissions/operator/Toolbar.jsx | 2 + .../Form/MachinesDialog/MachineList/index.jsx | 32 ++ .../CreateWithoutProcess/Form/index.jsx | 17 +- .../violations/RowActions/index.jsx | 6 +- src/core/components/RahdarNameOrCode.jsx | 2 +- src/core/utils/routes.js | 3 + 41 files changed, 2289 insertions(+), 18 deletions(-) create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/AlarmText.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/DataBox.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/ShowRoute.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/MissionDates/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/SelectId/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/Form/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/Allocate/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/Form/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Verify/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Dialog.jsx create mode 100644 src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Form.jsx create mode 100644 src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/index.jsx diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx new file mode 100644 index 0000000..bd3849a --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx @@ -0,0 +1,28 @@ +import { Close } from "@mui/icons-material"; +import { Dialog, DialogTitle, IconButton } from "@mui/material"; +import ViolationsList from "./ViolationsList"; + +const ViolationsDialog = ({ open, setOpen, mutate, row }) => { + return ( + + setOpen(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + تخلفات + {open && ( + + )} + + ); +}; +export default ViolationsDialog; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/AlarmText.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/AlarmText.jsx new file mode 100644 index 0000000..0ddf8a0 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/AlarmText.jsx @@ -0,0 +1,28 @@ +import { Box, Typography } from "@mui/material"; + +const AlarmText = ({ isSource }) => { + if (isSource) return null; + return ( + + + با کلیک بر روی مارکر موقعیت را انتخاب کنید + + + ); +}; + +export default AlarmText; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/DataBox.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/DataBox.jsx new file mode 100644 index 0000000..5768f75 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/DataBox.jsx @@ -0,0 +1,53 @@ +import { Box, Button, TextField } from "@mui/material"; + +const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => { + if (!isSource) return null; + + return ( + +
+ + {isSource && isDest && ( + + )} +
+ {isDest && ( +
+ + +
+ )} + + ); +}; + +export default DataBox; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/ShowRoute.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/ShowRoute.jsx new file mode 100644 index 0000000..6827cde --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/ShowRoute.jsx @@ -0,0 +1,46 @@ +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); + const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + + 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/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/index.jsx new file mode 100644 index 0000000..49c4651 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/index.jsx @@ -0,0 +1,219 @@ +import { Marker, Polyline, useMapEvents } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; +import PrevDestIcon from "@/assets/images/prev-destination-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; +import { useEffect, useRef, useState } from "react"; +import DataBox from "./DataBox"; +import AlarmText from "./AlarmText"; + +const Routing = ({ setArea, setLocations, locations, area }) => { + const mapPrevSourceMarker = useRef(); + const mapPrevDestMarker = useRef(); + const mapRef = useRef(null); + const defaultIconSize = [35, 35]; + const [isSource, setIsSource] = useState(false); + const [sourcePosition, setSourcePosition] = useState(null); + const [isDest, setIsDest] = useState(false); + const [destPosition, setDestPosition] = useState(null); + const [routeCoords, setRouteCoords] = useState([]); + const [alternateCoords, setAlternateCoords] = useState([]); + const [editingTarget, setEditingTarget] = useState(null); + const [selectedRoute, setSelectedRoute] = useState(null); + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + const defaultIcon = createCustomIcon( + defaultIconSize, + isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src + ); + + const prevDestIcon = createCustomIcon( + defaultIconSize, + isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src + ); + + const isMovingSource = !isSource || editingTarget === "source"; + const isMovingDest = isSource && (!isDest || editingTarget === "dest"); + + const map = useMapEvents({ + move(e) { + if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); + if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter()); + }, + movestart() { + if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); + }, + moveend() { + if (isMovingSource) + mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); + }, + }); + + useEffect(() => { + mapRef.current = map; + }, [map]); + + useEffect(() => { + if (locations.length < 2) return; + const restoredSource = { lat: locations[0].lat, lng: locations[0].lon }; + const restoredDest = { lat: locations[1].lat, lng: locations[1].lon }; + setSourcePosition(restoredSource); + setDestPosition(restoredDest); + setIsSource(true); + setIsDest(true); + if (area) { + const decoded = polyline.decode(area, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + setTimeout(() => { + mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + }, 100); + } else { + fetchRoute(restoredSource, restoredDest); + } + }, []); + + const fetchRoute = async (source, dest) => { + const locs = [ + { lat: source.lat, lon: source.lng }, + { lat: dest.lat, lon: dest.lng }, + ]; + try { + const response = await fetch("https://jouya.141.ir/api/router/drive", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ locations: locs }), + }); + const data = await response.json(); + const shape = data.trip.legs[0].shape; + setLocations(locs); + setArea(shape); + const decoded = polyline.decode(shape, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + + if (data.alternates?.length > 0) { + const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); + setAlternateCoords(decodedAlternates); + } else { + setAlternateCoords([]); + } + map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + } catch (error) { + console.error("Routing error:", error); + } + }; + + const handleMarkerClick = async () => { + if (!isSource || editingTarget === "source") { + const clickedPosition = mapPrevSourceMarker.current.getLatLng(); + setSourcePosition(clickedPosition); + setIsSource(true); + setEditingTarget(null); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + + if (editingTarget === "source" && destPosition) { + await fetchRoute(clickedPosition, destPosition); + } + } + }; + + const handleDestMarkerClick = async () => { + if (!isDest || editingTarget === "dest") { + const clickedPosition = mapPrevDestMarker.current.getLatLng(); + setDestPosition(clickedPosition); + setIsDest(true); + setEditingTarget(null); + + await fetchRoute(sourcePosition, clickedPosition); + } + }; + + const handleEditSource = () => { + setEditingTarget("source"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleEditDest = () => { + setEditingTarget("dest"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleSelectRoute = (index, coords) => { + setSelectedRoute({ index, coords }); + const encoded = polyline.encode(coords, 6); + setArea(encoded); + map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); + }; + + return ( + <> + + + + {isSource && ( + + )} + {alternateCoords.map((coords, index) => ( + handleSelectRoute(index, coords) }} + /> + ))} + {routeCoords.length > 0 && ( + handleSelectRoute("main", routeCoords) }} + /> + )} + + ); +}; + +export default Routing; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/index.jsx new file mode 100644 index 0000000..200c1e0 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/index.jsx @@ -0,0 +1,43 @@ +import MapLoading from "@/core/components/MapLayer/Loading"; +import { Box, Button, DialogActions, DialogContent, Stack } from "@mui/material"; +import dynamic from "next/dynamic"; +import { useCallback, useState } from "react"; +import Routing from "./Routing"; +const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { + loading: () => , + ssr: false, +}); + +const Area = ({ allData, setAllData, handlePrev, setTabState }) => { + const [area, setArea] = useState(allData.area); + const [locations, setLocations] = useState(allData.locations); + + const handleNext = useCallback(() => { + setAllData({ area: area }); + setAllData({ locations: locations }); + setTabState((s) => s + 1); + }, [area]); + + return ( + <> + + + + + + + + + + + + + + + ); +}; +export default Area; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/MissionDates/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/MissionDates/index.jsx new file mode 100644 index 0000000..56752de --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/MissionDates/index.jsx @@ -0,0 +1,119 @@ +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import MuiTimePicker from "@/core/components/MuiTimePicker"; +import { makeDateTime } from "@/core/utils/makeDateTime"; +import { Grid } from "@mui/material"; +import { Controller, useWatch } from "react-hook-form"; + +const MissionDates = ({ control }) => { + const start_date = useWatch({ control, name: "start_date" }); + const end_date = useWatch({ control, name: "end_date" }); + const start_time = useWatch({ control, name: "start_time" }); + const end_time = useWatch({ control, name: "end_time" }); + + const startDateTime = makeDateTime(start_date, start_time); + const endDateTime = makeDateTime(end_date, end_time); + const now = new Date(); + + return ( + <> + + ( + field.onChange(value || null)} + helperText={error ? error.message : null} + /> + )} + /> + + + { + return ( + field.onChange(value || null)} + helperText={error ? error.message : null} + /> + ); + }} + /> + + + ( + field.onChange(value || null)} + helperText={error ? error.message : null} + /> + )} + /> + + + { + return ( + field.onChange(value || null)} + helperText={error ? error.message : null} + /> + ); + }} + /> + + + ); +}; + +export default MissionDates; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/index.jsx new file mode 100644 index 0000000..1b096e9 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/index.jsx @@ -0,0 +1,59 @@ +import SelectBox from "@/core/components/SelectBox"; +import StyledForm from "@/core/components/StyledForm"; +import { missionTypes } from "@/core/utils/missionTypes"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { Box, Button, DialogActions, DialogContent, Grid, Stack } from "@mui/material"; +import moment from "jalali-moment"; +import { Controller, useForm } from "react-hook-form"; +import { object, string } from "yup"; +import MissionDates from "./MissionDates"; + +const validationSchema = object({ + start_date: string().required("تاریخ شروع ماموریت را مشخص کنید!"), + start_time: string().required("زمان شروع ماموریت را مشخص کنید!"), + end_date: string().required("تاریخ پایان ماموریت را مشخص کنید!"), + end_time: string().required("زمان شروع ماموریت را مشخص کنید!"), +}); + +const GetDateTime = ({ allData, setAllData, handlePrev, setTabState }) => { + const defaultValues = { + start_date: allData.start_date, + start_time: allData.start_time ? moment(allData.start_time).toDate() : null, + end_date: allData.end_date, + end_time: allData.end_time ? moment(allData.end_time).toDate() : null, + }; + + const { control, handleSubmit } = useForm({ + defaultValues, + resolver: yupResolver(validationSchema), + mode: "all", + }); + + const handleNext = (data) => { + setAllData(data); + setTabState((s) => s + 1); + }; + + return ( + + + + + + + + + + + + + + + + ); +}; +export default GetDateTime; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/SelectId/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/SelectId/index.jsx new file mode 100644 index 0000000..e3e14c0 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/SelectId/index.jsx @@ -0,0 +1,20 @@ +import { Done } from "@mui/icons-material"; +import { IconButton, Tooltip } from "@mui/material"; + +const SelectId = ({ row, onChange, setOpenFastReactDialog }) => { + const handleClick = () => { + onChange(row.original.id); + setOpenFastReactDialog(false); + }; + + return ( + <> + + + + + + + ); +}; +export default SelectId; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/index.jsx new file mode 100644 index 0000000..646104b --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/index.jsx @@ -0,0 +1,10 @@ +import SelectId from "./SelectId"; + +const RowActions = ({ row, onChange, setOpenFastReactDialog }) => { + return ( + <> + + + ); +}; +export default RowActions; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/index.jsx new file mode 100644 index 0000000..8940335 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/index.jsx @@ -0,0 +1,274 @@ +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { GET_FAST_REACT_COMPLAINTS } from "@/core/utils/routes"; +import { Box, Stack, Typography } from "@mui/material"; +import { useMemo } from "react"; +import RowActions from "./RowActions"; +import { usePermissions } from "@/lib/hooks/usePermissions"; +import { useAuth } from "@/lib/contexts/auth"; +import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; +import DescriptionForm from "@/components/dashboard/fastReact/complaintList/RowActions/DescriptionDialog"; +import LocationForm from "@/components/dashboard/fastReact/complaintList/RowActions/LocationDialog"; +import moment from "jalali-moment"; +import useProvinces from "@/lib/hooks/useProvince"; +import useEdaratLists from "@/lib/hooks/useEdaratLists"; + +const FastReactList = ({ onChange, setOpenFastReactDialog }) => { + const { data: userPermissions } = usePermissions(); + const hasCountryPermission = userPermissions?.includes("show-fast-react"); + const { user } = useAuth(); + const columns = useMemo(() => { + const dynamicColumns = { + header: "استان", + id: "road_observeds__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 ( + + ); + }, + Cell: ({ row }) => <>{row.original.province_fa}, + }; + return [ + { + accessorKey: "id", + header: "کد یکتا", + id: "road_observeds__id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + ...(hasCountryPermission ? [dynamicColumns] : []), + { + header: "اداره", + id: "road_observeds__edarate_shahri_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + dependencyId: hasCountryPermission ? "road_observeds__province_id" : null, + grow: false, + size: 120, + ColumnSelectComponent: (props) => { + const { edaratList, loadingEdaratList, errorEdaratList } = useEdaratLists( + hasCountryPermission ? props.dependencyFieldValue.value : user.province_id + ); + const [prevDependency, setPrevDependency] = useState( + hasCountryPermission ? props.dependencyFieldValue.value : user.province_id + ); + + const getColumnSelectOptions = useMemo(() => { + if (hasCountryPermission && props.dependencyFieldValue.value === "") { + return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }]; + } + if (loadingEdaratList) { + return [{ value: "loading", label: "در حال بارگذاری..." }]; + } + if (errorEdaratList) { + return [{ value: "error", label: "خطا در بارگذاری" }]; + } + return [ + { value: "", label: "کل ادارات" }, + ...edaratList.map((edare) => ({ + value: edare.id, + label: edare.name_fa, + })), + ]; + }, [edaratList, loadingEdaratList, errorEdaratList]); + useEffect(() => { + if (hasCountryPermission) return; + if (prevDependency === props.dependencyFieldValue?.value) return; + props.handleChange({ ...props.filterParameters, value: "" }); + setPrevDependency(props.dependencyFieldValue?.value); + }, [props.dependencyFieldValue?.value, hasCountryPermission]); + return ( + + ); + }, + Cell: ({ row }) => <>{row.original.edarate_shahri_name_fa}, + }, + { + header: "اطلاعات ثبت‌ شده در سامانه سوانح", + id: "fkInfo", + enableColumnFilter: false, + enableSorting: false, + grow: false, + size: 50, + columns: [ + { + accessorKey: "fk_RegisteredEventMessage", + header: "کد سوانح", + id: "fk_RegisteredEventMessage", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "Title", + header: "موضوع گزارش", + id: "Title", + enableColumnFilter: false, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "FeatureTypeTitle", + header: "نوع گزارش", + id: "FeatureTypeTitle", + enableColumnFilter: false, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "Description", + header: "توضیح گزارش", + id: "Description", + enableColumnFilter: false, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + muiTableBodyCellProps: { + sx: { + borderLeft: "1px solid #e1e1e1", + py: 0, + "&:first-of-type": { + borderLeft: "unset", + }, + }, + }, + Cell: ({ renderedCellValue }) => { + if (renderedCellValue) { + return ( + + + + ); + } + return -; + }, + }, + { + header: "موقعیت", + id: "location", + enableColumnFilter: false, + enableSorting: false, + datatype: "array", + grow: false, + size: 100, + muiTableBodyCellProps: { + sx: { + borderLeft: "1px solid #e1e1e1", + py: 0, + "&:first-of-type": { + borderLeft: "unset", + }, + }, + }, + Cell: ({ row }) => { + return ( + + + + ); + }, + }, + { + accessorKey: "MobileForSendEventSms", + header: "شماره تماس گیرنده", + id: "MobileForSendEventSms", + enableColumnFilter: false, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorFn: (row) => moment(row.StartTime_DateTime).locale("fa").format("HH:mm | yyyy/MM/DD"), + header: "تاریخ ثبت", + id: "StartTime_DateTime", + enableColumnFilter: true, + datatype: "date", + filterMode: "between", + grow: false, + size: 100, + }, + ], + }, + ]; + }, []); + + return ( + <> + + ( + + )} + /> + + + ); +}; +export default FastReactList; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/index.jsx new file mode 100644 index 0000000..d7af56d --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/index.jsx @@ -0,0 +1,49 @@ +import { Close, Edit } from "@mui/icons-material"; +import { Button, Chip, Dialog, Divider, IconButton } from "@mui/material"; +import FastReactList from "./List"; +import { useState, forwardRef } from "react"; + +const FastReactDialog = forwardRef(({ onChange, value }, ref) => { + const [openFastReactDialog, setOpenFastReactDialog] = useState(false); + + return ( + <> + + {value === "" ? ( + + ) : ( + } + onDelete={() => setOpenFastReactDialog(true)} + /> + )} + + + setOpenFastReactDialog(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + {openFastReactDialog && ( + + )} + + + ); +}); + +FastReactDialog.displayName = "FastReactDialog"; + +export default FastReactDialog; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/index.jsx new file mode 100644 index 0000000..1f507c9 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/index.jsx @@ -0,0 +1,22 @@ +import { Divider, Stack } from "@mui/material"; +import { Controller, useWatch } from "react-hook-form"; +import FastReactDialog from "./Dialog"; + +const FastReactCode = ({ control }) => { + const category_id = useWatch({ control, name: "category_id" }); + + if (category_id != 3) return null; + + return ( + ( + + + + )} + /> + ); +}; +export default FastReactCode; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/index.jsx new file mode 100644 index 0000000..666b1f9 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/index.jsx @@ -0,0 +1,150 @@ +import PersianTextField from "@/core/components/PersianTextField"; +import SelectBox from "@/core/components/SelectBox"; +import StyledForm from "@/core/components/StyledForm"; +import { missionCategoryTypes } from "@/core/utils/missionCategoryTypes"; +import { missionRegions } from "@/core/utils/missionRegions"; +import { yupResolver } from "@hookform/resolvers/yup"; +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"; + +const validationSchema = object({ + explanation: string().required("موضوع را مشخص کنید!"), + end_point: string().required("مقصد را مشخص کنید!"), + region: string().required("محور ماموریت را مشخص کنید!"), + category_id: string().required("نوع ماموریت را مشخص کنید!"), + road_observed_id: string().when("category_id", { + is: "3", + then: (schema) => schema.required("کد یکتا شکایت را مشخص کنید!"), + otherwise: (schema) => schema.notRequired(), + }), +}); + +const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => { + const defaultValues = { + explanation: allData.explanation, + end_point: allData.end_point, + region: allData.region, + category_id: allData.category_id, + road_observed_id: allData.road_observed_id, + }; + + const { control, handleSubmit } = useForm({ + defaultValues, + resolver: yupResolver(validationSchema), + mode: "all", + }); + + const handleNext = (data) => { + setAllData(data); + setTabState((s) => s + 1); + }; + + return ( + + + + + + + ( + + )} + /> + + + ( + + )} + /> + + + ( + + )} + /> + + + { + return ( + + ); + }} + /> + + + + + + + + + + + ); +}; +export default GetItemInfo; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/Form/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/Form/index.jsx new file mode 100644 index 0000000..9dbe4ed --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/Form/index.jsx @@ -0,0 +1,61 @@ +import RahdarNameOrCode from "@/core/components/RahdarNameOrCode"; +import StyledForm from "@/core/components/StyledForm"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { Done } from "@mui/icons-material"; +import { Button, Stack } from "@mui/material"; +import { Controller, useForm } from "react-hook-form"; +import { object } from "yup"; + +const schema = object().shape({ + rahdar: object().required("همراه الزامی است."), +}); +const DriverForm = ({ setDriver, setOpenDriversDialog }) => { + const defaultValues = { + rahdar: null, + }; + + const { + control, + handleSubmit, + formState: { isSubmitting, isValid }, + } = useForm({ defaultValues, resolver: yupResolver(schema), mode: "all" }); + + const submit = (data) => { + setDriver(data.rahdar); + setOpenDriversDialog(false); + }; + + return ( + + + + { + return ( + field.onChange(value)} + error={error} + multiple={false} + /> + ); + }} + name={"rahdar"} + /> + + + + + ); +}; +export default DriverForm; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/index.jsx new file mode 100644 index 0000000..2abc9ea --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/index.jsx @@ -0,0 +1,11 @@ +import { DialogContent } from "@mui/material"; +import DriverForm from "./Form"; + +const DriversSearch = ({ setDriver, setOpenDriversDialog }) => { + return ( + + + + ); +}; +export default DriversSearch; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/index.jsx new file mode 100644 index 0000000..a2ef166 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/index.jsx @@ -0,0 +1,41 @@ +import { Close, Edit } from "@mui/icons-material"; +import { Button, Dialog, DialogTitle, IconButton } from "@mui/material"; +import { useState } from "react"; +import DriversSearch from "./DriversSearch"; + +const DriversDialog = ({ setDriver, mode = "" }) => { + const [openDriversDialog, setOpenDriversDialog] = useState(false); + return ( + <> + {mode == "edit" ? ( + setOpenDriversDialog(true)} size="small"> + + + ) : ( + + )} + + setOpenDriversDialog(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + انتخاب راننده + {openDriversDialog && ( + + )} + + + ); +}; +export default DriversDialog; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/Allocate/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/Allocate/index.jsx new file mode 100644 index 0000000..9718815 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/Allocate/index.jsx @@ -0,0 +1,20 @@ +import { Done } from "@mui/icons-material"; +import { IconButton, Tooltip } from "@mui/material"; + +const Allocate = ({ row, setMachine, setOpenMachinesDialog }) => { + const handleClick = () => { + setMachine(row.original); + setOpenMachinesDialog(false); + }; + + return ( + <> + + + + + + + ); +}; +export default Allocate; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/index.jsx new file mode 100644 index 0000000..ba0a20d --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/index.jsx @@ -0,0 +1,6 @@ +import Allocate from "./Allocate"; + +const RowActions = ({ row, setMachine, setOpenMachinesDialog }) => { + return ; +}; +export default RowActions; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/index.jsx new file mode 100644 index 0000000..fae083c --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/index.jsx @@ -0,0 +1,68 @@ +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; +import RowActions from "./RowActions"; +import { GET_MACHINES_TABLE_LIST } from "@/core/utils/routes"; + +const MachinesList = ({ machineType, setMachine, setOpenMachinesDialog }) => { + const columns = useMemo( + () => [ + { + accessorKey: "machine_code", + header: "کد خودرو", + id: "machine_code", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "car_name", + header: "نام خودرو", + id: "car_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "car_type", + header: "نوع خودرو", + id: "car_type", + enableColumnFilter: false, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + ], + [] + ); + + return ( + <> + + ( + + )} + /> + + + ); +}; +export default MachinesList; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/index.jsx new file mode 100644 index 0000000..33e13f7 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/index.jsx @@ -0,0 +1,40 @@ +import { Close, Edit } from "@mui/icons-material"; +import { Button, Dialog, IconButton } from "@mui/material"; +import { useState } from "react"; +import MachinesList from "./MachineList"; + +const MachinesDialog = ({ setMachine, mode }) => { + const [openMachinesDialog, setOpenMachinesDialog] = useState(false); + return ( + <> + {mode == "edit" ? ( + setOpenMachinesDialog(true)} size="small"> + + + ) : ( + + )} + + setOpenMachinesDialog(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + {openMachinesDialog && ( + + )} + + + ); +}; +export default MachinesDialog; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx new file mode 100644 index 0000000..912eb63 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx @@ -0,0 +1,48 @@ +import { Box, Button, Chip, DialogActions, DialogContent, Divider, Stack, Typography } from "@mui/material"; +import { useState } from "react"; +import DriversDialog from "./DriversDialog"; + +const MachineAndDriver = ({ setTabState, allData, setAllData, handlePrev }) => { + const [driver, setDriver] = useState(allData.driver); + + const handleNext = (data) => { + setAllData(data); + setTabState((s) => s + 1); + }; + + return ( + <> + + + + + {driver ? ( + <> + راننده + + + + + + ) : ( + + )} + + + + + + + + + + ); +}; +export default MachineAndDriver; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/Form/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/Form/index.jsx new file mode 100644 index 0000000..390974d --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/Form/index.jsx @@ -0,0 +1,66 @@ +import RahdarNameOrCode from "@/core/components/RahdarNameOrCode"; +import StyledForm from "@/core/components/StyledForm"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { Add } from "@mui/icons-material"; +import { Button, Stack } from "@mui/material"; +import { Controller, useForm } from "react-hook-form"; +import { object } from "yup"; + +const schema = object().shape({ + rahdar: object().required("همراه الزامی است."), +}); +const RahdaranForm = ({ setRahdaran }) => { + const defaultValues = { + rahdar: null, + }; + + const { + control, + handleSubmit, + reset, + formState: { isSubmitting, isValid }, + } = useForm({ defaultValues, resolver: yupResolver(schema), mode: "all" }); + + const submit = (data) => { + setRahdaran((prev) => { + const alreadyExists = prev.some((r) => r.id === data.rahdar.id); + if (alreadyExists) return prev; + return [...prev, data.rahdar]; + }); + reset(); + }; + + return ( + + + + { + return ( + field.onChange(value)} + error={error} + multiple={false} + /> + ); + }} + name={"rahdar"} + /> + + + + + ); +}; +export default RahdaranForm; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx new file mode 100644 index 0000000..be31897 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx @@ -0,0 +1,56 @@ +import { AccountCircle, Delete } from "@mui/icons-material"; +import { Card, Collapse, IconButton, Stack, Typography } from "@mui/material"; +import { TransitionGroup } from "react-transition-group"; + +const RahdaranList = ({ rahdaran, setRahdaran }) => { + const handleRemove = (index) => { + setRahdaran((prev) => prev.filter((_, i) => i !== index)); + }; + + return ( + + + {rahdaran.map((rahdar, index) => ( + + + + + + + نام و نام خانوادگی: + {rahdar.name} + + + کدملی: + {rahdar.code} + + + + handleRemove(index)}> + + + + + ))} + {rahdaran.length == 0 && ( + + همراهی ثبت نشده است + + )} + + + ); +}; +export default RahdaranList; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/index.jsx new file mode 100644 index 0000000..b530af4 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/index.jsx @@ -0,0 +1,36 @@ +import { Box, Button, Chip, DialogActions, DialogContent, Divider } from "@mui/material"; +import { useCallback, useState } from "react"; +import RahdaranForm from "./Form"; +import RahdaranList from "./List"; + +const Rahdaran = ({ allData, setAllData, setTabState, handlePrev }) => { + const [rahdaran, setRahdaran] = useState(allData.rahdaran); + + const handleNext = useCallback(() => { + setAllData({ rahdaran: rahdaran }); + setTabState((s) => s + 1); + }, [rahdaran]); + + return ( + <> + + + + + + + + + + + + + + + ); +}; +export default Rahdaran; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Verify/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Verify/index.jsx new file mode 100644 index 0000000..68f99e7 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Verify/index.jsx @@ -0,0 +1,128 @@ +import MapLoading from "@/core/components/MapLayer/Loading"; +import { missionCategoryTypes } from "@/core/utils/missionCategoryTypes"; +import { missionRegions } from "@/core/utils/missionRegions"; +import { Box, Button, Chip, DialogActions, DialogContent, Divider, Stack, Typography } from "@mui/material"; +import moment from "jalali-moment"; +import dynamic from "next/dynamic"; +import { useCallback } from "react"; +import ShowRoute from "../Area/Routing/ShowRoute"; +const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { + loading: () => , + ssr: false, +}); + +const Verify = ({ allData, handlePrev, submitForm, submitting }) => { + const handleNext = useCallback(() => { + submitForm(allData); + }, [allData]); + + return ( + <> + + + + + + + + + + + + + + + + + + + موضوع ماموریت + + + + + محدوده + + r.id == allData.region).name_fa} /> + + + نوع ماموریت + + t.id == allData.category_id).name_fa} + /> + + {allData.category_id == 3 && ( + + کد شکایت + + + + )} + + مقصد + + + + + تاریخ شروع ماموریت + + + + + تاریخ پایان ماموریت + + + + + + + + + + + راننده + + + + + + + + + {allData.rahdaran.length != 0 ? ( + allData.rahdaran.map((rahdar) => ( + + {rahdar.name} + + + + )) + ) : ( + + همراهی ثبت نشده است + + )} + + + + + + + + + + ); +}; +export default Verify; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/index.jsx new file mode 100644 index 0000000..2d5973e --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/index.jsx @@ -0,0 +1,114 @@ +import { AccessTime, Engineering, InsertDriveFile, Person, Verified, Map } from "@mui/icons-material"; +import { Box, Tab, Tabs } from "@mui/material"; +import { useReducer, useState } from "react"; +import GetDateTime from "./GetDateTime"; +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; + return ( + + ); +} + +const reducer = (state, action) => { + switch (action.type) { + case "changeData": + return { ...state, ...action.data }; + default: + return state; + } +}; + +const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { + const [allData, dispatch] = useReducer(reducer, defaultValues); + const [tabState, setTabState] = useState(0); + const handleClose = () => { + setOpen(false); + }; + const handleChangeTab = (event, newValue) => { + setTabState(newValue); + }; + + const handlePrev = () => { + if (tabState === 0) { + handleClose(); + } else { + setTabState((t) => t - 1); + } + }; + + return ( + <> + + } label="مشخصات" /> + } label="راننده" /> + } label="مختصات" /> + } label="همراهان" /> + } label="بررسی نهایی" /> + + + { + dispatch({ type: "changeData", data }); + }} + handlePrev={handlePrev} + setTabState={setTabState} + /> + + + { + dispatch({ type: "changeData", data }); + }} + handlePrev={handlePrev} + setTabState={setTabState} + /> + + + { + dispatch({ type: "changeData", data }); + }} + handlePrev={handlePrev} + setTabState={setTabState} + /> + + + { + dispatch({ type: "changeData", data }); + }} + handlePrev={handlePrev} + setTabState={setTabState} + /> + + + + + + ); +}; +export default CreateForm; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx new file mode 100644 index 0000000..9010671 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx @@ -0,0 +1,86 @@ +import { MISSOINS_CORRECTION_VIOLATION } from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import { AddCircleOutline, Close } from "@mui/icons-material"; +import { Dialog, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import CreateForm from "./Form"; + +const MissionCorrection = ({ row, mutate }) => { + const [submitting, setSubmitting] = useState(false); + const requestServer = useRequest({ notificationSuccess: true }); + const [open, setOpen] = useState(false); + + const handleOpen = () => { + setOpen(true); + }; + + const submitForm = async (result) => { + setSubmitting(true); + + await requestServer(`${MISSOINS_CORRECTION_VIOLATION}/${row.original.id}`, "post", { + data: { + explanation: result.explanation, + category_id: result.category_id, + ...(result.rahdaran.length != 0 ? { rahdaran: result.rahdaran.map((r) => r.id) } : {}), + zone: result.region, + end_point: result.end_point, + driver: result.driver.id, + encoded_route: result.area, + }, + hasSidebarUpdate: true, + }) + .then((response) => { + mutate(); + setOpen(false); + }) + .catch((error) => {}) + .finally(() => { + setSubmitting(false); + }); + }; + + return ( + <> + + + + + + + + setOpen(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + {open && ( + + )} + + + ); +}; +export default MissionCorrection; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx new file mode 100644 index 0000000..d65dc1f --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx @@ -0,0 +1,9 @@ +import MissionCorrection from "./MissionCorrection"; + +export default function RowActions({row, mutate}) { + return ( + <> + + + ); +} \ No newline at end of file diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx new file mode 100644 index 0000000..40edd7a --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx @@ -0,0 +1,141 @@ +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; +import RowActions from "./RowActions"; +import { GET_OPERATOR_VIOLATIONS_LIST } from "@/core/utils/routes"; +import useCities from "@/lib/hooks/useCities"; +import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; +import useProvinces from "@/lib/hooks/useProvince"; + +const ViolationsList = ({ setOpen }) => { + 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 ( + + ); + }, + Cell: ({ renderedCellValue, row }) => { + return <>{row.original.province_name}; + }, + }; + return [ + { + accessorKey: "id", + header: "کد یکتا", + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "machine_code", + header: "کد خودرو", + id: "machine_code", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + ...[dynamicColumns], + { + header: "شهر", + id: "city_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + dependencyId: "province_id", + grow: false, + 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 ( + + ); + }, + Cell: ({ row }) => <>{row.original.city_name}, + }, + ]; + }, []); + + return ( + <> + + } + /> + + + ); +}; +export default ViolationsList; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx new file mode 100644 index 0000000..3d5f48a --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx @@ -0,0 +1,33 @@ +import { Button, IconButton, Tooltip, useMediaQuery } from "@mui/material"; +import { useState } from "react"; +import ViolationsDialog from "./Dialog"; +import theme from "@/core/utils/theme"; +import RemoveRoadIcon from "@mui/icons-material/RemoveRoad"; + +const OperatorViolations = ({ row, mutate }) => { + const [open, setOpen] = useState(false); + const isMobile = useMediaQuery(theme.breakpoints.down("sm")); + return ( + <> + + {isMobile ? ( + setOpen(true)}> + + + ) : ( + + )} + + + + ); +}; +export default OperatorViolations; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Dialog.jsx b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Dialog.jsx new file mode 100644 index 0000000..44a22d5 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Dialog.jsx @@ -0,0 +1,26 @@ +import { Close } from "@mui/icons-material"; +import { Dialog, DialogTitle, IconButton } from "@mui/material"; +import ChangeStatusForm from "./Form"; + +const ChangeStatusDialog = ({ open, setOpen, mutate, row }) => { + return ( + + setOpen(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + تغییر وضعیت + {open && } + + ); +}; +export default ChangeStatusDialog; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Form.jsx b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Form.jsx new file mode 100644 index 0000000..3b91ba1 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Form.jsx @@ -0,0 +1,111 @@ +import SelectBox from "@/core/components/SelectBox"; +import StyledForm from "@/core/components/StyledForm"; +import { CHANGE_STATUS_OPERATOR, CHANGE_STATUS_RECEIPT } from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { Beenhere, ExitToApp } from "@mui/icons-material"; +import { Button, DialogActions, DialogContent, Grid, Stack } from "@mui/material"; +import { Controller, useForm } from "react-hook-form"; +import { object, string } from "yup"; + +const validationSchema = object({ + status: string().required("وضعیت را مشخص کنید!"), +}); + +const ChangeStatusForm = ({ setOpen, mutate, row }) => { + const requestServer = useRequest({ notificationSuccess: true }); + const defaultValues = { + status: row.original?.status || "", + }; + + const handleClose = () => { + setOpen(false); + }; + + const { + control, + handleSubmit, + formState: { isSubmitting }, + } = useForm({ + defaultValues, + resolver: yupResolver(validationSchema), + mode: "all", + }); + const onSubmitBase = async (data) => { + const formData = new FormData(); + formData.append("state_id", data.status); + await requestServer(`${CHANGE_STATUS_OPERATOR}/${row.original.id}`, "post", { + data: formData, + }) + .then((response) => { + mutate(); + setOpen(false); + }) + .catch((error) => {}); + }; + + return ( + + + + + + ( + + )} + /> + + + + + + + + + + ); +}; +export default ChangeStatusForm; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/index.jsx new file mode 100644 index 0000000..bc5c9b4 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/index.jsx @@ -0,0 +1,19 @@ +import { Reply } from "@mui/icons-material"; +import { IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import ChangeStatusDialog from "./Dialog"; + +const ChangeStatus = ({ row, mutate }) => { + const [open, setOpen] = useState(false); + return ( + <> + + setOpen(true)}> + + + + + + ); +}; +export default ChangeStatus; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/index.jsx index ab6267f..ccd694d 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/index.jsx @@ -3,9 +3,13 @@ import Edit from "./Edit"; import Delete from "./Delete"; import { useAuth } from "@/lib/contexts/auth"; import Add from "./Add"; +import ChangeStatus from "@/components/dashboard/roadMissions/operator/RowActions/ChangeStatus"; +import { usePermissions } from "@/lib/hooks/usePermissions"; const RowActions = ({ row, mutate }) => { const { user } = useAuth(); + const { data: userPermissions } = usePermissions(); + const hasChangeStatusPermission = userPermissions.some((item) => ["mission-change-state"].includes(item)); return ( @@ -20,6 +24,7 @@ const RowActions = ({ row, mutate }) => { )} + {hasChangeStatusPermission && } ); }; diff --git a/src/components/dashboard/roadMissions/operator/Toolbar.jsx b/src/components/dashboard/roadMissions/operator/Toolbar.jsx index 12db25d..071b9c0 100644 --- a/src/components/dashboard/roadMissions/operator/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/operator/Toolbar.jsx @@ -1,11 +1,13 @@ import { Stack } from "@mui/material"; import Create from "./Actions/Create"; +import OperatorViolations from "./Actions/Violations"; // import CreateWithoutProcess from "./Actions/CreateWithoutProcess"; const Toolbar = ({ table, filterData, mutate }) => { return ( + {/**/} ); diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx index 9d9068d..641d464 100644 --- a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx +++ b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx @@ -5,6 +5,16 @@ import RowActions from "./RowActions"; import { GET_MACHINES_TABLE_LIST } from "@/core/utils/routes"; import { useAuth } from "@/lib/contexts/auth"; +const statusTypes = [ + {id : 1, name_fa : "آماده"}, + {id : 2, name_fa : "رزرو"}, + {id : 3, name_fa : "در ماموریت"}, + {id : 4, name_fa : "خارج از رده"}, + {id : 5, name_fa : "در تعمیر"}, + {id : 6, name_fa : "فروخته شده"}, + {id : 7, name_fa : "نیاز به تعمیر"}, +] + const MachinesList = ({ machineType, setMachine, setOpenMachinesDialog }) => { const { user: { city_id, province_id }, @@ -33,6 +43,28 @@ const MachinesList = ({ machineType, setMachine, setOpenMachinesDialog }) => { grow: false, size: 100, }, + { + accessorKey: "status", + header: "وضعیت", + id: "status", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + sortDescFirst: true, + grow: false, + size: 100, + columnSelectOption: () => { + return statusTypes.map((category) => ({ + value: category.id, + label: category.name_fa, + })); + }, + Cell: ({ row }) => { + const statusValue = row.original.status; + const statusItem = statusTypes.find(item => item.id === statusValue); + return statusItem ? statusItem.name_fa : statusValue; + }, + }, ], [] ); diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx index 0f9c7b2..2d5973e 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx @@ -60,7 +60,6 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { }} > } label="مشخصات" /> - } label="زمانبندی" /> } label="راننده" /> } label="مختصات" /> } label="همراهان" /> @@ -77,16 +76,6 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { /> - { - dispatch({ type: "changeData", data }); - }} - handlePrev={handlePrev} - setTabState={setTabState} - /> - - { @@ -96,7 +85,7 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState={setTabState} /> - + { @@ -106,7 +95,7 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState={setTabState} /> - + { @@ -116,7 +105,7 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState={setTabState} /> - + diff --git a/src/components/dashboard/roadMissions/violations/RowActions/index.jsx b/src/components/dashboard/roadMissions/violations/RowActions/index.jsx index aafa0f6..7d45f68 100644 --- a/src/components/dashboard/roadMissions/violations/RowActions/index.jsx +++ b/src/components/dashboard/roadMissions/violations/RowActions/index.jsx @@ -1,12 +1,12 @@ -import CreateWithoutProcess from "../Actions/CreateWithoutProcess"; +// import CreateWithoutProcess from "../Actions/CreateWithoutProcess"; import EditViolation from "../Actions/EditViolation"; const RowActions = ({ row, mutate }) => { - const canEdit = row.original.status === 0 && row.original.type === 1; + // const canEdit = row.original.status === 0 && row.original.type === 1; return ( <> {!row.original.mileage && } - {canEdit && } + {/*{canEdit && }*/} ); }; diff --git a/src/core/components/RahdarNameOrCode.jsx b/src/core/components/RahdarNameOrCode.jsx index b3799c7..ad0d5a3 100644 --- a/src/core/components/RahdarNameOrCode.jsx +++ b/src/core/components/RahdarNameOrCode.jsx @@ -53,7 +53,7 @@ const RahdarNameOrCode = ({ title = "راهدار", rahdarsName, setRahdarsName, setInputValue(newInputValue || ""); // به‌روزرسانی مقدار تایپ‌شده }} options={options} // گزینه‌های موجود - getOptionLabel={(option) => (typeof option === "string" ? option : `${option.code} - ${option.name}`)} + getOptionLabel={(option) => (typeof option === "string" ? option : `${option.name}`)} isOptionEqualToValue={(option, value) => { if (!value) return false; if (value === "") return option.code === ""; diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index c970699..9ee709a 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -130,6 +130,7 @@ export const GET_INSURANCE_PAGE = api + "/v2/receipt/send-to-insurance"; export const GET_POLICERAH = api + "/api/v3/receipts/generate_police_document"; export const GET_POLICERAH_PAGE = api + "/v2/receipt/document-release"; export const CHANGE_STATUS_RECEIPT = api + "/api/v3/receipts/change_status"; +export const CHANGE_STATUS_OPERATOR = api + "/api/v3/missions/request_portal/change_state"; // recept report export const GET_COUNTRY_RECEIPT_REPORT = api + "/api/v3/receipt_reports/country_report"; @@ -235,6 +236,7 @@ export const GET_ROAD_MISSIONS_CONTROL_LIST = api + "/api/v3/missions/control_un export const REQUEST_MISSION = api + "/api/v3/missions/request_portal"; export const REQUEST_MISSION_WITHOUT_PROCESS = api + "/api/v3/missions/request_portal/no_process"; export const REQUEST_MISSION_VIOLATIONS_PROCESS = api + "/api/v3/missions/violation_management/no_process"; +export const MISSOINS_CORRECTION_VIOLATION = api + "/api/v3/missions/request_portal/clarify_unauthorized_exit"; export const REQUEST_MISSION_CONTINUE_MISSION = api + "/api/v3/missions/request_portal/continue"; export const UPDATE_REQUEST_MISSION = api + "/api/v3/missions/request_portal"; export const DELETE_REQUEST_MISSION = api + "/api/v3/missions/request_portal"; @@ -252,6 +254,7 @@ export const EDIT_VIOLATION = api + "/api/v3/missions/violation_management"; export const EXPORT_COUNTRY_ROAD_MISSIONS_REPORTS = api + "/api/v3/missions/report/country_excel_activity"; export const EXPORT_PROVINCE_ROAD_MISSIONS_REPORTS = api + "/api/v3/missions/report/province_excel_activity"; +export const GET_OPERATOR_VIOLATIONS_LIST = api + "/api/v3/missions/request_portal/violations"; export const GET_MACHINES_TABLE_LIST = api + "/api/v3/cmms_machines"; // rahdaran From acc013ad8159f2503d211a2980e88bfb6698cf8e Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sat, 13 Jun 2026 15:12:04 +0330 Subject: [PATCH 20/35] build and format --- .../operator/Actions/Violations/Dialog.jsx | 4 +- .../Actions/Violations/RowActions/index.jsx | 4 +- .../Form/MachinesDialog/MachineList/index.jsx | 18 +- .../violations/ViolationsList.jsx | 269 +++++++++--------- 4 files changed, 144 insertions(+), 151 deletions(-) diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx index bd3849a..200b891 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx @@ -19,9 +19,7 @@ const ViolationsDialog = ({ open, setOpen, mutate, row }) => { تخلفات - {open && ( - - )} + {open && } ); }; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx index d65dc1f..24e9532 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx @@ -1,9 +1,9 @@ import MissionCorrection from "./MissionCorrection"; -export default function RowActions({row, mutate}) { +export default function RowActions({ row, mutate }) { return ( <> ); -} \ No newline at end of file +} diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx index 641d464..4173929 100644 --- a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx +++ b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx @@ -6,14 +6,14 @@ import { GET_MACHINES_TABLE_LIST } from "@/core/utils/routes"; import { useAuth } from "@/lib/contexts/auth"; const statusTypes = [ - {id : 1, name_fa : "آماده"}, - {id : 2, name_fa : "رزرو"}, - {id : 3, name_fa : "در ماموریت"}, - {id : 4, name_fa : "خارج از رده"}, - {id : 5, name_fa : "در تعمیر"}, - {id : 6, name_fa : "فروخته شده"}, - {id : 7, name_fa : "نیاز به تعمیر"}, -] + { id: 1, name_fa: "آماده" }, + { id: 2, name_fa: "رزرو" }, + { id: 3, name_fa: "در ماموریت" }, + { id: 4, name_fa: "خارج از رده" }, + { id: 5, name_fa: "در تعمیر" }, + { id: 6, name_fa: "فروخته شده" }, + { id: 7, name_fa: "نیاز به تعمیر" }, +]; const MachinesList = ({ machineType, setMachine, setOpenMachinesDialog }) => { const { @@ -61,7 +61,7 @@ const MachinesList = ({ machineType, setMachine, setOpenMachinesDialog }) => { }, Cell: ({ row }) => { const statusValue = row.original.status; - const statusItem = statusTypes.find(item => item.id === statusValue); + const statusItem = statusTypes.find((item) => item.id === statusValue); return statusItem ? statusItem.name_fa : statusValue; }, }, diff --git a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx index 11ccd46..0f4f5fe 100644 --- a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx +++ b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx @@ -12,163 +12,158 @@ import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsT import useCities from "@/lib/hooks/useCities"; const ViolationsList = () => { - const columns = useMemo( - () => { - const dynamicColumns = { - header: "استان", - id: "province_id", + 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 ( + + ); + }, + Cell: ({ renderedCellValue, row }) => { + return <>{row.original.province_name}; + }, + }; + return [ + { + accessorKey: "id", + header: "کد یکتا", + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + }, + { + accessorKey: "status", + header: "وضعیت", + id: "status", enableColumnFilter: true, datatype: "numeric", filterMode: "equals", + sortDescFirst: true, grow: false, - size: 130, + columnSelectOption: () => { + return violationsCategoryStatus.map((category) => ({ + value: category.id, + label: category.name_fa, + })); + }, + Cell: ({ row }) => (row.original.type === 1 ? "خروج بدون مجوز" : "عدم تحرک"), + }, + { + accessorKey: "machine_code", + header: "کد خودرو", + id: "machine_code", + datatype: "text", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + }, + ...[dynamicColumns], + { + header: "شهر", + id: "city_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + dependencyId: "province_id", + grow: false, + size: 120, ColumnSelectComponent: (props) => { - const { provinces, errorProvinces, loadingProvinces } = useProvinces(); + const { cityList, loadingCityList, errorCityList } = useCities(props.dependencyFieldValue.value); + const getColumnSelectOptions = useMemo(() => { - if (loadingProvinces) { + if (props.dependencyFieldValue.value === "") { + return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }]; + } + if (loadingCityList) { return [{ value: "loading", label: "در حال بارگذاری..." }]; } - if (errorProvinces) { + if (errorCityList) { return [{ value: "error", label: "خطا در بارگذاری" }]; } return [ - { value: "", label: "کل کشور" }, - ...provinces.map((province) => ({ - value: province.id, - label: province.name_fa, + { value: "", label: "کل ادارات" }, + ...cityList.map((edare) => ({ + value: edare.id, + label: edare.name_fa, })), ]; - }, [provinces, errorProvinces, loadingProvinces]); + }, [cityList, loadingCityList, errorCityList]); return ( ); }, - Cell: ({ renderedCellValue, row }) => { - return <>{row.original.province_name}; - }, - }; - return [ - { - accessorKey: "id", - header: "کد یکتا", - id: "id", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - }, - { - accessorKey: "status", - header: "وضعیت", - id: "status", - enableColumnFilter: true, - datatype: "numeric", - filterMode: "equals", - sortDescFirst: true, - grow: false, - columnSelectOption: () => { - return violationsCategoryStatus.map((category) => ({ - value: category.id, - label: category.name_fa, - })); - }, - Cell: ({ row }) => (row.original.type === 1 ? "خروج بدون مجوز" : "عدم تحرک"), - }, - { - accessorKey: "machine_code", - header: "کد خودرو", - id: "machine_code", - datatype: "text", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - }, - ...[dynamicColumns], - { - header: "شهر", - id: "city_id", - enableColumnFilter: true, - datatype: "numeric", - filterMode: "equals", - dependencyId: "province_id", - grow: false, - 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 ( - - ); - }, - Cell: ({ row }) => <>{row.original.city_name}, - }, - { - accessorKey: "machine", - header: "نام خودرو", - id: "machine", - datatype: "text", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - Cell: ({ row }) => row.original.machine?.car_name || "-", - }, - { - accessorKey: "mission_id", - header: "کد ماموریت", - id: "mission_id", - enableColumnFilter: false, - datatype: "numeric", - filterMode: "equals", - grow: false, - Cell: ({ row }) => row.original.mission_id || "-", - }, - { - accessorKey: "request_date", - header: "تاریخ تخلف", - id: "request_date", - enableColumnFilter: true, - datatype: "date", - filterMode: "between", - grow: false, - Cell: ({ row }) => moment(row.original.request_date).locale("fa").format("YYYY/MM/DD"), - }, - ]; - }, - [] - ); + Cell: ({ row }) => <>{row.original.city_name}, + }, + { + accessorKey: "machine", + header: "نام خودرو", + id: "machine", + datatype: "text", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + Cell: ({ row }) => row.original.machine?.car_name || "-", + }, + { + accessorKey: "mission_id", + header: "کد ماموریت", + id: "mission_id", + enableColumnFilter: false, + datatype: "numeric", + filterMode: "equals", + grow: false, + Cell: ({ row }) => row.original.mission_id || "-", + }, + { + accessorKey: "request_date", + header: "تاریخ تخلف", + id: "request_date", + enableColumnFilter: true, + datatype: "date", + filterMode: "between", + grow: false, + Cell: ({ row }) => moment(row.original.request_date).locale("fa").format("YYYY/MM/DD"), + }, + ]; + }, []); return ( <> From e7e704aaf7bcd5a1dd815a9e1b277c89b75c0e48 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sat, 13 Jun 2026 15:36:18 +0330 Subject: [PATCH 21/35] restyle the width of input --- .../control/RowActions/FinishMission/FinishMissionContent.jsx | 3 ++- .../control/RowActions/StartMission/StartMissionContent.jsx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/dashboard/roadMissions/control/RowActions/FinishMission/FinishMissionContent.jsx b/src/components/dashboard/roadMissions/control/RowActions/FinishMission/FinishMissionContent.jsx index a8fe38d..ba62f31 100644 --- a/src/components/dashboard/roadMissions/control/RowActions/FinishMission/FinishMissionContent.jsx +++ b/src/components/dashboard/roadMissions/control/RowActions/FinishMission/FinishMissionContent.jsx @@ -59,7 +59,7 @@ const FinishMissionContent = ({ rowId, mutate, setOpenFinishMissionDialog }) => آیا از ورود خودرو و پایان ماموریت اطمینان دارید؟ - + field.onChange(e.target.value); }} size="small" + sx={{width : "100%"}} fullWidth label="کیلومتر خودرو / ساعت کار" InputLabelProps={{ shrink: true }} diff --git a/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx b/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx index e0c5ab5..56386db 100644 --- a/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx +++ b/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx @@ -60,7 +60,7 @@ const StartMissionContent = ({ rowId, mutate, setOpenStartMissionDialog }) => { آیا از خروج خودرو و شروع ماموریت اطمینان دارید؟ - + { )} /> - + Date: Sat, 13 Jun 2026 15:37:34 +0330 Subject: [PATCH 22/35] build and format --- .../control/RowActions/FinishMission/FinishMissionContent.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/dashboard/roadMissions/control/RowActions/FinishMission/FinishMissionContent.jsx b/src/components/dashboard/roadMissions/control/RowActions/FinishMission/FinishMissionContent.jsx index ba62f31..f458088 100644 --- a/src/components/dashboard/roadMissions/control/RowActions/FinishMission/FinishMissionContent.jsx +++ b/src/components/dashboard/roadMissions/control/RowActions/FinishMission/FinishMissionContent.jsx @@ -59,7 +59,7 @@ const FinishMissionContent = ({ rowId, mutate, setOpenFinishMissionDialog }) => آیا از ورود خودرو و پایان ماموریت اطمینان دارید؟ - + field.onChange(e.target.value); }} size="small" - sx={{width : "100%"}} + sx={{ width: "100%" }} fullWidth label="کیلومتر خودرو / ساعت کار" InputLabelProps={{ shrink: true }} From a9a6d90281bc29a39028d8581e551824061035bd Mon Sep 17 00:00:00 2001 From: baslani Date: Sat, 13 Jun 2026 16:07:55 +0330 Subject: [PATCH 23/35] implemented machines reports --- jsconfig.json | 38 +++---- .../machinesReports/MachinesReportsList.jsx | 3 + .../MachineMissionsList/index.jsx | 106 ++++++++++++++++++ .../RowActions/MissionDitails/Form/index.jsx | 27 +++++ .../RowActions/MissionDitails/index.jsx | 47 ++++++++ .../RowActions/RouteDetail/ShowRoute.jsx | 46 ++++++++ .../RowActions/RouteDetail/index.jsx | 57 ++++++++++ .../machinesReports/RowActions/index.jsx | 6 + src/core/utils/routes.js | 1 + 9 files changed, 312 insertions(+), 19 deletions(-) create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/ShowRoute.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesReports/RowActions/index.jsx diff --git a/jsconfig.json b/jsconfig.json index c136578..b51472a 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,27 +1,27 @@ // javascript for production -// { -// "compilerOptions": { -// "paths": { -// "@/*": ["./src/*"], -// "^/*": ["./public/*"] -// } -// } -// } - -// typescript for local development { "compilerOptions": { - "jsx": "react-jsx", - "noUnusedLocals": true, - "noImplicitAny": false, - "checkJs": true, - "allowJs": true, - "strict": true, - "baseUrl": ".", "paths": { "@/*": ["./src/*"], "^/*": ["./public/*"] } - }, - "exclude": ["node_modules"] + } } + +// typescript for local development +// { +// "compilerOptions": { +// "jsx": "react-jsx", +// "noUnusedLocals": true, +// "noImplicitAny": false, +// "checkJs": true, +// "allowJs": true, +// "strict": true, +// "baseUrl": ".", +// "paths": { +// "@/*": ["./src/*"], +// "^/*": ["./public/*"] +// } +// }, +// "exclude": ["node_modules"] +// } diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx index 4eaae92..34badf1 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx @@ -3,6 +3,7 @@ import DataTableWithAuth from "@/core/components/DataTableWithAuth"; import { Box } from "@mui/material"; import { useMemo } from "react"; import Toolbar from "./Toolbar"; +import RowActions from "./RowActions"; const MachinesReportsList = ({ data, specialFilter }) => { const columns = useMemo(() => { @@ -70,6 +71,8 @@ const MachinesReportsList = ({ data, specialFilter }) => { table_name={"roadMissionReportList"} enablePagination={false} specialFilter={specialFilter} + enableRowActions + RowActions={RowActions} /> ); 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 new file mode 100644 index 0000000..037aec7 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx @@ -0,0 +1,106 @@ +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { GET_MACHINE_MISSIONS_DETAILS } from "@/core/utils/routes"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; + +const MachineMissionsList = ({ row }) => { + const columns = useMemo( + () => [ + { + accessorKey: "id", + header: "کد یکتا", + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 80, + }, + { + accessorKey: "province_name", + header: "استان", + id: "province_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "city_name", + header: "شهر", + id: "city_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "station_name", + header: "راهدارخانه", + id: "station_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "driver_name", + header: "راننده", + id: "driver_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "km", + header: "کیلومتر شروع", + id: "km", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "end_km", + header: "کیلومتر پایان", + id: "end_km", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + ], + [] + ); + + return ( + <> + + + + + ); +}; +export default MachineMissionsList; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/index.jsx new file mode 100644 index 0000000..5e79bfa --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/index.jsx @@ -0,0 +1,27 @@ +import { Box, Button, DialogActions, DialogContent } from "@mui/material"; +import { Stack } from "@mui/system"; +import MachineMissionsList from "./MachineMissionsDetailsDialog/MachineMissionsList"; + +const MachineMissionsDetailsTable = ({ row, setOpenMachineMissionsDetails }) => { + return ( + <> + + + + + + + + + + + + + + + + ); +}; +export default MachineMissionsDetailsTable; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/index.jsx new file mode 100644 index 0000000..3b65c8f --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/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 MachineMissionsDetailsTable from "./Form"; + +const MissionDetails = ({ row }) => { + const [openMachineMissionsDetails, setOpenMachineMissionsDetails] = useState(false); + + return ( + <> + + { + setOpenMachineMissionsDetails(true); + }} + > + + + + + setOpenMachineMissionsDetails(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + ریز گزارشات خودرو + {openMachineMissionsDetails && ( + + )} + + + ); +}; +export default MissionDetails; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/ShowRoute.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/ShowRoute.jsx new file mode 100644 index 0000000..5e1a4bd --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/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/machinesReports/RowActions/RouteDetail/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/index.jsx new file mode 100644 index 0000000..4501d35 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/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)}> + + + + setOpenRouteDetailDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"sm"} + > + مسیر انتخابی + + + + + + + + + + + + + ); +}; +export default RouteDetail; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/index.jsx new file mode 100644 index 0000000..dbf9aa7 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/index.jsx @@ -0,0 +1,6 @@ +import MissionDetails from "./MissionDitails"; + +const RowActions = ({ row }) => { + return ; +}; +export default RowActions; diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index 2bac1c4..10a6117 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -291,3 +291,4 @@ export const GET_PROVINCES_LIST = api + "/api/v3/provinces/list"; export const GET_CITIES_LIST = api + "/api/v3/cities/list"; 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"; From 61ed1980f1347e30337279645a9bbbaf25d16c69 Mon Sep 17 00:00:00 2001 From: baslani Date: Sat, 13 Jun 2026 16:20:22 +0330 Subject: [PATCH 24/35] cleaned up logs --- .../control/RowActions/StartMission/StartMissionContent.jsx | 1 - .../dashboard/roadMissions/reports/machinesReports/index.jsx | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx b/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx index 56386db..8c2d3a1 100644 --- a/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx +++ b/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx @@ -38,7 +38,6 @@ const StartMissionContent = ({ rowId, mutate, setOpenStartMissionDialog }) => { const onSubmit = (values) => { const formattedDate = values.start_date; const formattedTime = format(values.start_time, "HH:mm"); - console.log(formattedDate, formattedTime); requestServer(`${START_MISSION}/${rowId}`, "post", { data: { diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/index.jsx index 594fdb1..e62f273 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/index.jsx @@ -91,8 +91,6 @@ const MachinesReportsPage = () => { mode: "all", }); - console.log(data); - return ( From a9a996e1e84ef4b95b608cfbe4796991d22d899f Mon Sep 17 00:00:00 2001 From: mhmjalali Date: Sun, 14 Jun 2026 09:49:13 +0330 Subject: [PATCH 25/35] add map to new mission on rowAction of operators --- .../Dialog/Form/Area/Routing/AlarmText.jsx | 28 +++ .../Dialog/Form/Area/Routing/DataBox.jsx | 53 +++++ .../Dialog/Form/Area/Routing/ShowRoute.jsx | 46 ++++ .../Dialog/Form/Area/Routing/index.jsx | 219 ++++++++++++++++++ .../AddController/Dialog/Form/Area/index.jsx | 34 +-- .../Dialog/Form/Verify/index.jsx | 8 +- .../Add/AddController/Dialog/Form/index.jsx | 3 +- .../Add/AddController/Dialog/index.jsx | 23 +- 8 files changed, 368 insertions(+), 46 deletions(-) create mode 100644 src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/AlarmText.jsx create mode 100644 src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/DataBox.jsx create mode 100644 src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/ShowRoute.jsx create mode 100644 src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/index.jsx diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/AlarmText.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/AlarmText.jsx new file mode 100644 index 0000000..0a3be1b --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/AlarmText.jsx @@ -0,0 +1,28 @@ +import { Box, Typography } from "@mui/material"; + +const AlarmText = ({ isSource }) => { + if (isSource) return null; + return ( + + + با کلیک بر روی مارکر موقعیت را انتخاب کنید + + + ); +}; + +export default AlarmText; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/DataBox.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/DataBox.jsx new file mode 100644 index 0000000..c19cb6f --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/DataBox.jsx @@ -0,0 +1,53 @@ +import { Box, Button, TextField } from "@mui/material"; + +const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => { + if (!isSource) return null; + + return ( + +
+ + {isSource && isDest && ( + + )} +
+ {isDest && ( +
+ + +
+ )} + + ); +}; + +export default DataBox; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/ShowRoute.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/ShowRoute.jsx new file mode 100644 index 0000000..5e1a4bd --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/ShowRoute.jsx @@ -0,0 +1,46 @@ +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); + const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); + + if (!area) return null; + const coords = polyline.decode(area, 6); + + if (coords.length === 0) return null; + + const sourcePosition = coords[0]; + const destPosition = coords[coords.length - 1]; + + return ( + <> + + + + + ); +}; + +export default ShowRoute; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/index.jsx new file mode 100644 index 0000000..06e7c9b --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/index.jsx @@ -0,0 +1,219 @@ +import { Marker, Polyline, useMapEvents } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; +import PrevDestIcon from "@/assets/images/prev-destination-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; +import { useEffect, useRef, useState } from "react"; +import DataBox from "./DataBox"; +import AlarmText from "./AlarmText"; + +const Routing = ({ setArea, setLocations, locations, area }) => { + const mapPrevSourceMarker = useRef(); + const mapPrevDestMarker = useRef(); + const mapRef = useRef(null); + const defaultIconSize = [35, 35]; + const [isSource, setIsSource] = useState(false); + const [sourcePosition, setSourcePosition] = useState(null); + const [isDest, setIsDest] = useState(false); + const [destPosition, setDestPosition] = useState(null); + const [routeCoords, setRouteCoords] = useState([]); + const [alternateCoords, setAlternateCoords] = useState([]); + const [editingTarget, setEditingTarget] = useState(null); + const [selectedRoute, setSelectedRoute] = useState(null); + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + const defaultIcon = createCustomIcon( + defaultIconSize, + isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src + ); + + const prevDestIcon = createCustomIcon( + defaultIconSize, + isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src + ); + + const isMovingSource = !isSource || editingTarget === "source"; + const isMovingDest = isSource && (!isDest || editingTarget === "dest"); + + const map = useMapEvents({ + move(e) { + if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); + if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter()); + }, + movestart() { + if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); + }, + moveend() { + if (isMovingSource) + mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); + }, + }); + + useEffect(() => { + mapRef.current = map; + }, [map]); + + useEffect(() => { + if (locations.length < 2) return; + const restoredSource = { lat: locations[0].lat, lng: locations[0].lon }; + const restoredDest = { lat: locations[1].lat, lng: locations[1].lon }; + setSourcePosition(restoredSource); + setDestPosition(restoredDest); + setIsSource(true); + setIsDest(true); + if (area) { + const decoded = polyline.decode(area, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + setTimeout(() => { + mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + }, 100); + } else { + fetchRoute(restoredSource, restoredDest); + } + }, []); + + const fetchRoute = async (source, dest) => { + const locs = [ + { lat: source.lat, lon: source.lng }, + { lat: dest.lat, lon: dest.lng }, + ]; + try { + const response = await fetch("https://jouya.141.ir/api/router/drive", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ locations: locs }), + }); + const data = await response.json(); + const shape = data.trip.legs[0].shape; + setLocations(locs); + setArea(shape); + const decoded = polyline.decode(shape, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + + if (data.alternates?.length > 0) { + const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); + setAlternateCoords(decodedAlternates); + } else { + setAlternateCoords([]); + } + map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + } catch (error) { + console.error("Routing error:", error); + } + }; + + const handleMarkerClick = async () => { + if (!isSource || editingTarget === "source") { + const clickedPosition = mapPrevSourceMarker.current.getLatLng(); + setSourcePosition(clickedPosition); + setIsSource(true); + setEditingTarget(null); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + + if (editingTarget === "source" && destPosition) { + await fetchRoute(clickedPosition, destPosition); + } + } + }; + + const handleDestMarkerClick = async () => { + if (!isDest || editingTarget === "dest") { + const clickedPosition = mapPrevDestMarker.current.getLatLng(); + setDestPosition(clickedPosition); + setIsDest(true); + setEditingTarget(null); + + await fetchRoute(sourcePosition, clickedPosition); + } + }; + + const handleEditSource = () => { + setEditingTarget("source"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleEditDest = () => { + setEditingTarget("dest"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleSelectRoute = (index, coords) => { + setSelectedRoute({ index, coords }); + const encoded = polyline.encode(coords, 6); + setArea(encoded); + map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); + }; + + return ( + <> + + + + {isSource && ( + + )} + {alternateCoords.map((coords, index) => ( + handleSelectRoute(index, coords) }} + /> + ))} + {routeCoords.length > 0 && ( + handleSelectRoute("main", routeCoords) }} + /> + )} + + ); +}; + +export default Routing; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/index.jsx index c8feef7..200c1e0 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/index.jsx @@ -2,41 +2,29 @@ import MapLoading from "@/core/components/MapLayer/Loading"; import { Box, Button, DialogActions, DialogContent, Stack } from "@mui/material"; import dynamic from "next/dynamic"; import { useCallback, useState } from "react"; -import MapControlPolygon from "./MapControlPolygon"; -import MapControlPolyline from "./MapControlPolyline"; -import SelectBoundType from "./SelectBoundType"; -import OldBoundLayer from "./OldBoundLayer"; +import Routing from "./Routing"; const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { loading: () => , ssr: false, }); -const Area = ({ allData, setAllData, handlePrev, setTabState, oldBound }) => { - const [bound, setBound] = useState(allData.bound); - const [boundType, setBoundType] = useState(allData.bound_type); +const Area = ({ allData, setAllData, handlePrev, setTabState }) => { + const [area, setArea] = useState(allData.area); + const [locations, setLocations] = useState(allData.locations); const handleNext = useCallback(() => { - setAllData({ bound: bound }); + setAllData({ area: area }); + setAllData({ locations: locations }); setTabState((s) => s + 1); - }, [bound]); + }, [area]); + return ( <> - - {boundType == "polygon" ? ( - - ) : ( - - )} - + @@ -45,8 +33,8 @@ const Area = ({ allData, setAllData, handlePrev, setTabState, oldBound }) => { - diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Verify/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Verify/index.jsx index bf57f0b..89e0b41 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Verify/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Verify/index.jsx @@ -5,7 +5,7 @@ import { Box, Button, Chip, DialogActions, DialogContent, Divider, Stack, Typogr import moment from "jalali-moment"; import dynamic from "next/dynamic"; import { useCallback } from "react"; -import ShowBound from "../../../../../../Actions/showBound"; +import ShowRoute from "../Area/Routing/ShowRoute"; const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { loading: () => , ssr: false, @@ -23,7 +23,7 @@ const Verify = ({ allData, handlePrev, submitForm, submitting }) => { - + @@ -93,11 +93,11 @@ const Verify = ({ allData, handlePrev, submitForm, submitting }) => { label={`${allData.machine.machine_code} | ${allData.machine.car_name}`} /> - + {/* راننده - + */} diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/index.jsx index 054e6e6..0adbb1f 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/index.jsx @@ -25,6 +25,8 @@ const reducer = (state, action) => { }; const CreateForm = ({ defaultValues, submitForm, setOpen, submitting, oldBound }) => { + console.log("defaultValues", defaultValues); + const [allData, dispatch] = useReducer(reducer, defaultValues); const [tabState, setTabState] = useState(0); const handleClose = () => { @@ -84,7 +86,6 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting, oldBound } { dispatch({ type: "changeData", data }); diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/index.jsx index 3c0f5da..31c0005 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/index.jsx @@ -10,22 +10,12 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => { const submitForm = async (result) => { setSubmitting(true); - const bound = result.bound.getLatLngs(); - let area = - result.bound_type === "polygon" - ? bound.map((ring) => ring.map((latlng) => [latlng.lng, latlng.lat]))[0] - : bound.map((latlng) => [latlng.lng, latlng.lat]); - - // بستن polygon - if (result.bound_type === "polygon" && area.length > 0) { - const firstPoint = area[0]; - area.push({ ...firstPoint }); - } await requestServer(`${REQUEST_MISSION_CONTINUE_MISSION}/${row.original.id}`, "post", { data: { ...(result.rahdaran.length != 0 ? { rahdaran: result.rahdaran.map((r) => r.id) } : {}), machine_id: result.machine.id, - driver: result.driver.id, + encoded_route: result.area, + driver: row.original.driver_id, zone: result.region, type: result.type, ...(result.type == 1 @@ -36,10 +26,6 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => { end_date: result.end_date, }), end_point: result.end_point, - area: { - type: result.bound_type, - coordinates: area, - }, category_id: result.category_id, explanation: result.explanation, ...(result.category_id == 3 @@ -65,7 +51,6 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => { defaultValues={{ explanation: "", category_id: "", - bound: null, rahdaran: rahdaran.filter((r) => !r.is_driver), bound_type: "polyline", type: "", @@ -74,7 +59,9 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => { end_point: "", region: "", machine: machine, - driver: rahdaran.find((r) => r.is_driver), + driver: row.original.driver_id, + area: null, + locations: [], }} oldBound={oldBound} submitForm={submitForm} From caaff22c666452e58fd797186dbcc2686bbdaa9a Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sun, 14 Jun 2026 09:56:03 +0330 Subject: [PATCH 26/35] machine type report completed --- .../reports/machineTypeReports/page.js | 18 +++ .../machinesTypeReports/ExcelPrint/index.jsx | 79 +++++++++++++ .../MachinesReportsList.jsx | 61 ++++++++++ .../MachineMissionsList/index.jsx | 106 +++++++++++++++++ .../RowActions/MissionDitails/Form/index.jsx | 27 +++++ .../RowActions/MissionDitails/index.jsx | 47 ++++++++ .../RowActions/RouteDetail/ShowRoute.jsx | 46 ++++++++ .../RowActions/RouteDetail/index.jsx | 57 +++++++++ .../machinesTypeReports/RowActions/index.jsx | 10 ++ .../Search/FromDateController.jsx | 27 +++++ .../Search/SearchReportField.jsx | 44 +++++++ .../Search/SelectProvince.jsx | 45 +++++++ .../Search/ToDateController.jsx | 30 +++++ .../machinesTypeReports/Search/index.jsx | 13 +++ .../reports/machinesTypeReports/Toolbar.jsx | 11 ++ .../reports/machinesTypeReports/index.jsx | 110 ++++++++++++++++++ src/core/utils/pageMenu.js | 12 +- src/core/utils/pageMenuDev.js | 12 +- src/core/utils/routes.js | 9 ++ 19 files changed, 762 insertions(+), 2 deletions(-) create mode 100644 src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machineTypeReports/page.js create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/ExcelPrint/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/ShowRoute.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/FromDateController.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SearchReportField.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SelectProvince.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/ToDateController.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/Toolbar.jsx create mode 100644 src/components/dashboard/roadMissions/reports/machinesTypeReports/index.jsx diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machineTypeReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machineTypeReports/page.js new file mode 100644 index 0000000..e8725f1 --- /dev/null +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machineTypeReports/page.js @@ -0,0 +1,18 @@ +import WithPermission from "@/core/middlewares/withPermission"; +import MachinesTypeReportsPage from "@/components/dashboard/roadMissions/reports/machinesTypeReports"; + +export const metadata = { + title: "کارتابل گزارش نوع ماشین‌ها", +}; + +export default function Page() { + return ( + + + + ); +} diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/ExcelPrint/index.jsx new file mode 100644 index 0000000..c105b97 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/ExcelPrint/index.jsx @@ -0,0 +1,79 @@ +"use client"; +import { + EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT, + EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT, + EXPORT_GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT, + EXPORT_GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT, +} from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import { useTheme } from "@emotion/react"; +import DescriptionIcon from "@mui/icons-material/Description"; +import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material"; +import FileSaver from "file-saver"; +import moment from "jalali-moment"; +import { useMemo, useState } from "react"; + +const PrintExcel = ({ table, filterData }) => { + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down("sm")); + const [loading, setLoading] = useState(false); + const requestServer = useRequest({ notificationSuccess: true }); + const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => { + if (filter.value) { + acc.push({ id: filter.id, value: filter.value }); + } + return acc; + }, []); + + const filterParams = useMemo(() => { + const params = new URLSearchParams(); + activeFilters.length > 0 && + activeFilters.map((filter, index) => { + params.set(`${filter.id}`, filter.value); + }); + return params; + }, [activeFilters]); + + const clickHandler = () => { + setLoading(true); + const CountryOrProvince = activeFilters.find((item) => item.id === "province_id"); + const requestUrl = + CountryOrProvince.value === "-1" + ? EXPORT_GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT + : EXPORT_GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT; + requestServer(`${requestUrl}?${filterParams}`, "get", { + requestOptions: { responseType: "blob" }, + }) + .then((response) => { + const filename = `خروجی کارتابل گزارشات گشت راهداری تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`; + FileSaver.saveAs(response.data, filename); + }) + .catch(() => {}) + .finally(() => { + setLoading(false); + }); + }; + + return ( + <> + {isMobile ? ( + + + + ) : ( + + )} + + ); +}; +export default PrintExcel; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx new file mode 100644 index 0000000..5fb261d --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx @@ -0,0 +1,61 @@ +"use client"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; +import Toolbar from "./Toolbar"; +// import RowActions from "./RowActions"; + +const MachinesReportsList = ({ data, specialFilter }) => { + const columns = useMemo(() => { + return [ + { + accessorKey: "car_type", + header: "نوع ماشین", + id: "car_type", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "func", + header: "کارکرد", + id: "func", + enableColumnFilter: false, + enableSorting: false, + datatype: "number", + grow: false, + size: 50, + }, + { + accessorKey: "missions", + header: "تعداد ماموریت", + id: "missions", + enableColumnFilter: false, + enableSorting: false, + datatype: "number", + grow: false, + size: 50, + }, + ]; + }, []); + + return ( + + + + ); +}; + +export default MachinesReportsList; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx new file mode 100644 index 0000000..ada49f4 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx @@ -0,0 +1,106 @@ +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { GET_MACHINE_MISSIONS_DETAILS, GET_MACHINE_TYPE_MISSIONS_DETAILS } from "@/core/utils/routes"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; + +const MachineMissionsList = ({ row }) => { + const columns = useMemo( + () => [ + { + accessorKey: "id", + header: "کد یکتا", + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 80, + }, + { + accessorKey: "province_name", + header: "استان", + id: "province_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "city_name", + header: "شهر", + id: "city_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "station_name", + header: "راهدارخانه", + id: "station_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "driver_name", + header: "راننده", + id: "driver_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "km", + header: "کیلومتر شروع", + id: "km", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "end_km", + header: "کیلومتر پایان", + id: "end_km", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + ], + [] + ); + + return ( + <> + + + + + ); +}; +export default MachineMissionsList; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/index.jsx new file mode 100644 index 0000000..5e79bfa --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/index.jsx @@ -0,0 +1,27 @@ +import { Box, Button, DialogActions, DialogContent } from "@mui/material"; +import { Stack } from "@mui/system"; +import MachineMissionsList from "./MachineMissionsDetailsDialog/MachineMissionsList"; + +const MachineMissionsDetailsTable = ({ row, setOpenMachineMissionsDetails }) => { + return ( + <> + + + + + + + + + + + + + + + + ); +}; +export default MachineMissionsDetailsTable; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/index.jsx new file mode 100644 index 0000000..21a8263 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/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 MachineMissionsDetailsTable from "./Form"; + +const MissionDetails = ({ row }) => { + const [openMachineMissionsDetails, setOpenMachineMissionsDetails] = useState(false); + + return ( + <> + + { + setOpenMachineMissionsDetails(true); + }} + > + + + + + setOpenMachineMissionsDetails(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + ریز گزارشات نوع خودرو + {openMachineMissionsDetails && ( + + )} + + + ); +}; +export default MissionDetails; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/ShowRoute.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/ShowRoute.jsx new file mode 100644 index 0000000..5e1a4bd --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/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/machinesTypeReports/RowActions/RouteDetail/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/index.jsx new file mode 100644 index 0000000..4501d35 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/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)}> + + + + setOpenRouteDetailDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"sm"} + > + مسیر انتخابی + + + + + + + + + + + + + ); +}; +export default RouteDetail; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/index.jsx new file mode 100644 index 0000000..2690157 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/index.jsx @@ -0,0 +1,10 @@ +// import MissionDetails from "./MissionDitails"; + +const RowActions = ({ row }) => { + return ( + <> + {/**/} + + ); +}; +export default RowActions; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/FromDateController.jsx new file mode 100644 index 0000000..490ee7b --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/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/machinesTypeReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SearchReportField.jsx new file mode 100644 index 0000000..bde2a4c --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/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 && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +export default SearchReportField; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SelectProvince.jsx new file mode 100644 index 0000000..2b24d67 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/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/machinesTypeReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/ToDateController.jsx new file mode 100644 index 0000000..fc4a776 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/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/machinesTypeReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/index.jsx new file mode 100644 index 0000000..f29d302 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/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/machinesTypeReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Toolbar.jsx new file mode 100644 index 0000000..0f726c7 --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/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/machinesTypeReports/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/index.jsx new file mode 100644 index 0000000..add1f5c --- /dev/null +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/index.jsx @@ -0,0 +1,110 @@ +"use client"; +import PageTitle from "@/core/components/PageTitle"; +import { + GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT, + GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT, +} from "@/core/utils/routes"; +import { useAuth } from "@/lib/contexts/auth"; +import { usePermissions } from "@/lib/hooks/usePermissions"; +import useRequest from "@/lib/hooks/useRequest"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { LinearProgress, Stack } from "@mui/material"; +import moment from "jalali-moment"; +import { useEffect, useState } from "react"; +import { useForm } from "react-hook-form"; +import * as yup from "yup"; +import MachinesReportsList from "./MachinesReportsList"; +import SearchReportList from "./Search"; + +const MachinesTypeReportsPage = () => { + const [data, setData] = useState(null); + const { data: userPermissions } = usePermissions(); + const { user } = useAuth(); + const requestServer = useRequest(); + const hasProvincesPermission = userPermissions?.includes("mission-report-country"); + + const defaultValues = { + from_date: moment(new Date()).format("YYYY-MM-DD"), + date_to: moment(new Date()).format("YYYY-MM-DD"), + province_id: user.province_id || "-1", + }; + const defaultFilter = [ + { value: `${defaultValues.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, + { value: `${defaultValues.from_date}`, datatype: "date", id: "from_date", fn: "between" }, + { value: `${defaultValues.date_to}`, datatype: "date", id: "date_to", fn: "between" }, + ]; + const [specialFilter, setSpecialFilter] = useState(defaultFilter); + + const onSearchSubmit = async (data) => { + const params = new URLSearchParams(); + params.set("from_date", `${data.from_date} 00:00:00`); + params.set("date_to", `${data.date_to} 23:59:59`); + setSpecialFilter([ + { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, + { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" }, + { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" }, + ]); + if (data.province_id === "-1") { + try { + const response = await requestServer(`${GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT}?${params}`); + const result = response.data.data; + + setData({ + data: result.activities, + filters: data, + }); + } catch (e) {} + } else { + try { + params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MACHINES_TYPE_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 MachinesTypeReportsPage; diff --git a/src/core/utils/pageMenu.js b/src/core/utils/pageMenu.js index bd24701..703c244 100644 --- a/src/core/utils/pageMenu.js +++ b/src/core/utils/pageMenu.js @@ -1,4 +1,4 @@ -import { ReportProblem, RvHookup } from "@mui/icons-material"; +import { DriveEtaOutlined, ReportProblem, RvHookup } from "@mui/icons-material"; import AccountTreeIcon from "@mui/icons-material/AccountTree"; import AdminPanelSettingsIcon from "@mui/icons-material/AdminPanelSettings"; import AssessmentIcon from "@mui/icons-material/Assessment"; @@ -34,6 +34,7 @@ import SecurityIcon from "@mui/icons-material/Security"; 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"; export const pageMenu = [ { @@ -201,6 +202,15 @@ export const pageMenu = [ badges: [{ key: "mission.request_portal" }], permissions: ["all"], }, + { + id: "machinesTypeReports", + label: "نوع ماشین‌ها", + icon: , + type: "page", + route: "/dashboard/road-missions/reports/machineTypeReports", + badges: [{ key: "mission.request_portal" }], + permissions: ["all"], + }, ], }, ], diff --git a/src/core/utils/pageMenuDev.js b/src/core/utils/pageMenuDev.js index ab888c7..e1c3a01 100644 --- a/src/core/utils/pageMenuDev.js +++ b/src/core/utils/pageMenuDev.js @@ -1,4 +1,4 @@ -import { Mediation, ReportProblem, RvHookup } from "@mui/icons-material"; +import { DriveEtaOutlined, Mediation, ReportProblem, RvHookup } from "@mui/icons-material"; import AccountTreeIcon from "@mui/icons-material/AccountTree"; import AdminPanelSettingsIcon from "@mui/icons-material/AdminPanelSettings"; import AssessmentIcon from "@mui/icons-material/Assessment"; @@ -31,6 +31,7 @@ import ScienceIcon from "@mui/icons-material/Science"; import SecurityIcon from "@mui/icons-material/Security"; 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"; export const pageMenuDev = [ @@ -199,6 +200,15 @@ export const pageMenuDev = [ badges: [{ key: "mission.request_portal" }], permissions: ["all"], }, + { + id: "machinesTypeReports", + label: "نوع ماشین‌ها", + icon: , + type: "page", + route: "/dashboard/road-missions/reports/machineTypeReports", + badges: [{ key: "mission.request_portal" }], + permissions: ["all"], + }, ], }, ], diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index 64c2bee..969e100 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -255,6 +255,14 @@ export const EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/country_machines_activity_excel"; export const EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/province_machines_activity_excel"; + +export const GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT = + api + "/api/v3/missions/report_machine/country_machine_types_activity"; +export const GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/province_machine_types_activity"; +export const EXPORT_GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT = + api + "/api/v3/missions/report_machine/country_machine_types_activity_excel"; +export const EXPORT_GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT = + api + "/api/v3/missions/report_machine/province_machine_types_activity_excel"; export const CREATE_VIOLATION = api + "/api/v3/missions/violation_management"; export const EDIT_VIOLATION = api + "/api/v3/missions/violation_management"; export const EXPORT_COUNTRY_ROAD_MISSIONS_REPORTS = api + "/api/v3/missions/report/country_excel_activity"; @@ -295,3 +303,4 @@ export const GET_CITIES_LIST = api + "/api/v3/cities/list"; 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"; From a80e35a510e2c5dcb80f3f84d4b87441be8268e2 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sun, 14 Jun 2026 11:47:24 +0330 Subject: [PATCH 27/35] driver reports completed --- .../reports/driverReports/page.js | 18 +++ .../diverReports/DriverReportsList.jsx | 71 +++++++++++ .../reports/diverReports/ExcelPrint/index.jsx | 77 ++++++++++++ .../DriverDetailsDialog/DriverList/index.jsx | 106 +++++++++++++++++ .../RowActions/DriverDetails/Form/index.jsx | 27 +++++ .../RowActions/DriverDetails/index.jsx | 47 ++++++++ .../RowActions/RouteDetail/ShowRoute.jsx | 46 ++++++++ .../RowActions/RouteDetail/index.jsx | 57 +++++++++ .../reports/diverReports/RowActions/index.jsx | 6 + .../Search/FromDateController.jsx | 27 +++++ .../diverReports/Search/SearchReportField.jsx | 44 +++++++ .../diverReports/Search/SelectProvince.jsx | 45 +++++++ .../diverReports/Search/ToDateController.jsx | 30 +++++ .../reports/diverReports/Search/index.jsx | 13 +++ .../reports/diverReports/Toolbar.jsx | 11 ++ .../reports/diverReports/index.jsx | 110 ++++++++++++++++++ .../MachineMissionsList/index.jsx | 2 +- .../Actions/CreateViolation/Form/index.jsx | 2 +- .../Actions/EditViolation/EditController.jsx | 4 +- src/core/utils/pageMenu.js | 10 ++ src/core/utils/pageMenuDev.js | 10 ++ src/core/utils/routes.js | 8 ++ 22 files changed, 767 insertions(+), 4 deletions(-) create mode 100644 src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/driverReports/page.js create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/ExcelPrint/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/ShowRoute.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/RowActions/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/Search/FromDateController.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/Search/SearchReportField.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/Search/SelectProvince.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/Search/ToDateController.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/Search/index.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/Toolbar.jsx create mode 100644 src/components/dashboard/roadMissions/reports/diverReports/index.jsx 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 ? ( + + + + ) : ( + + )} + + ); +}; +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); + }} + > + + + + + setOpenDriverDetails(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + ریز گزارشات راننده + {openDriverDetails && ( + + )} + + + ); +}; +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)}> + + + + setOpenRouteDetailDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"sm"} + > + مسیر انتخابی + + + + + + + + + + + + + ); +}; +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 && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +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"; From 806854327add50b79f93c8392fdbf34b5a4a6710 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sun, 14 Jun 2026 11:48:34 +0330 Subject: [PATCH 28/35] build and format --- .../reports/driverReports/page.js | 36 +-- .../reports/machineTypeReports/page.js | 36 +-- .../reports/machinesReports/page.js | 36 +-- .../diverReports/DriverReportsList.jsx | 142 ++++++------ .../DriverDetailsDialog/DriverList/index.jsx | 212 ++++++++--------- .../RowActions/DriverDetails/Form/index.jsx | 54 ++--- .../RowActions/DriverDetails/index.jsx | 91 ++++---- .../RowActions/RouteDetail/ShowRoute.jsx | 92 ++++---- .../RowActions/RouteDetail/index.jsx | 114 +++++----- .../reports/diverReports/RowActions/index.jsx | 12 +- .../Search/FromDateController.jsx | 54 ++--- .../diverReports/Search/SearchReportField.jsx | 88 +++---- .../diverReports/Search/SelectProvince.jsx | 90 ++++---- .../diverReports/Search/ToDateController.jsx | 60 ++--- .../reports/diverReports/Search/index.jsx | 26 +-- .../reports/diverReports/Toolbar.jsx | 22 +- .../reports/diverReports/index.jsx | 5 +- .../machinesReports/ExcelPrint/index.jsx | 154 ++++++------- .../machinesReports/MachinesReportsList.jsx | 162 ++++++------- .../MachineMissionsList/index.jsx | 212 ++++++++--------- .../RowActions/MissionDitails/Form/index.jsx | 54 ++--- .../RowActions/MissionDitails/index.jsx | 94 ++++---- .../RowActions/RouteDetail/ShowRoute.jsx | 92 ++++---- .../RowActions/RouteDetail/index.jsx | 114 +++++----- .../machinesReports/RowActions/index.jsx | 12 +- .../Search/FromDateController.jsx | 54 ++--- .../Search/SearchReportField.jsx | 88 +++---- .../machinesReports/Search/SelectProvince.jsx | 90 ++++---- .../Search/ToDateController.jsx | 60 ++--- .../reports/machinesReports/Search/index.jsx | 26 +-- .../reports/machinesReports/Toolbar.jsx | 22 +- .../reports/machinesReports/index.jsx | 214 +++++++++--------- .../MachinesReportsList.jsx | 122 +++++----- .../MachineMissionsList/index.jsx | 212 ++++++++--------- .../RowActions/MissionDitails/Form/index.jsx | 54 ++--- .../RowActions/MissionDitails/index.jsx | 94 ++++---- .../RowActions/RouteDetail/ShowRoute.jsx | 92 ++++---- .../RowActions/RouteDetail/index.jsx | 114 +++++----- .../machinesTypeReports/RowActions/index.jsx | 16 +- .../Search/FromDateController.jsx | 54 ++--- .../Search/SearchReportField.jsx | 88 +++---- .../Search/SelectProvince.jsx | 90 ++++---- .../Search/ToDateController.jsx | 60 ++--- .../machinesTypeReports/Search/index.jsx | 26 +-- .../reports/machinesTypeReports/Toolbar.jsx | 22 +- src/core/utils/routes.js | 9 +- 46 files changed, 1832 insertions(+), 1839 deletions(-) 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 index 95cfc33..6df3acd 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/driverReports/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/driverReports/page.js @@ -1,18 +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 ( - - - - ); -} +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/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machineTypeReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machineTypeReports/page.js index e8725f1..0eb121e 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machineTypeReports/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machineTypeReports/page.js @@ -1,18 +1,18 @@ -import WithPermission from "@/core/middlewares/withPermission"; -import MachinesTypeReportsPage from "@/components/dashboard/roadMissions/reports/machinesTypeReports"; - -export const metadata = { - title: "کارتابل گزارش نوع ماشین‌ها", -}; - -export default function Page() { - return ( - - - - ); -} +import WithPermission from "@/core/middlewares/withPermission"; +import MachinesTypeReportsPage from "@/components/dashboard/roadMissions/reports/machinesTypeReports"; + +export const metadata = { + title: "کارتابل گزارش نوع ماشین‌ها", +}; + +export default function Page() { + return ( + + + + ); +} diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machinesReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machinesReports/page.js index 0656840..97c952d 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machinesReports/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/machinesReports/page.js @@ -1,18 +1,18 @@ -import MachinesReportsPage from "@/components/dashboard/roadMissions/reports/machinesReports"; -import WithPermission from "@/core/middlewares/withPermission"; - -export const metadata = { - title: "کارتابل گزارش ماشین‌ها", -}; - -export default function Page() { - return ( - - - - ); -} +import MachinesReportsPage from "@/components/dashboard/roadMissions/reports/machinesReports"; +import WithPermission from "@/core/middlewares/withPermission"; + +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 index 94880cd..a279dc4 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx @@ -1,71 +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; +"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/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx index 3fc9f6f..2d13661 100644 --- 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 @@ -1,106 +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; +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 index 3fcc57c..d4c1c65 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/index.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/index.jsx @@ -1,27 +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; +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 index 4a02707..9e32458 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/index.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/index.jsx @@ -1,47 +1,44 @@ -import { Close, RemoveRedEye } from "@mui/icons-material"; -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useState } from "react"; -import DriverDetailsTable from "./Form"; - -const DriverDetails = ({ row }) => { - const [openDriverDetails, setOpenDriverDetails] = useState(false); - - return ( - <> - - { - setOpenDriverDetails(true); - }} - > - - - - - setOpenDriverDetails(false)} - sx={(theme) => ({ - position: "absolute", - right: 8, - top: 8, - zIndex: 50, - color: theme.palette.grey[500], - })} - > - - - ریز گزارشات راننده - {openDriverDetails && ( - - )} - - - ); -}; -export default DriverDetails; +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); + }} + > + + + + + setOpenDriverDetails(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + ریز گزارشات راننده + {openDriverDetails && ( + + )} + + + ); +}; +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 index 5e1a4bd..7d47ba8 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/ShowRoute.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/ShowRoute.jsx @@ -1,46 +1,46 @@ -import { useEffect, useRef } from "react"; -import { Marker, Polyline, useMap } from "react-leaflet"; -import L from "leaflet"; -import polyline from "@mapbox/polyline"; -import SourceIcon from "@/assets/images/source-icon.svg"; -import DestIcon from "@/assets/images/destination-icon.svg"; - -const ShowRoute = ({ area }) => { - const map = useMap(); - const defaultIconSize = [35, 35]; - - const createCustomIcon = (size, iconUrl) => { - return L.icon({ - iconUrl: iconUrl, - iconSize: size, - iconAnchor: [size[0] / 2, size[1]], - popupAnchor: [0, -size[1]], - }); - }; - - useEffect(() => { - if (coords.length > 0) { - map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); - } - }, [area]); - const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); - const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); - - if (!area) return null; - const coords = polyline.decode(area, 6); - - if (coords.length === 0) return null; - - const sourcePosition = coords[0]; - const destPosition = coords[coords.length - 1]; - - return ( - <> - - - - - ); -}; - -export default ShowRoute; +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); + const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); + + if (!area) return null; + const coords = polyline.decode(area, 6); + + if (coords.length === 0) return null; + + const sourcePosition = coords[0]; + const destPosition = coords[coords.length - 1]; + + return ( + <> + + + + + ); +}; + +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 index 4501d35..48b84a2 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/index.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/RouteDetail/index.jsx @@ -1,57 +1,57 @@ -import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useState } from "react"; -import MapIcon from "@mui/icons-material/Map"; -import MapLayer from "@/core/components/MapLayer"; -import ShowRoute from "./ShowRoute"; - -const RouteDetail = ({ encoded_route }) => { - const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false); - return ( - <> - - setOpenRouteDetailDialog(true)}> - - - - setOpenRouteDetailDialog(false)} - PaperProps={{ - sx: { - boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", - }, - }} - dir="rtl" - maxWidth={"sm"} - > - مسیر انتخابی - - - - - - - - - - - - - ); -}; -export default RouteDetail; +import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import MapIcon from "@mui/icons-material/Map"; +import MapLayer from "@/core/components/MapLayer"; +import ShowRoute from "./ShowRoute"; + +const RouteDetail = ({ encoded_route }) => { + const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false); + return ( + <> + + setOpenRouteDetailDialog(true)}> + + + + setOpenRouteDetailDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"sm"} + > + مسیر انتخابی + + + + + + + + + + + + + ); +}; +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 index af9b70a..f37d403 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/index.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/index.jsx @@ -1,6 +1,6 @@ -import DriverDetails from "./DriverDetails"; - -const RowActions = ({ row }) => { - return ; -}; -export default RowActions; +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 index 490ee7b..0a81488 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/Search/FromDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/FromDateController.jsx @@ -1,27 +1,27 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller } from "react-hook-form"; - -const FromDateController = ({ control }) => { - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default FromDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller } from "react-hook-form"; + +const FromDateController = ({ control }) => { + return ( + ( + { + 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 index bde2a4c..e1b71cd 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/Search/SearchReportField.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/SearchReportField.jsx @@ -1,44 +1,44 @@ -import SearchIcon from "@mui/icons-material/Search"; -import { Button, Grid } from "@mui/material"; -import { Controller } from "react-hook-form"; -import FromDateController from "./FromDateController"; -import SelectProvince from "./SelectProvince"; -import ToDateController from "./ToDateController"; - -const SearchReportField = ({ control, hasProvincesPermission }) => { - return ( - - - - - - - - {hasProvincesPermission && ( - - - - )} - - ( - - )} - /> - - - ); -}; - -export default SearchReportField; +import SearchIcon from "@mui/icons-material/Search"; +import { Button, Grid } from "@mui/material"; +import { Controller } from "react-hook-form"; +import FromDateController from "./FromDateController"; +import SelectProvince from "./SelectProvince"; +import ToDateController from "./ToDateController"; + +const SearchReportField = ({ control, hasProvincesPermission }) => { + return ( + + + + + + + + {hasProvincesPermission && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +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 index 2b24d67..89395f0 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/Search/SelectProvince.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/SelectProvince.jsx @@ -1,45 +1,45 @@ -import useProvinces from "@/lib/hooks/useProvince"; -import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; -import { Controller } from "react-hook-form"; - -const SelectProvince = ({ control }) => { - const { provinces, loadingProvinces, errorProvinces } = useProvinces(); - return ( - ( - - استان - - {error && {error.message}} - - )} - /> - ); -}; -export default SelectProvince; +import useProvinces from "@/lib/hooks/useProvince"; +import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; +import { Controller } from "react-hook-form"; + +const SelectProvince = ({ control }) => { + const { provinces, loadingProvinces, errorProvinces } = useProvinces(); + return ( + ( + + استان + + {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 index fc4a776..ef3ff49 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/Search/ToDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/ToDateController.jsx @@ -1,30 +1,30 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller, useWatch } from "react-hook-form"; - -const ToDateController = ({ control }) => { - const minDate = useWatch({ control, name: "from_date" }); - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default ToDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller, useWatch } from "react-hook-form"; + +const ToDateController = ({ control }) => { + const minDate = useWatch({ control, name: "from_date" }); + return ( + ( + { + 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 index f29d302..9d504f2 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/Search/index.jsx @@ -1,13 +1,13 @@ -import StyledForm from "@/core/components/StyledForm"; -import SearchReportField from "./SearchReportField"; - -const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => { - return ( - <> - - - - - ); -}; -export default SearchReportList; +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 index 0f726c7..afc132c 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/Toolbar.jsx @@ -1,11 +1,11 @@ -import { Box } from "@mui/material"; -import PrintExcel from "./ExcelPrint"; - -const Toolbar = ({ table, filterData, mutate }) => { - return ( - - - - ); -}; -export default Toolbar; +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 index cae06cb..967a8a6 100644 --- a/src/components/dashboard/roadMissions/reports/diverReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/diverReports/index.jsx @@ -1,9 +1,6 @@ "use client"; import PageTitle from "@/core/components/PageTitle"; -import { - GET_DRIVER_COUNTRY_ACTIVITY_REPORT, - GET_DRIVER_PROVINCE_ACTIVITY_REPORT, -} from "@/core/utils/routes"; +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"; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/ExcelPrint/index.jsx index ef85a7f..8377ab4 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/ExcelPrint/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/ExcelPrint/index.jsx @@ -1,77 +1,77 @@ -"use client"; -import { - EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT, - EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT, -} from "@/core/utils/routes"; -import useRequest from "@/lib/hooks/useRequest"; -import { useTheme } from "@emotion/react"; -import DescriptionIcon from "@mui/icons-material/Description"; -import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material"; -import FileSaver from "file-saver"; -import moment from "jalali-moment"; -import { useMemo, useState } from "react"; - -const PrintExcel = ({ table, filterData }) => { - const theme = useTheme(); - const isMobile = useMediaQuery(theme.breakpoints.down("sm")); - const [loading, setLoading] = useState(false); - const requestServer = useRequest({ notificationSuccess: true }); - const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => { - if (filter.value) { - acc.push({ id: filter.id, value: filter.value }); - } - return acc; - }, []); - - const filterParams = useMemo(() => { - const params = new URLSearchParams(); - activeFilters.length > 0 && - activeFilters.map((filter, index) => { - params.set(`${filter.id}`, filter.value); - }); - return params; - }, [activeFilters]); - - const clickHandler = () => { - setLoading(true); - const CountryOrProvince = activeFilters.find((item) => item.id === "province_id"); - const requestUrl = - CountryOrProvince.value === "-1" - ? EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT - : EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT; - requestServer(`${requestUrl}?${filterParams}`, "get", { - requestOptions: { responseType: "blob" }, - }) - .then((response) => { - const filename = `خروجی کارتابل گزارشات گشت راهداری تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`; - FileSaver.saveAs(response.data, filename); - }) - .catch(() => {}) - .finally(() => { - setLoading(false); - }); - }; - - return ( - <> - {isMobile ? ( - - - - ) : ( - - )} - - ); -}; -export default PrintExcel; +"use client"; +import { + EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT, + EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT, +} from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import { useTheme } from "@emotion/react"; +import DescriptionIcon from "@mui/icons-material/Description"; +import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material"; +import FileSaver from "file-saver"; +import moment from "jalali-moment"; +import { useMemo, useState } from "react"; + +const PrintExcel = ({ table, filterData }) => { + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down("sm")); + const [loading, setLoading] = useState(false); + const requestServer = useRequest({ notificationSuccess: true }); + const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => { + if (filter.value) { + acc.push({ id: filter.id, value: filter.value }); + } + return acc; + }, []); + + const filterParams = useMemo(() => { + const params = new URLSearchParams(); + activeFilters.length > 0 && + activeFilters.map((filter, index) => { + params.set(`${filter.id}`, filter.value); + }); + return params; + }, [activeFilters]); + + const clickHandler = () => { + setLoading(true); + const CountryOrProvince = activeFilters.find((item) => item.id === "province_id"); + const requestUrl = + CountryOrProvince.value === "-1" + ? EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT + : EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT; + requestServer(`${requestUrl}?${filterParams}`, "get", { + requestOptions: { responseType: "blob" }, + }) + .then((response) => { + const filename = `خروجی کارتابل گزارشات گشت راهداری تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`; + FileSaver.saveAs(response.data, filename); + }) + .catch(() => {}) + .finally(() => { + setLoading(false); + }); + }; + + return ( + <> + {isMobile ? ( + + + + ) : ( + + )} + + ); +}; +export default PrintExcel; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx index 34badf1..363c85f 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx @@ -1,81 +1,81 @@ -"use client"; -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import { Box } from "@mui/material"; -import { useMemo } from "react"; -import Toolbar from "./Toolbar"; -import RowActions from "./RowActions"; - -const MachinesReportsList = ({ data, specialFilter }) => { - const columns = useMemo(() => { - return [ - { - accessorKey: "machine_id", - header: "کد یکتا", - id: "machine_id", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "car_name", - header: "مدل ماشین", - id: "car_name", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "machine_code", - header: "کد ماشین", - id: "machine_code", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "func", - header: "کارکرد", - id: "func", - enableColumnFilter: false, - enableSorting: false, - datatype: "number", - grow: false, - size: 50, - }, - { - accessorKey: "missions", - header: "تعداد ماموریت", - id: "missions", - enableColumnFilter: false, - enableSorting: false, - datatype: "number", - grow: false, - size: 50, - }, - ]; - }, []); - - return ( - - - - ); -}; - -export default MachinesReportsList; +"use client"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; +import Toolbar from "./Toolbar"; +import RowActions from "./RowActions"; + +const MachinesReportsList = ({ data, specialFilter }) => { + const columns = useMemo(() => { + return [ + { + accessorKey: "machine_id", + header: "کد یکتا", + id: "machine_id", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "car_name", + header: "مدل ماشین", + id: "car_name", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "machine_code", + header: "کد ماشین", + id: "machine_code", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "func", + header: "کارکرد", + id: "func", + enableColumnFilter: false, + enableSorting: false, + datatype: "number", + grow: false, + size: 50, + }, + { + accessorKey: "missions", + header: "تعداد ماموریت", + id: "missions", + enableColumnFilter: false, + enableSorting: false, + datatype: "number", + grow: false, + size: 50, + }, + ]; + }, []); + + return ( + + + + ); +}; + +export default MachinesReportsList; 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 9bd3373..36d781a 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 @@ -1,106 +1,106 @@ -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import { GET_MACHINE_MISSIONS_DETAILS } from "@/core/utils/routes"; -import { Box } from "@mui/material"; -import { useMemo } from "react"; - -const MachineMissionsList = ({ row }) => { - const columns = useMemo( - () => [ - { - accessorKey: "id", - header: "کد یکتا", - id: "id", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 80, - }, - { - accessorKey: "province_name", - header: "استان", - id: "province_name", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "city_name", - header: "شهر", - id: "city_name", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "station_name", - header: "راهدارخانه", - id: "station_name", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "driver_name", - header: "راننده", - id: "driver_name", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "km", - header: "کیلومتر شروع", - id: "km", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "end_km", - header: "کیلومتر پایان", - id: "end_km", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - ], - [] - ); - - return ( - <> - - - - - ); -}; -export default MachineMissionsList; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { GET_MACHINE_MISSIONS_DETAILS } from "@/core/utils/routes"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; + +const MachineMissionsList = ({ row }) => { + const columns = useMemo( + () => [ + { + accessorKey: "id", + header: "کد یکتا", + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 80, + }, + { + accessorKey: "province_name", + header: "استان", + id: "province_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "city_name", + header: "شهر", + id: "city_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "station_name", + header: "راهدارخانه", + id: "station_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "driver_name", + header: "راننده", + id: "driver_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "km", + header: "کیلومتر شروع", + id: "km", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "end_km", + header: "کیلومتر پایان", + id: "end_km", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + ], + [] + ); + + return ( + <> + + + + + ); +}; +export default MachineMissionsList; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/index.jsx index 5e79bfa..117e6ea 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/index.jsx @@ -1,27 +1,27 @@ -import { Box, Button, DialogActions, DialogContent } from "@mui/material"; -import { Stack } from "@mui/system"; -import MachineMissionsList from "./MachineMissionsDetailsDialog/MachineMissionsList"; - -const MachineMissionsDetailsTable = ({ row, setOpenMachineMissionsDetails }) => { - return ( - <> - - - - - - - - - - - - - - - - ); -}; -export default MachineMissionsDetailsTable; +import { Box, Button, DialogActions, DialogContent } from "@mui/material"; +import { Stack } from "@mui/system"; +import MachineMissionsList from "./MachineMissionsDetailsDialog/MachineMissionsList"; + +const MachineMissionsDetailsTable = ({ row, setOpenMachineMissionsDetails }) => { + return ( + <> + + + + + + + + + + + + + + + + ); +}; +export default MachineMissionsDetailsTable; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/index.jsx index 3b65c8f..f3ef62e 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/index.jsx @@ -1,47 +1,47 @@ -import { Close, RemoveRedEye } from "@mui/icons-material"; -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useState } from "react"; -import MachineMissionsDetailsTable from "./Form"; - -const MissionDetails = ({ row }) => { - const [openMachineMissionsDetails, setOpenMachineMissionsDetails] = useState(false); - - return ( - <> - - { - setOpenMachineMissionsDetails(true); - }} - > - - - - - setOpenMachineMissionsDetails(false)} - sx={(theme) => ({ - position: "absolute", - right: 8, - top: 8, - zIndex: 50, - color: theme.palette.grey[500], - })} - > - - - ریز گزارشات خودرو - {openMachineMissionsDetails && ( - - )} - - - ); -}; -export default MissionDetails; +import { Close, RemoveRedEye } from "@mui/icons-material"; +import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import MachineMissionsDetailsTable from "./Form"; + +const MissionDetails = ({ row }) => { + const [openMachineMissionsDetails, setOpenMachineMissionsDetails] = useState(false); + + return ( + <> + + { + setOpenMachineMissionsDetails(true); + }} + > + + + + + setOpenMachineMissionsDetails(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + ریز گزارشات خودرو + {openMachineMissionsDetails && ( + + )} + + + ); +}; +export default MissionDetails; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/ShowRoute.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/ShowRoute.jsx index 5e1a4bd..7d47ba8 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/ShowRoute.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/ShowRoute.jsx @@ -1,46 +1,46 @@ -import { useEffect, useRef } from "react"; -import { Marker, Polyline, useMap } from "react-leaflet"; -import L from "leaflet"; -import polyline from "@mapbox/polyline"; -import SourceIcon from "@/assets/images/source-icon.svg"; -import DestIcon from "@/assets/images/destination-icon.svg"; - -const ShowRoute = ({ area }) => { - const map = useMap(); - const defaultIconSize = [35, 35]; - - const createCustomIcon = (size, iconUrl) => { - return L.icon({ - iconUrl: iconUrl, - iconSize: size, - iconAnchor: [size[0] / 2, size[1]], - popupAnchor: [0, -size[1]], - }); - }; - - useEffect(() => { - if (coords.length > 0) { - map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); - } - }, [area]); - const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); - const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); - - if (!area) return null; - const coords = polyline.decode(area, 6); - - if (coords.length === 0) return null; - - const sourcePosition = coords[0]; - const destPosition = coords[coords.length - 1]; - - return ( - <> - - - - - ); -}; - -export default ShowRoute; +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); + const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); + + if (!area) return null; + const coords = polyline.decode(area, 6); + + if (coords.length === 0) return null; + + const sourcePosition = coords[0]; + const destPosition = coords[coords.length - 1]; + + return ( + <> + + + + + ); +}; + +export default ShowRoute; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/index.jsx index 4501d35..48b84a2 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/RouteDetail/index.jsx @@ -1,57 +1,57 @@ -import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useState } from "react"; -import MapIcon from "@mui/icons-material/Map"; -import MapLayer from "@/core/components/MapLayer"; -import ShowRoute from "./ShowRoute"; - -const RouteDetail = ({ encoded_route }) => { - const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false); - return ( - <> - - setOpenRouteDetailDialog(true)}> - - - - setOpenRouteDetailDialog(false)} - PaperProps={{ - sx: { - boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", - }, - }} - dir="rtl" - maxWidth={"sm"} - > - مسیر انتخابی - - - - - - - - - - - - - ); -}; -export default RouteDetail; +import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import MapIcon from "@mui/icons-material/Map"; +import MapLayer from "@/core/components/MapLayer"; +import ShowRoute from "./ShowRoute"; + +const RouteDetail = ({ encoded_route }) => { + const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false); + return ( + <> + + setOpenRouteDetailDialog(true)}> + + + + setOpenRouteDetailDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"sm"} + > + مسیر انتخابی + + + + + + + + + + + + + ); +}; +export default RouteDetail; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/index.jsx index dbf9aa7..5cb6a4d 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/index.jsx @@ -1,6 +1,6 @@ -import MissionDetails from "./MissionDitails"; - -const RowActions = ({ row }) => { - return ; -}; -export default RowActions; +import MissionDetails from "./MissionDitails"; + +const RowActions = ({ row }) => { + return ; +}; +export default RowActions; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Search/FromDateController.jsx index 490ee7b..0a81488 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/Search/FromDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/Search/FromDateController.jsx @@ -1,27 +1,27 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller } from "react-hook-form"; - -const FromDateController = ({ control }) => { - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default FromDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller } from "react-hook-form"; + +const FromDateController = ({ control }) => { + return ( + ( + { + 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/machinesReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Search/SearchReportField.jsx index bde2a4c..e1b71cd 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/Search/SearchReportField.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/Search/SearchReportField.jsx @@ -1,44 +1,44 @@ -import SearchIcon from "@mui/icons-material/Search"; -import { Button, Grid } from "@mui/material"; -import { Controller } from "react-hook-form"; -import FromDateController from "./FromDateController"; -import SelectProvince from "./SelectProvince"; -import ToDateController from "./ToDateController"; - -const SearchReportField = ({ control, hasProvincesPermission }) => { - return ( - - - - - - - - {hasProvincesPermission && ( - - - - )} - - ( - - )} - /> - - - ); -}; - -export default SearchReportField; +import SearchIcon from "@mui/icons-material/Search"; +import { Button, Grid } from "@mui/material"; +import { Controller } from "react-hook-form"; +import FromDateController from "./FromDateController"; +import SelectProvince from "./SelectProvince"; +import ToDateController from "./ToDateController"; + +const SearchReportField = ({ control, hasProvincesPermission }) => { + return ( + + + + + + + + {hasProvincesPermission && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +export default SearchReportField; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Search/SelectProvince.jsx index 2b24d67..89395f0 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/Search/SelectProvince.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/Search/SelectProvince.jsx @@ -1,45 +1,45 @@ -import useProvinces from "@/lib/hooks/useProvince"; -import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; -import { Controller } from "react-hook-form"; - -const SelectProvince = ({ control }) => { - const { provinces, loadingProvinces, errorProvinces } = useProvinces(); - return ( - ( - - استان - - {error && {error.message}} - - )} - /> - ); -}; -export default SelectProvince; +import useProvinces from "@/lib/hooks/useProvince"; +import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; +import { Controller } from "react-hook-form"; + +const SelectProvince = ({ control }) => { + const { provinces, loadingProvinces, errorProvinces } = useProvinces(); + return ( + ( + + استان + + {error && {error.message}} + + )} + /> + ); +}; +export default SelectProvince; diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Search/ToDateController.jsx index fc4a776..ef3ff49 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/Search/ToDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/Search/ToDateController.jsx @@ -1,30 +1,30 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller, useWatch } from "react-hook-form"; - -const ToDateController = ({ control }) => { - const minDate = useWatch({ control, name: "from_date" }); - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default ToDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller, useWatch } from "react-hook-form"; + +const ToDateController = ({ control }) => { + const minDate = useWatch({ control, name: "from_date" }); + return ( + ( + { + 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/machinesReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Search/index.jsx index f29d302..9d504f2 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/Search/index.jsx @@ -1,13 +1,13 @@ -import StyledForm from "@/core/components/StyledForm"; -import SearchReportField from "./SearchReportField"; - -const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => { - return ( - <> - - - - - ); -}; -export default SearchReportList; +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/machinesReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/Toolbar.jsx index 0f726c7..afc132c 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/Toolbar.jsx @@ -1,11 +1,11 @@ -import { Box } from "@mui/material"; -import PrintExcel from "./ExcelPrint"; - -const Toolbar = ({ table, filterData, mutate }) => { - return ( - - - - ); -}; -export default Toolbar; +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/machinesReports/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/index.jsx index e62f273..655944d 100644 --- a/src/components/dashboard/roadMissions/reports/machinesReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesReports/index.jsx @@ -1,107 +1,107 @@ -"use client"; -import PageTitle from "@/core/components/PageTitle"; -import { GET_MACHINES_COUNTRY_ACTIVITY_REPORT, GET_MACHINES_PROVINCE_ACTIVITY_REPORT } from "@/core/utils/routes"; -import { useAuth } from "@/lib/contexts/auth"; -import { usePermissions } from "@/lib/hooks/usePermissions"; -import useRequest from "@/lib/hooks/useRequest"; -import { yupResolver } from "@hookform/resolvers/yup"; -import { LinearProgress, Stack } from "@mui/material"; -import moment from "jalali-moment"; -import { useEffect, useState } from "react"; -import { useForm } from "react-hook-form"; -import * as yup from "yup"; -import MachinesReportsList from "./MachinesReportsList"; -import SearchReportList from "./Search"; - -const MachinesReportsPage = () => { - const [data, setData] = useState(null); - const { data: userPermissions } = usePermissions(); - const { user } = useAuth(); - const requestServer = useRequest(); - const hasProvincesPermission = userPermissions?.includes("mission-report-country"); - - const defaultValues = { - from_date: moment(new Date()).format("YYYY-MM-DD"), - date_to: moment(new Date()).format("YYYY-MM-DD"), - province_id: user.province_id || "-1", - }; - const defaultFilter = [ - { value: `${defaultValues.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, - { value: `${defaultValues.from_date}`, datatype: "date", id: "from_date", fn: "between" }, - { value: `${defaultValues.date_to}`, datatype: "date", id: "date_to", fn: "between" }, - ]; - const [specialFilter, setSpecialFilter] = useState(defaultFilter); - - const onSearchSubmit = async (data) => { - const params = new URLSearchParams(); - params.set("from_date", `${data.from_date} 00:00:00`); - params.set("date_to", `${data.date_to} 23:59:59`); - setSpecialFilter([ - { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, - { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" }, - { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" }, - ]); - if (data.province_id === "-1") { - try { - const response = await requestServer(`${GET_MACHINES_COUNTRY_ACTIVITY_REPORT}?${params}`); - const result = response.data.data; - - setData({ - data: result.activities, - filters: data, - }); - } catch (e) {} - } else { - try { - params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MACHINES_PROVINCE_ACTIVITY_REPORT}?${params}`); - - const result = response.data.data; - - setData({ - data: result.activities, - filters: data, - }); - } catch (e) {} - } - }; - - useEffect(() => { - if (!userPermissions) return; - onSearchSubmit(defaultValues); - }, [userPermissions]); - - const validationSchema = yup.object().shape({ - from_date: yup - .string() - .required("تاریخ شروع الزامی است!") - .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ شروع الزامی است!") - .test("is-valid-date", "تاریخ شروع معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), - date_to: yup - .string() - .required("تاریخ پایان الزامی است!") - .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ پایان الزامی است!") - .test("is-valid-date", "تاریخ پایان معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), - province_id: yup.string().nullable(), - }); - - const { control, handleSubmit } = useForm({ - defaultValues, - resolver: yupResolver(validationSchema), - mode: "all", - }); - - return ( - - - - {!data ? : } - - ); -}; -export default MachinesReportsPage; +"use client"; +import PageTitle from "@/core/components/PageTitle"; +import { GET_MACHINES_COUNTRY_ACTIVITY_REPORT, GET_MACHINES_PROVINCE_ACTIVITY_REPORT } from "@/core/utils/routes"; +import { useAuth } from "@/lib/contexts/auth"; +import { usePermissions } from "@/lib/hooks/usePermissions"; +import useRequest from "@/lib/hooks/useRequest"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { LinearProgress, Stack } from "@mui/material"; +import moment from "jalali-moment"; +import { useEffect, useState } from "react"; +import { useForm } from "react-hook-form"; +import * as yup from "yup"; +import MachinesReportsList from "./MachinesReportsList"; +import SearchReportList from "./Search"; + +const MachinesReportsPage = () => { + const [data, setData] = useState(null); + const { data: userPermissions } = usePermissions(); + const { user } = useAuth(); + const requestServer = useRequest(); + const hasProvincesPermission = userPermissions?.includes("mission-report-country"); + + const defaultValues = { + from_date: moment(new Date()).format("YYYY-MM-DD"), + date_to: moment(new Date()).format("YYYY-MM-DD"), + province_id: user.province_id || "-1", + }; + const defaultFilter = [ + { value: `${defaultValues.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, + { value: `${defaultValues.from_date}`, datatype: "date", id: "from_date", fn: "between" }, + { value: `${defaultValues.date_to}`, datatype: "date", id: "date_to", fn: "between" }, + ]; + const [specialFilter, setSpecialFilter] = useState(defaultFilter); + + const onSearchSubmit = async (data) => { + const params = new URLSearchParams(); + params.set("from_date", `${data.from_date} 00:00:00`); + params.set("date_to", `${data.date_to} 23:59:59`); + setSpecialFilter([ + { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, + { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" }, + { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" }, + ]); + if (data.province_id === "-1") { + try { + const response = await requestServer(`${GET_MACHINES_COUNTRY_ACTIVITY_REPORT}?${params}`); + const result = response.data.data; + + setData({ + data: result.activities, + filters: data, + }); + } catch (e) {} + } else { + try { + params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MACHINES_PROVINCE_ACTIVITY_REPORT}?${params}`); + + const result = response.data.data; + + setData({ + data: result.activities, + filters: data, + }); + } catch (e) {} + } + }; + + useEffect(() => { + if (!userPermissions) return; + onSearchSubmit(defaultValues); + }, [userPermissions]); + + const validationSchema = yup.object().shape({ + from_date: yup + .string() + .required("تاریخ شروع الزامی است!") + .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ شروع الزامی است!") + .test("is-valid-date", "تاریخ شروع معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), + date_to: yup + .string() + .required("تاریخ پایان الزامی است!") + .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ پایان الزامی است!") + .test("is-valid-date", "تاریخ پایان معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), + province_id: yup.string().nullable(), + }); + + const { control, handleSubmit } = useForm({ + defaultValues, + resolver: yupResolver(validationSchema), + mode: "all", + }); + + return ( + + + + {!data ? : } + + ); +}; +export default MachinesReportsPage; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx index 5fb261d..4f8b994 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx @@ -1,61 +1,61 @@ -"use client"; -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import { Box } from "@mui/material"; -import { useMemo } from "react"; -import Toolbar from "./Toolbar"; -// import RowActions from "./RowActions"; - -const MachinesReportsList = ({ data, specialFilter }) => { - const columns = useMemo(() => { - return [ - { - accessorKey: "car_type", - header: "نوع ماشین", - id: "car_type", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "func", - header: "کارکرد", - id: "func", - enableColumnFilter: false, - enableSorting: false, - datatype: "number", - grow: false, - size: 50, - }, - { - accessorKey: "missions", - header: "تعداد ماموریت", - id: "missions", - enableColumnFilter: false, - enableSorting: false, - datatype: "number", - grow: false, - size: 50, - }, - ]; - }, []); - - return ( - - - - ); -}; - -export default MachinesReportsList; +"use client"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; +import Toolbar from "./Toolbar"; +// import RowActions from "./RowActions"; + +const MachinesReportsList = ({ data, specialFilter }) => { + const columns = useMemo(() => { + return [ + { + accessorKey: "car_type", + header: "نوع ماشین", + id: "car_type", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "func", + header: "کارکرد", + id: "func", + enableColumnFilter: false, + enableSorting: false, + datatype: "number", + grow: false, + size: 50, + }, + { + accessorKey: "missions", + header: "تعداد ماموریت", + id: "missions", + enableColumnFilter: false, + enableSorting: false, + datatype: "number", + grow: false, + size: 50, + }, + ]; + }, []); + + return ( + + + + ); +}; + +export default MachinesReportsList; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx index ada49f4..87f612d 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx @@ -1,106 +1,106 @@ -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import { GET_MACHINE_MISSIONS_DETAILS, GET_MACHINE_TYPE_MISSIONS_DETAILS } from "@/core/utils/routes"; -import { Box } from "@mui/material"; -import { useMemo } from "react"; - -const MachineMissionsList = ({ row }) => { - const columns = useMemo( - () => [ - { - accessorKey: "id", - header: "کد یکتا", - id: "id", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 80, - }, - { - accessorKey: "province_name", - header: "استان", - id: "province_name", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "city_name", - header: "شهر", - id: "city_name", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "station_name", - header: "راهدارخانه", - id: "station_name", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "driver_name", - header: "راننده", - id: "driver_name", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "km", - header: "کیلومتر شروع", - id: "km", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - { - accessorKey: "end_km", - header: "کیلومتر پایان", - id: "end_km", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - }, - ], - [] - ); - - return ( - <> - - - - - ); -}; -export default MachineMissionsList; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { GET_MACHINE_MISSIONS_DETAILS, GET_MACHINE_TYPE_MISSIONS_DETAILS } from "@/core/utils/routes"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; + +const MachineMissionsList = ({ row }) => { + const columns = useMemo( + () => [ + { + accessorKey: "id", + header: "کد یکتا", + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 80, + }, + { + accessorKey: "province_name", + header: "استان", + id: "province_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "city_name", + header: "شهر", + id: "city_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "station_name", + header: "راهدارخانه", + id: "station_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "driver_name", + header: "راننده", + id: "driver_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "km", + header: "کیلومتر شروع", + id: "km", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "end_km", + header: "کیلومتر پایان", + id: "end_km", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + ], + [] + ); + + return ( + <> + + + + + ); +}; +export default MachineMissionsList; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/index.jsx index 5e79bfa..117e6ea 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/index.jsx @@ -1,27 +1,27 @@ -import { Box, Button, DialogActions, DialogContent } from "@mui/material"; -import { Stack } from "@mui/system"; -import MachineMissionsList from "./MachineMissionsDetailsDialog/MachineMissionsList"; - -const MachineMissionsDetailsTable = ({ row, setOpenMachineMissionsDetails }) => { - return ( - <> - - - - - - - - - - - - - - - - ); -}; -export default MachineMissionsDetailsTable; +import { Box, Button, DialogActions, DialogContent } from "@mui/material"; +import { Stack } from "@mui/system"; +import MachineMissionsList from "./MachineMissionsDetailsDialog/MachineMissionsList"; + +const MachineMissionsDetailsTable = ({ row, setOpenMachineMissionsDetails }) => { + return ( + <> + + + + + + + + + + + + + + + + ); +}; +export default MachineMissionsDetailsTable; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/index.jsx index 21a8263..05be524 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/index.jsx @@ -1,47 +1,47 @@ -import { Close, RemoveRedEye } from "@mui/icons-material"; -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useState } from "react"; -import MachineMissionsDetailsTable from "./Form"; - -const MissionDetails = ({ row }) => { - const [openMachineMissionsDetails, setOpenMachineMissionsDetails] = useState(false); - - return ( - <> - - { - setOpenMachineMissionsDetails(true); - }} - > - - - - - setOpenMachineMissionsDetails(false)} - sx={(theme) => ({ - position: "absolute", - right: 8, - top: 8, - zIndex: 50, - color: theme.palette.grey[500], - })} - > - - - ریز گزارشات نوع خودرو - {openMachineMissionsDetails && ( - - )} - - - ); -}; -export default MissionDetails; +import { Close, RemoveRedEye } from "@mui/icons-material"; +import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import MachineMissionsDetailsTable from "./Form"; + +const MissionDetails = ({ row }) => { + const [openMachineMissionsDetails, setOpenMachineMissionsDetails] = useState(false); + + return ( + <> + + { + setOpenMachineMissionsDetails(true); + }} + > + + + + + setOpenMachineMissionsDetails(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + ریز گزارشات نوع خودرو + {openMachineMissionsDetails && ( + + )} + + + ); +}; +export default MissionDetails; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/ShowRoute.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/ShowRoute.jsx index 5e1a4bd..7d47ba8 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/ShowRoute.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/ShowRoute.jsx @@ -1,46 +1,46 @@ -import { useEffect, useRef } from "react"; -import { Marker, Polyline, useMap } from "react-leaflet"; -import L from "leaflet"; -import polyline from "@mapbox/polyline"; -import SourceIcon from "@/assets/images/source-icon.svg"; -import DestIcon from "@/assets/images/destination-icon.svg"; - -const ShowRoute = ({ area }) => { - const map = useMap(); - const defaultIconSize = [35, 35]; - - const createCustomIcon = (size, iconUrl) => { - return L.icon({ - iconUrl: iconUrl, - iconSize: size, - iconAnchor: [size[0] / 2, size[1]], - popupAnchor: [0, -size[1]], - }); - }; - - useEffect(() => { - if (coords.length > 0) { - map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); - } - }, [area]); - const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); - const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); - - if (!area) return null; - const coords = polyline.decode(area, 6); - - if (coords.length === 0) return null; - - const sourcePosition = coords[0]; - const destPosition = coords[coords.length - 1]; - - return ( - <> - - - - - ); -}; - -export default ShowRoute; +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); + const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); + + if (!area) return null; + const coords = polyline.decode(area, 6); + + if (coords.length === 0) return null; + + const sourcePosition = coords[0]; + const destPosition = coords[coords.length - 1]; + + return ( + <> + + + + + ); +}; + +export default ShowRoute; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/index.jsx index 4501d35..48b84a2 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/RouteDetail/index.jsx @@ -1,57 +1,57 @@ -import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useState } from "react"; -import MapIcon from "@mui/icons-material/Map"; -import MapLayer from "@/core/components/MapLayer"; -import ShowRoute from "./ShowRoute"; - -const RouteDetail = ({ encoded_route }) => { - const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false); - return ( - <> - - setOpenRouteDetailDialog(true)}> - - - - setOpenRouteDetailDialog(false)} - PaperProps={{ - sx: { - boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", - }, - }} - dir="rtl" - maxWidth={"sm"} - > - مسیر انتخابی - - - - - - - - - - - - - ); -}; -export default RouteDetail; +import { Box, Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import MapIcon from "@mui/icons-material/Map"; +import MapLayer from "@/core/components/MapLayer"; +import ShowRoute from "./ShowRoute"; + +const RouteDetail = ({ encoded_route }) => { + const [openRouteDetailDialog, setOpenRouteDetailDialog] = useState(false); + return ( + <> + + setOpenRouteDetailDialog(true)}> + + + + setOpenRouteDetailDialog(false)} + PaperProps={{ + sx: { + boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px", + }, + }} + dir="rtl" + maxWidth={"sm"} + > + مسیر انتخابی + + + + + + + + + + + + + ); +}; +export default RouteDetail; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/index.jsx index 2690157..9f5e29d 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/index.jsx @@ -1,10 +1,6 @@ -// import MissionDetails from "./MissionDitails"; - -const RowActions = ({ row }) => { - return ( - <> - {/**/} - - ); -}; -export default RowActions; +// import MissionDetails from "./MissionDitails"; + +const RowActions = ({ row }) => { + return <>{/**/}; +}; +export default RowActions; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/FromDateController.jsx index 490ee7b..0a81488 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/FromDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/FromDateController.jsx @@ -1,27 +1,27 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller } from "react-hook-form"; - -const FromDateController = ({ control }) => { - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default FromDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller } from "react-hook-form"; + +const FromDateController = ({ control }) => { + return ( + ( + { + 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/machinesTypeReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SearchReportField.jsx index bde2a4c..e1b71cd 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SearchReportField.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SearchReportField.jsx @@ -1,44 +1,44 @@ -import SearchIcon from "@mui/icons-material/Search"; -import { Button, Grid } from "@mui/material"; -import { Controller } from "react-hook-form"; -import FromDateController from "./FromDateController"; -import SelectProvince from "./SelectProvince"; -import ToDateController from "./ToDateController"; - -const SearchReportField = ({ control, hasProvincesPermission }) => { - return ( - - - - - - - - {hasProvincesPermission && ( - - - - )} - - ( - - )} - /> - - - ); -}; - -export default SearchReportField; +import SearchIcon from "@mui/icons-material/Search"; +import { Button, Grid } from "@mui/material"; +import { Controller } from "react-hook-form"; +import FromDateController from "./FromDateController"; +import SelectProvince from "./SelectProvince"; +import ToDateController from "./ToDateController"; + +const SearchReportField = ({ control, hasProvincesPermission }) => { + return ( + + + + + + + + {hasProvincesPermission && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +export default SearchReportField; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SelectProvince.jsx index 2b24d67..89395f0 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SelectProvince.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/SelectProvince.jsx @@ -1,45 +1,45 @@ -import useProvinces from "@/lib/hooks/useProvince"; -import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; -import { Controller } from "react-hook-form"; - -const SelectProvince = ({ control }) => { - const { provinces, loadingProvinces, errorProvinces } = useProvinces(); - return ( - ( - - استان - - {error && {error.message}} - - )} - /> - ); -}; -export default SelectProvince; +import useProvinces from "@/lib/hooks/useProvince"; +import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; +import { Controller } from "react-hook-form"; + +const SelectProvince = ({ control }) => { + const { provinces, loadingProvinces, errorProvinces } = useProvinces(); + return ( + ( + + استان + + {error && {error.message}} + + )} + /> + ); +}; +export default SelectProvince; diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/ToDateController.jsx index fc4a776..ef3ff49 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/ToDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/ToDateController.jsx @@ -1,30 +1,30 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller, useWatch } from "react-hook-form"; - -const ToDateController = ({ control }) => { - const minDate = useWatch({ control, name: "from_date" }); - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default ToDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller, useWatch } from "react-hook-form"; + +const ToDateController = ({ control }) => { + const minDate = useWatch({ control, name: "from_date" }); + return ( + ( + { + 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/machinesTypeReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/index.jsx index f29d302..9d504f2 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Search/index.jsx @@ -1,13 +1,13 @@ -import StyledForm from "@/core/components/StyledForm"; -import SearchReportField from "./SearchReportField"; - -const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => { - return ( - <> - - - - - ); -}; -export default SearchReportList; +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/machinesTypeReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Toolbar.jsx index 0f726c7..afc132c 100644 --- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/Toolbar.jsx @@ -1,11 +1,11 @@ -import { Box } from "@mui/material"; -import PrintExcel from "./ExcelPrint"; - -const Toolbar = ({ table, filterData, mutate }) => { - return ( - - - - ); -}; -export default Toolbar; +import { Box } from "@mui/material"; +import PrintExcel from "./ExcelPrint"; + +const Toolbar = ({ table, filterData, mutate }) => { + return ( + + + + ); +}; +export default Toolbar; diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index d77593e..e8cd60f 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -256,8 +256,10 @@ 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 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 = @@ -265,7 +267,8 @@ export const EXPORT_GET_DRIVER_PROVINCE_ACTIVITY_REPORT = export const GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/country_machine_types_activity"; -export const GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/province_machine_types_activity"; +export const GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT = + api + "/api/v3/missions/report_machine/province_machine_types_activity"; export const EXPORT_GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/country_machine_types_activity_excel"; export const EXPORT_GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT = From 241f5835722f7e30f0c3089f161672bc95a40512 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sun, 14 Jun 2026 11:50:40 +0330 Subject: [PATCH 29/35] merge develop --- .../Dialog/Form/Area/Routing/AlarmText.jsx | 56 +-- .../Dialog/Form/Area/Routing/DataBox.jsx | 106 ++--- .../Dialog/Form/Area/Routing/ShowRoute.jsx | 92 ++-- .../Dialog/Form/Area/Routing/index.jsx | 438 +++++++++--------- 4 files changed, 346 insertions(+), 346 deletions(-) diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/AlarmText.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/AlarmText.jsx index 0a3be1b..0ddf8a0 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/AlarmText.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/AlarmText.jsx @@ -1,28 +1,28 @@ -import { Box, Typography } from "@mui/material"; - -const AlarmText = ({ isSource }) => { - if (isSource) return null; - return ( - - - با کلیک بر روی مارکر موقعیت را انتخاب کنید - - - ); -}; - -export default AlarmText; +import { Box, Typography } from "@mui/material"; + +const AlarmText = ({ isSource }) => { + if (isSource) return null; + return ( + + + با کلیک بر روی مارکر موقعیت را انتخاب کنید + + + ); +}; + +export default AlarmText; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/DataBox.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/DataBox.jsx index c19cb6f..5768f75 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/DataBox.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/DataBox.jsx @@ -1,53 +1,53 @@ -import { Box, Button, TextField } from "@mui/material"; - -const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => { - if (!isSource) return null; - - return ( - -
- - {isSource && isDest && ( - - )} -
- {isDest && ( -
- - -
- )} - - ); -}; - -export default DataBox; +import { Box, Button, TextField } from "@mui/material"; + +const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => { + if (!isSource) return null; + + return ( + +
+ + {isSource && isDest && ( + + )} +
+ {isDest && ( +
+ + +
+ )} + + ); +}; + +export default DataBox; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/ShowRoute.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/ShowRoute.jsx index 5e1a4bd..7d47ba8 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/ShowRoute.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/ShowRoute.jsx @@ -1,46 +1,46 @@ -import { useEffect, useRef } from "react"; -import { Marker, Polyline, useMap } from "react-leaflet"; -import L from "leaflet"; -import polyline from "@mapbox/polyline"; -import SourceIcon from "@/assets/images/source-icon.svg"; -import DestIcon from "@/assets/images/destination-icon.svg"; - -const ShowRoute = ({ area }) => { - const map = useMap(); - const defaultIconSize = [35, 35]; - - const createCustomIcon = (size, iconUrl) => { - return L.icon({ - iconUrl: iconUrl, - iconSize: size, - iconAnchor: [size[0] / 2, size[1]], - popupAnchor: [0, -size[1]], - }); - }; - - useEffect(() => { - if (coords.length > 0) { - map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); - } - }, [area]); - const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); - const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); - - if (!area) return null; - const coords = polyline.decode(area, 6); - - if (coords.length === 0) return null; - - const sourcePosition = coords[0]; - const destPosition = coords[coords.length - 1]; - - return ( - <> - - - - - ); -}; - -export default ShowRoute; +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); + const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); + + if (!area) return null; + const coords = polyline.decode(area, 6); + + if (coords.length === 0) return null; + + const sourcePosition = coords[0]; + const destPosition = coords[coords.length - 1]; + + return ( + <> + + + + + ); +}; + +export default ShowRoute; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/index.jsx index 06e7c9b..49c4651 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Area/Routing/index.jsx @@ -1,219 +1,219 @@ -import { Marker, Polyline, useMapEvents } from "react-leaflet"; -import L from "leaflet"; -import polyline from "@mapbox/polyline"; -import SourceIcon from "@/assets/images/source-icon.svg"; -import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; -import PrevDestIcon from "@/assets/images/prev-destination-icon.svg"; -import DestIcon from "@/assets/images/destination-icon.svg"; -import { useEffect, useRef, useState } from "react"; -import DataBox from "./DataBox"; -import AlarmText from "./AlarmText"; - -const Routing = ({ setArea, setLocations, locations, area }) => { - const mapPrevSourceMarker = useRef(); - const mapPrevDestMarker = useRef(); - const mapRef = useRef(null); - const defaultIconSize = [35, 35]; - const [isSource, setIsSource] = useState(false); - const [sourcePosition, setSourcePosition] = useState(null); - const [isDest, setIsDest] = useState(false); - const [destPosition, setDestPosition] = useState(null); - const [routeCoords, setRouteCoords] = useState([]); - const [alternateCoords, setAlternateCoords] = useState([]); - const [editingTarget, setEditingTarget] = useState(null); - const [selectedRoute, setSelectedRoute] = useState(null); - - const createCustomIcon = (size, iconUrl) => { - return L.icon({ - iconUrl: iconUrl, - iconSize: size, - iconAnchor: [size[0] / 2, size[1]], - popupAnchor: [0, -size[1]], - }); - }; - - const defaultIcon = createCustomIcon( - defaultIconSize, - isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src - ); - - const prevDestIcon = createCustomIcon( - defaultIconSize, - isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src - ); - - const isMovingSource = !isSource || editingTarget === "source"; - const isMovingDest = isSource && (!isDest || editingTarget === "dest"); - - const map = useMapEvents({ - move(e) { - if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); - if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter()); - }, - movestart() { - if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); - if (isMovingDest && mapPrevDestMarker.current) - mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); - }, - moveend() { - if (isMovingSource) - mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); - if (isMovingDest && mapPrevDestMarker.current) - mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); - }, - }); - - useEffect(() => { - mapRef.current = map; - }, [map]); - - useEffect(() => { - if (locations.length < 2) return; - const restoredSource = { lat: locations[0].lat, lng: locations[0].lon }; - const restoredDest = { lat: locations[1].lat, lng: locations[1].lon }; - setSourcePosition(restoredSource); - setDestPosition(restoredDest); - setIsSource(true); - setIsDest(true); - if (area) { - const decoded = polyline.decode(area, 6); - setRouteCoords(decoded); - setSelectedRoute({ index: "main", coords: decoded }); - setTimeout(() => { - mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); - }, 100); - } else { - fetchRoute(restoredSource, restoredDest); - } - }, []); - - const fetchRoute = async (source, dest) => { - const locs = [ - { lat: source.lat, lon: source.lng }, - { lat: dest.lat, lon: dest.lng }, - ]; - try { - const response = await fetch("https://jouya.141.ir/api/router/drive", { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ locations: locs }), - }); - const data = await response.json(); - const shape = data.trip.legs[0].shape; - setLocations(locs); - setArea(shape); - const decoded = polyline.decode(shape, 6); - setRouteCoords(decoded); - setSelectedRoute({ index: "main", coords: decoded }); - - if (data.alternates?.length > 0) { - const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); - setAlternateCoords(decodedAlternates); - } else { - setAlternateCoords([]); - } - map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); - } catch (error) { - console.error("Routing error:", error); - } - }; - - const handleMarkerClick = async () => { - if (!isSource || editingTarget === "source") { - const clickedPosition = mapPrevSourceMarker.current.getLatLng(); - setSourcePosition(clickedPosition); - setIsSource(true); - setEditingTarget(null); - setRouteCoords([]); - setAlternateCoords([]); - setSelectedRoute(null); - - if (editingTarget === "source" && destPosition) { - await fetchRoute(clickedPosition, destPosition); - } - } - }; - - const handleDestMarkerClick = async () => { - if (!isDest || editingTarget === "dest") { - const clickedPosition = mapPrevDestMarker.current.getLatLng(); - setDestPosition(clickedPosition); - setIsDest(true); - setEditingTarget(null); - - await fetchRoute(sourcePosition, clickedPosition); - } - }; - - const handleEditSource = () => { - setEditingTarget("source"); - setRouteCoords([]); - setAlternateCoords([]); - setSelectedRoute(null); - }; - - const handleEditDest = () => { - setEditingTarget("dest"); - setRouteCoords([]); - setAlternateCoords([]); - setSelectedRoute(null); - }; - - const handleSelectRoute = (index, coords) => { - setSelectedRoute({ index, coords }); - const encoded = polyline.encode(coords, 6); - setArea(encoded); - map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); - }; - - return ( - <> - - - - {isSource && ( - - )} - {alternateCoords.map((coords, index) => ( - handleSelectRoute(index, coords) }} - /> - ))} - {routeCoords.length > 0 && ( - handleSelectRoute("main", routeCoords) }} - /> - )} - - ); -}; - -export default Routing; +import { Marker, Polyline, useMapEvents } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; +import PrevDestIcon from "@/assets/images/prev-destination-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; +import { useEffect, useRef, useState } from "react"; +import DataBox from "./DataBox"; +import AlarmText from "./AlarmText"; + +const Routing = ({ setArea, setLocations, locations, area }) => { + const mapPrevSourceMarker = useRef(); + const mapPrevDestMarker = useRef(); + const mapRef = useRef(null); + const defaultIconSize = [35, 35]; + const [isSource, setIsSource] = useState(false); + const [sourcePosition, setSourcePosition] = useState(null); + const [isDest, setIsDest] = useState(false); + const [destPosition, setDestPosition] = useState(null); + const [routeCoords, setRouteCoords] = useState([]); + const [alternateCoords, setAlternateCoords] = useState([]); + const [editingTarget, setEditingTarget] = useState(null); + const [selectedRoute, setSelectedRoute] = useState(null); + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + const defaultIcon = createCustomIcon( + defaultIconSize, + isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src + ); + + const prevDestIcon = createCustomIcon( + defaultIconSize, + isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src + ); + + const isMovingSource = !isSource || editingTarget === "source"; + const isMovingDest = isSource && (!isDest || editingTarget === "dest"); + + const map = useMapEvents({ + move(e) { + if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); + if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter()); + }, + movestart() { + if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); + }, + moveend() { + if (isMovingSource) + mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); + }, + }); + + useEffect(() => { + mapRef.current = map; + }, [map]); + + useEffect(() => { + if (locations.length < 2) return; + const restoredSource = { lat: locations[0].lat, lng: locations[0].lon }; + const restoredDest = { lat: locations[1].lat, lng: locations[1].lon }; + setSourcePosition(restoredSource); + setDestPosition(restoredDest); + setIsSource(true); + setIsDest(true); + if (area) { + const decoded = polyline.decode(area, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + setTimeout(() => { + mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + }, 100); + } else { + fetchRoute(restoredSource, restoredDest); + } + }, []); + + const fetchRoute = async (source, dest) => { + const locs = [ + { lat: source.lat, lon: source.lng }, + { lat: dest.lat, lon: dest.lng }, + ]; + try { + const response = await fetch("https://jouya.141.ir/api/router/drive", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ locations: locs }), + }); + const data = await response.json(); + const shape = data.trip.legs[0].shape; + setLocations(locs); + setArea(shape); + const decoded = polyline.decode(shape, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + + if (data.alternates?.length > 0) { + const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); + setAlternateCoords(decodedAlternates); + } else { + setAlternateCoords([]); + } + map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + } catch (error) { + console.error("Routing error:", error); + } + }; + + const handleMarkerClick = async () => { + if (!isSource || editingTarget === "source") { + const clickedPosition = mapPrevSourceMarker.current.getLatLng(); + setSourcePosition(clickedPosition); + setIsSource(true); + setEditingTarget(null); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + + if (editingTarget === "source" && destPosition) { + await fetchRoute(clickedPosition, destPosition); + } + } + }; + + const handleDestMarkerClick = async () => { + if (!isDest || editingTarget === "dest") { + const clickedPosition = mapPrevDestMarker.current.getLatLng(); + setDestPosition(clickedPosition); + setIsDest(true); + setEditingTarget(null); + + await fetchRoute(sourcePosition, clickedPosition); + } + }; + + const handleEditSource = () => { + setEditingTarget("source"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleEditDest = () => { + setEditingTarget("dest"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleSelectRoute = (index, coords) => { + setSelectedRoute({ index, coords }); + const encoded = polyline.encode(coords, 6); + setArea(encoded); + map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); + }; + + return ( + <> + + + + {isSource && ( + + )} + {alternateCoords.map((coords, index) => ( + handleSelectRoute(index, coords) }} + /> + ))} + {routeCoords.length > 0 && ( + handleSelectRoute("main", routeCoords) }} + /> + )} + + ); +}; + +export default Routing; From 1e0d3dcf0e82bfca8ac7543e51d38fbec7642feb Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Mon, 15 Jun 2026 11:16:34 +0330 Subject: [PATCH 30/35] add end_km to violations --- .../operator/Actions/Violations/Dialog.jsx | 4 +- .../Form/MachineAndDriver/index.jsx | 2 +- .../Form/Rahdaran/List/index.jsx | 10 +- .../RowActions/MissionCorrection/index.jsx | 3 +- .../Actions/Violations/RowActions/index.jsx | 4 +- .../Actions/Violations/ViolationsList.jsx | 4 +- .../operator/Actions/Violations/index.jsx | 4 +- .../Dialog/Form/GetItemInfo/index.jsx | 24 ++++ .../Dialog/Form/Verify/index.jsx | 5 + .../Add/AddController/Dialog/Form/index.jsx | 1 - .../Add/AddController/Dialog/index.jsx | 2 + .../RowActions/Edit/EditController/index.jsx | 125 ++++++++++-------- .../roadMissions/operator/Toolbar.jsx | 2 +- .../Form/MachinesDialog/MachineList/index.jsx | 1 - .../Actions/EditViolation/EditController.jsx | 2 + .../EditViolation/EditViolationForm.jsx | 28 +++- 16 files changed, 147 insertions(+), 74 deletions(-) diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx index 200b891..8cb7c67 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx @@ -2,7 +2,7 @@ import { Close } from "@mui/icons-material"; import { Dialog, DialogTitle, IconButton } from "@mui/material"; import ViolationsList from "./ViolationsList"; -const ViolationsDialog = ({ open, setOpen, mutate, row }) => { +const ViolationsDialog = ({ open, setOpen, mutate }) => { return ( { تخلفات - {open && } + {open && } ); }; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx index 912eb63..8b85d7e 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx @@ -21,7 +21,7 @@ const MachineAndDriver = ({ setTabState, allData, setAllData, handlePrev }) => { راننده diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx index be31897..a1fc177 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx @@ -25,17 +25,17 @@ const RahdaranList = ({ rahdaran, setRahdaran }) => { my: 1, }} > - + نام و نام خانوادگی: {rahdar.name} - - کدملی: - {rahdar.code} - + {/**/} + {/* کدملی:*/} + {/* - /!*{rahdar.code}*!/*/} + {/**/} handleRemove(index)}> diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx index 9010671..72ae833 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx @@ -5,7 +5,7 @@ import { Dialog, IconButton, Tooltip } from "@mui/material"; import { useState } from "react"; import CreateForm from "./Form"; -const MissionCorrection = ({ row, mutate }) => { +const MissionCorrection = ({ row, mutate, baseMutate }) => { const [submitting, setSubmitting] = useState(false); const requestServer = useRequest({ notificationSuccess: true }); const [open, setOpen] = useState(false); @@ -31,6 +31,7 @@ const MissionCorrection = ({ row, mutate }) => { }) .then((response) => { mutate(); + baseMutate() setOpen(false); }) .catch((error) => {}) diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx index 24e9532..a384e03 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx @@ -1,9 +1,9 @@ import MissionCorrection from "./MissionCorrection"; -export default function RowActions({ row, mutate }) { +export default function RowActions({ row, mutate, baseMutate }) { return ( <> - + ); } diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx index 40edd7a..82a993d 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx @@ -7,7 +7,7 @@ import useCities from "@/lib/hooks/useCities"; import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; import useProvinces from "@/lib/hooks/useProvince"; -const ViolationsList = ({ setOpen }) => { +const ViolationsList = ({ setOpen, mutate }) => { const columns = useMemo(() => { const dynamicColumns = { header: "استان", @@ -132,7 +132,7 @@ const ViolationsList = ({ setOpen }) => { table_name={"operatorViolationsList"} enableRowActions positionActionsColumn={"first"} - RowActions={(props) => } + RowActions={(props) => } /> diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx index 3d5f48a..261fb4e 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx @@ -4,7 +4,7 @@ import ViolationsDialog from "./Dialog"; import theme from "@/core/utils/theme"; import RemoveRoadIcon from "@mui/icons-material/RemoveRoad"; -const OperatorViolations = ({ row, mutate }) => { +const OperatorViolations = ({ mutate }) => { const [open, setOpen] = useState(false); const isMobile = useMediaQuery(theme.breakpoints.down("sm")); return ( @@ -26,7 +26,7 @@ const OperatorViolations = ({ row, mutate }) => { )} - + ); }; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/GetItemInfo/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/GetItemInfo/index.jsx index 6e3afa0..ce38e38 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/GetItemInfo/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/GetItemInfo/index.jsx @@ -8,6 +8,7 @@ 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"; const validationSchema = object({ explanation: string().required("موضوع را مشخص کنید!"), @@ -125,6 +126,29 @@ const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => { }} /> + + + ( + { + if (isNaN(Number(e.target.value))) return; + field.onChange(e.target.value); + }} + size="small" + fullWidth + label="کیلومتر خودرو / ساعت کار" + InputLabelProps={{ shrink: true }} + /> + )} + /> + + diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Verify/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Verify/index.jsx index 89e0b41..39f511f 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Verify/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/Verify/index.jsx @@ -60,6 +60,11 @@ const Verify = ({ allData, handlePrev, submitForm, submitting }) => { + + کیلومتر خودرو / ساعت کار + + + تاریخ شروع ماموریت diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/index.jsx index 0adbb1f..aa5f3f7 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/Form/index.jsx @@ -25,7 +25,6 @@ const reducer = (state, action) => { }; const CreateForm = ({ defaultValues, submitForm, setOpen, submitting, oldBound }) => { - console.log("defaultValues", defaultValues); const [allData, dispatch] = useReducer(reducer, defaultValues); const [tabState, setTabState] = useState(0); diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/index.jsx index 31c0005..b1ed8a9 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Add/AddController/Dialog/index.jsx @@ -18,6 +18,7 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => { driver: row.original.driver_id, zone: result.region, type: result.type, + end_km: result.end_km, ...(result.type == 1 ? { end_date: `${result.end_date} ${moment(result.end_time).format("HH:mm")}`, @@ -54,6 +55,7 @@ const DialogAdd = ({ mutate, setOpen, oldBound, rahdaran, machine, row }) => { rahdaran: rahdaran.filter((r) => !r.is_driver), bound_type: "polyline", type: "", + end_km : "", end_date: "", end_time: null, end_point: "", diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Edit/EditController/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Edit/EditController/index.jsx index 6d9cac7..e838647 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/Edit/EditController/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/Edit/EditController/index.jsx @@ -3,61 +3,75 @@ import useRequest from "@/lib/hooks/useRequest"; import DialogLoading from "@/core/components/DialogLoading"; import CreateForm from "../../../Actions/Create/Form"; import moment from "jalali-moment"; -import L from "leaflet"; +import polyline from "@mapbox/polyline"; import { GET_RAHDARAN_BY_ID, UPDATE_REQUEST_MISSION } from "@/core/utils/routes"; const EditController = ({ row, mutate, openEditDialog, setOpenEditDialog }) => { - const latLngs = useMemo(() => { - return row.original.area.coordinates.map(([lng, lat]) => [lat, lng]); - }, [row.original.area.coordinates]); - - const bound = useMemo( - () => (row.original.area.type === "polygon" ? L.polygon(latLngs) : L.polyline(latLngs)), - [row.original.area.type, latLngs] - ); - const [submitting, setSubmitting] = useState(false); const [rahdaran, setRahdaran] = useState(null); const [rahdaranLoading, setRahdaranLoading] = useState(true); + const requestServer = useRequest(); + const locations = useMemo(() => { + if (!row.original.encoded_route) return []; + + const decoded = polyline.decode(row.original.encoded_route, 6); + + if (decoded.length === 0) return []; + + return [ + { + lat: decoded[0][0], + lon: decoded[0][1], + }, + { + lat: decoded[decoded.length - 1][0], + lon: decoded[decoded.length - 1][1], + }, + ]; + }, [row.original.encoded_route]); + useEffect(() => { setRahdaranLoading(true); + requestServer(`${GET_RAHDARAN_BY_ID}/${row.original.id}`, "get") .then((response) => { setRahdaran(response.data.data); - setRahdaranLoading(false); }) - .catch((e) => { + .catch(() => {}) + .finally(() => { setRahdaranLoading(false); }); }, [row.original.id]); const submitForm = async (result) => { setSubmitting(true); - const latlngs = result.bound.getLatLngs(); - const normalized = result.bound_type === "polygon" ? latlngs : [latlngs]; - - const area = normalized.map((ring) => ring.map(({ lat, lng }) => [lat, lng])); await requestServer(`${UPDATE_REQUEST_MISSION}/${row.original.id}`, "post", { data: { explanation: result.explanation, category_id: result.category_id, + ...(result.category_id == 3 ? { road_observed_id: result.road_observed_id, } : {}), - area: { - type: result.bound_type, - coordinates: area[0], - }, - ...(result.rahdaran.length != 0 ? { rahdaran: result.rahdaran.map((r) => r.id) } : {}), + + encoded_route: result.area, + + ...(result.rahdaran.length !== 0 + ? { + rahdaran: result.rahdaran.map((r) => r.id), + } + : {}), + requested_machines: result.requested_machines, type: result.type, zone: result.region, end_point: result.end_point, + ...(result.type == 1 ? { start_date: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`, @@ -71,46 +85,51 @@ const EditController = ({ row, mutate, openEditDialog, setOpenEditDialog }) => { hasSidebarUpdate: true, notificationSuccess: true, }) - .then((response) => { + .then(() => { mutate(); setOpenEditDialog(false); }) - .catch((error) => {}) + .catch(() => {}) .finally(() => { setSubmitting(false); }); }; - return ( - <> - {rahdaranLoading ? ( - - ) : ( - !r.isDriver), - requested_machines: row.original.requested_machines, - bound: bound, - bound_type: row.original.area.type, - type: row.original.type, - start_date: moment(row.original.start_date).format("YYYY-MM-DD"), - start_time: moment(row.original.start_date).toDate(), - end_date: moment(row.original.end_date).format("YYYY-MM-DD"), - end_time: moment(row.original.end_date).toDate(), - end_point: row.original.end_point, - region: row.original.zone, - }} - submitForm={submitForm} - submitting={submitting} - open={openEditDialog} - setOpen={setOpenEditDialog} - mutate={mutate} - /> - )} - + return rahdaranLoading ? ( + + ) : ( + !r.isDriver), + + requested_machines: row.original.requested_machines, + + area: row.original.encoded_route, + locations, + + type: row.original.type, + + start_date: moment(row.original.start_date).format("YYYY-MM-DD"), + start_time: moment(row.original.start_date).toDate(), + + end_date: moment(row.original.end_date).format("YYYY-MM-DD"), + end_time: moment(row.original.end_date).toDate(), + + end_point: row.original.end_point, + region: row.original.zone, + }} + submitForm={submitForm} + submitting={submitting} + open={openEditDialog} + setOpen={setOpenEditDialog} + mutate={mutate} + /> ); }; + export default EditController; diff --git a/src/components/dashboard/roadMissions/operator/Toolbar.jsx b/src/components/dashboard/roadMissions/operator/Toolbar.jsx index 071b9c0..b3f0e65 100644 --- a/src/components/dashboard/roadMissions/operator/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/operator/Toolbar.jsx @@ -7,7 +7,7 @@ const Toolbar = ({ table, filterData, mutate }) => { return ( - + {/**/} ); diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx index 4173929..b602ea4 100644 --- a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx +++ b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx @@ -78,7 +78,6 @@ const MachinesList = ({ machineType, setMachine, setOpenMachinesDialog }) => { columns={columns} specialFilter={[ { value: machineType, datatype: "text", id: "car_type", fn: "equals" }, - { value: 1, datatype: "numeric", id: "status", fn: "equals" }, { value: city_id ? city_id : province_id, datatype: "numeric", diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx index 85fd833..8742351 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx @@ -11,6 +11,7 @@ const EditController = ({ rowId, mutate, setOpen, row }) => { const defaultData = { end_date: endDate, + end_km : "", end_time: row?.original?.enter_time ? new Date(row.original.enter_time) : null, }; const handleSubmit = async (result) => { @@ -19,6 +20,7 @@ const EditController = ({ rowId, mutate, setOpen, row }) => { if (result.end_date && result.end_time) { payload.enter_time = `${result.end_date} ${moment(result.end_time).format("HH:mm")}`; } + payload.end_km = result.end_km; await requestServer(`${EDIT_VIOLATION}/${rowId}`, "post", { data: payload, diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditViolationForm.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditViolationForm.jsx index 4beac95..7efdf23 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditViolationForm.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditViolationForm.jsx @@ -1,9 +1,10 @@ -import { useForm } from "react-hook-form"; +import { Controller, useForm } from "react-hook-form"; import { yupResolver } from "@hookform/resolvers/yup"; import StyledForm from "@/core/components/StyledForm"; import { Box, Button, DialogActions, DialogContent, Grid, Stack } from "@mui/material"; import MissionDates from "./MissionDates"; import * as yup from "yup"; +import LtrTextField from "@/core/components/LtrTextField"; export const schema = yup .object({ @@ -55,7 +56,7 @@ const EditViolationForm = ({ setOpenMachinesDialog, defaultValues, onSubmitBase <> - + @@ -73,7 +74,28 @@ const EditViolationForm = ({ setOpenMachinesDialog, defaultValues, onSubmitBase )} - + + ( + { + if (isNaN(Number(e.target.value))) return; + field.onChange(e.target.value); + }} + size="small" + fullWidth + label="کیلومتر خودرو / ساعت کار" + InputLabelProps={{ shrink: true }} + /> + )} + /> + +