From 5dadece9f319c3969c0da8a7ebb8f374e37fe180 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sat, 31 Jan 2026 14:08:50 +0330 Subject: [PATCH] add province to reports --- .../operator/Actions/Create/Form/Area/index.jsx | 2 -- .../CreateWithoutProcess/Form/Area/index.jsx | 13 +------------ .../Actions/CreateWithoutProcess/Form/index.jsx | 2 +- .../taradodReports/MissionsReportLists.jsx | 3 --- .../reports/taradodReports/Search/index.jsx | 2 +- .../reports/taradodReports/index.jsx | 4 ++-- .../reports/violationsReports/Search/index.jsx | 2 +- .../violationsReports/ViolationsReportsList.jsx | 3 --- .../reports/violationsReports/index.jsx | 4 ++-- src/core/utils/machineTypes.js | 1 + src/core/utils/routes.js | 16 ++++++++-------- 11 files changed, 17 insertions(+), 35 deletions(-) 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 6d99e76..a4240b3 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,9 +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 MapControlPolygon from "./MapControlPolygon"; import MapControlPolyline from "./MapControlPolyline"; -import SelectBoundType from "./SelectBoundType"; const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { loading: () => , ssr: false, 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 3d666fd..38ec045 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 @@ -12,7 +12,6 @@ const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { const Area = ({ allData, setAllData, handlePrev, setTabState }) => { const [bound, setBound] = useState(allData.bound); - const [boundType, setBoundType] = useState(allData.bound_type); const handleNext = useCallback(() => { setAllData({ bound: bound }); @@ -23,19 +22,9 @@ const Area = ({ allData, setAllData, handlePrev, setTabState }) => { <> - - {boundType == "polygon" ? ( - - ) : ( - - )} + diff --git a/src/components/dashboard/roadMissions/operator/Actions/CreateWithoutProcess/Form/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/CreateWithoutProcess/Form/index.jsx index f058bd4..a3ec3d8 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/CreateWithoutProcess/Form/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/CreateWithoutProcess/Form/index.jsx @@ -1,4 +1,4 @@ -import Area from "@/components/dashboard/roadMissions/operator/Actions/Create/Form/Area"; +import Area from "./Area"; import { AccessTime, Engineering, InsertDriveFile, LocalShipping, Route, Verified } from "@mui/icons-material"; import { Box, Tab, Tabs } from "@mui/material"; import { useReducer, useState } from "react"; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx index 8c43f20..12de496 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx @@ -5,9 +5,6 @@ import { useEffect, useMemo } from "react"; import Toolbar from "./Toolbar"; const TaradodReportLists = ({ data, specialFilter }) => { - useEffect(() => { - console.log(data); - }, [data]); const columns = useMemo(() => { return [ { diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx index 63d4a61..2b0d128 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx @@ -7,7 +7,7 @@ const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesP diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx index 0a8609b..ce41101 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx @@ -22,7 +22,7 @@ const TaradodReportPage = () => { const { user } = useAuth(); const requestServer = useRequest(); const [provinceId, setProvinceId] = useState(user.province_id || "-1"); - // const hasProvincesPermission = userPermissions?.includes("mission-report-country"); + const hasProvincesPermission = userPermissions?.includes("mission-report-country"); const defaultValues = { from_date: moment(new Date()).format("YYYY-MM-DD"), @@ -131,7 +131,7 @@ const TaradodReportPage = () => { diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx index 63d4a61..2b0d128 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx @@ -7,7 +7,7 @@ const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesP diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx index 62b848b..60966f8 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx @@ -5,9 +5,6 @@ import { useEffect, useMemo } from "react"; import Toolbar from "./Toolbar"; const ViolationsReportsList = ({ data, specialFilter }) => { - useEffect(() => { - console.log(data); - }, [data]); const columns = useMemo(() => { return [ { diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx index c2fcd77..37d765f 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx @@ -21,7 +21,7 @@ const ViolationsReportsPage = () => { const { data: userPermissions } = usePermissions(); const { user } = useAuth(); const requestServer = useRequest(); - // const hasProvincesPermission = userPermissions?.includes("mission-report-country"); + const hasProvincesPermission = userPermissions?.includes("mission-report-country"); const defaultValues = { from_date: moment(new Date()).format("YYYY-MM-DD"), @@ -130,7 +130,7 @@ const ViolationsReportsPage = () => { diff --git a/src/core/utils/machineTypes.js b/src/core/utils/machineTypes.js index 5a5ae78..ac08128 100644 --- a/src/core/utils/machineTypes.js +++ b/src/core/utils/machineTypes.js @@ -115,5 +115,6 @@ export const machineType = [ { id: "تجهیزات ثابت", name_fa: "تجهیزات ثابت" }, { id: "دریل واگن", name_fa: "دریل واگن" }, { id: "کامیون سرویس سیار", name_fa: "کامیون سرویس سیار" }, + { id: "کامیون سوخت رسان", name_fa: "کامیون سوخت رسان" }, { id: "میکسر آب نمک", name_fa: "میکسر آب نمک" }, ]; diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index 8f38aef..c1656f7 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -48,22 +48,22 @@ export const EXPORT_COUNTRY_ROAD_PATROL_REPORTS = api + "/api/v3/road_patrols/re export const EXPORT_PROVINCE_ROAD_PATROL_REPORTS = api + "/api/v3/road_patrols/report/province_activity_excel"; export const GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY = - "http://192.168.1.132:8000" + "/api/v3/missions/report_taradod/country_activity"; + api + "/api/v3/missions/report_taradod/country_activity"; export const GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY = - "http://192.168.1.132:8000" + "/api/v3/missions/report_taradod/province_activity"; + api + "/api/v3/missions/report_taradod/province_activity"; export const EXPORT_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY = - "http://192.168.1.132:8000" + "/api/v3/missions/report_taradod/country_excel_activity"; + api + "/api/v3/missions/report_taradod/country_excel_activity"; export const EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY = - "http://192.168.1.132:8000" + "/api/v3/missions/report_taradod/province_excel_activity"; + api + "/api/v3/missions/report_taradod/province_excel_activity"; export const GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY = - "http://192.168.1.132:8000" + "/api/v3/missions/report_violation/country_activity"; + api + "/api/v3/missions/report_violation/country_activity"; export const GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY = - "http://192.168.1.132:8000" + "/api/v3/missions/report_violation/province_activity"; + api + "/api/v3/missions/report_violation/province_activity"; export const EXPORT_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY = - "http://192.168.1.132:8000" + "/api/v3/missions/report_violation/country_excel_activity"; + api + "/api/v3/missions/report_violation/country_excel_activity"; export const EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY = - "http://192.168.1.132:8000" + "/api/v3/missions/report_violation/province_excel_activity"; + api + "/api/v3/missions/report_violation/province_excel_activity"; // road items export const GET_ROAD_ITEMS_SUPERVISOR_LIST = api + "/api/v3/road_items/supervisor";