RMS/frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add province to reports

Browse Source
This commit is contained in:
AminGhasempoor
2026-01-31 14:08:50 +03:30
parent 4dea6f5294
commit 5dadece9f3
11 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/dashboard/roadMissions/operator/Actions/Create/Form/Area/index.jsx
View File

@@ -2,9 +2,7 @@ import MapLoading from "@/core/components/MapLayer/Loading";
import { Box, Button, DialogActions, DialogContent, Stack } from "@mui/material"; import { Box, Button, DialogActions, DialogContent, Stack } from "@mui/material";
import dynamic from "next/dynamic"; import dynamic from "next/dynamic";
import { useCallback, useState } from "react"; import { useCallback, useState } from "react";
import MapControlPolygon from "./MapControlPolygon";
import MapControlPolyline from "./MapControlPolyline"; import MapControlPolyline from "./MapControlPolyline";
import SelectBoundType from "./SelectBoundType";
const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { const MapLayer = dynamic(() => import("@/core/components/MapLayer"), {
loading: () => <MapLoading />, loading: () => <MapLoading />,
ssr: false, ssr: false,

13
src/components/dashboard/roadMissions/operator/Actions/CreateWithoutProcess/Form/Area/index.jsx
View File

@@ -12,7 +12,6 @@ const MapLayer = dynamic(() => import("@/core/components/MapLayer"), {
const Area = ({ allData, setAllData, handlePrev, setTabState }) => { const Area = ({ allData, setAllData, handlePrev, setTabState }) => {
const [bound, setBound] = useState(allData.bound); const [bound, setBound] = useState(allData.bound);
const [boundType, setBoundType] = useState(allData.bound_type);
const handleNext = useCallback(() => { const handleNext = useCallback(() => {
setAllData({ bound: bound }); setAllData({ bound: bound });
@@ -23,19 +22,9 @@ const Area = ({ allData, setAllData, handlePrev, setTabState }) => {
<> <>
<DialogContent dividers> <DialogContent dividers>
<Stack spacing={2}> <Stack spacing={2}>
<SelectBoundType
boundType={boundType}
setBoundType={setBoundType}
setBound={setBound}
setAllData={setAllData}
/>
<Box sx={{ width: "100%", height: "400px" }}> <Box sx={{ width: "100%", height: "400px" }}>
<MapLayer style={{ borderRadius: "4px" }}> <MapLayer style={{ borderRadius: "4px" }}>
{boundType == "polygon" ? ( <MapControlPolygon bound={bound} setBound={setBound} boundType={"polyline"} />
<MapControlPolygon bound={bound} setBound={setBound} boundType={boundType} />
) : (
<MapControlPolyline bound={bound} setBound={setBound} boundType={boundType} />
)}
</MapLayer> </MapLayer>
</Box> </Box>
</Stack> </Stack>

2
src/components/dashboard/roadMissions/operator/Actions/CreateWithoutProcess/Form/index.jsx
View File

@@ -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 { AccessTime, Engineering, InsertDriveFile, LocalShipping, Route, Verified } from "@mui/icons-material";
import { Box, Tab, Tabs } from "@mui/material"; import { Box, Tab, Tabs } from "@mui/material";
import { useReducer, useState } from "react"; import { useReducer, useState } from "react";

3
src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx
View File

@@ -5,9 +5,6 @@ import { useEffect, useMemo } from "react";
import Toolbar from "./Toolbar"; import Toolbar from "./Toolbar";
const TaradodReportLists = ({ data, specialFilter }) => { const TaradodReportLists = ({ data, specialFilter }) => {
useEffect(() => {
console.log(data);
}, [data]);
const columns = useMemo(() => { const columns = useMemo(() => {
return [ return [
{ {

2
src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx
View File

@@ -7,7 +7,7 @@ const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesP
<StyledForm onSubmit={handleSubmit(onSearchSubmit)}> <StyledForm onSubmit={handleSubmit(onSearchSubmit)}>
<SearchReportField <SearchReportField
control={control} control={control}
// hasProvincesPermission={hasProvincesPermission} hasProvincesPermission={hasProvincesPermission}
/> />
</StyledForm> </StyledForm>
</> </>

4
src/components/dashboard/roadMissions/reports/taradodReports/index.jsx
View File

@@ -22,7 +22,7 @@ const TaradodReportPage = () => {
const { user } = useAuth(); const { user } = useAuth();
const requestServer = useRequest(); const requestServer = useRequest();
const [provinceId, setProvinceId] = useState(user.province_id || "-1"); const [provinceId, setProvinceId] = useState(user.province_id || "-1");
// const hasProvincesPermission = userPermissions?.includes("mission-report-country"); const hasProvincesPermission = userPermissions?.includes("mission-report-country");
const defaultValues = { const defaultValues = {
from_date: moment(new Date()).format("YYYY-MM-DD"), from_date: moment(new Date()).format("YYYY-MM-DD"),
@@ -131,7 +131,7 @@ const TaradodReportPage = () => {
<PageTitle title={"کارتابل گزارش تردد ها"} /> <PageTitle title={"کارتابل گزارش تردد ها"} />
<SearchReportList <SearchReportList
control={control} control={control}
// hasProvincesPermission={hasProvincesPermission} hasProvincesPermission={hasProvincesPermission}
handleSubmit={handleSubmit} handleSubmit={handleSubmit}
onSearchSubmit={onSearchSubmit} onSearchSubmit={onSearchSubmit}
/> />

2
src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx
View File

@@ -7,7 +7,7 @@ const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesP
<StyledForm onSubmit={handleSubmit(onSearchSubmit)}> <StyledForm onSubmit={handleSubmit(onSearchSubmit)}>
<SearchReportField <SearchReportField
control={control} control={control}
// hasProvincesPermission={hasProvincesPermission} hasProvincesPermission={hasProvincesPermission}
/> />
</StyledForm> </StyledForm>
</> </>

3
src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx
View File

@@ -5,9 +5,6 @@ import { useEffect, useMemo } from "react";
import Toolbar from "./Toolbar"; import Toolbar from "./Toolbar";
const ViolationsReportsList = ({ data, specialFilter }) => { const ViolationsReportsList = ({ data, specialFilter }) => {
useEffect(() => {
console.log(data);
}, [data]);
const columns = useMemo(() => { const columns = useMemo(() => {
return [ return [
{ {

4
src/components/dashboard/roadMissions/reports/violationsReports/index.jsx
View File

@@ -21,7 +21,7 @@ const ViolationsReportsPage = () => {
const { data: userPermissions } = usePermissions(); const { data: userPermissions } = usePermissions();
const { user } = useAuth(); const { user } = useAuth();
const requestServer = useRequest(); const requestServer = useRequest();
// const hasProvincesPermission = userPermissions?.includes("mission-report-country"); const hasProvincesPermission = userPermissions?.includes("mission-report-country");
const defaultValues = { const defaultValues = {
from_date: moment(new Date()).format("YYYY-MM-DD"), from_date: moment(new Date()).format("YYYY-MM-DD"),
@@ -130,7 +130,7 @@ const ViolationsReportsPage = () => {
<PageTitle title={"کارتابل گزارش ماموریت"} /> <PageTitle title={"کارتابل گزارش ماموریت"} />
<SearchReportList <SearchReportList
control={control} control={control}
// hasProvincesPermission={hasProvincesPermission} hasProvincesPermission={hasProvincesPermission}
handleSubmit={handleSubmit} handleSubmit={handleSubmit}
onSearchSubmit={onSearchSubmit} onSearchSubmit={onSearchSubmit}
/> />

1
src/core/utils/machineTypes.js
View File

@@ -115,5 +115,6 @@ export const machineType = [
{ id: "تجهیزات ثابت", name_fa: "تجهیزات ثابت" }, { id: "تجهیزات ثابت", name_fa: "تجهیزات ثابت" },
{ id: "دریل واگن", name_fa: "دریل واگن" }, { id: "دریل واگن", name_fa: "دریل واگن" },
{ id: "کامیون سرویس سیار", name_fa: "کامیون سرویس سیار" }, { id: "کامیون سرویس سیار", name_fa: "کامیون سرویس سیار" },
{ id: "کامیون سوخت رسان", name_fa: "کامیون سوخت رسان" },
{ id: "میکسر آب نمک", name_fa: "میکسر آب نمک" }, { id: "میکسر آب نمک", name_fa: "میکسر آب نمک" },
]; ];

16
src/core/utils/routes.js
View File

@@ -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 EXPORT_PROVINCE_ROAD_PATROL_REPORTS = api + "/api/v3/road_patrols/report/province_activity_excel";
export const GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 // road items
export const GET_ROAD_ITEMS_SUPERVISOR_LIST = api + "/api/v3/road_items/supervisor"; export const GET_ROAD_ITEMS_SUPERVISOR_LIST = api + "/api/v3/road_items/supervisor";