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

fixed bug

Browse Source
This commit is contained in:
AmirHossein Mahmoodi
2025-04-15 14:59:43 +03:30
parent bb49b47d7c
commit b5a2d2971b
1 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/components/dashboard/roadSafety/reports/reportPage/index.jsx
View File

@@ -11,6 +11,7 @@ import useSafetyAndPrivacyGetItems from "@/lib/hooks/useSafetyAndPrivacyGetItems
import { Box, LinearProgress, Stack } from "@mui/material"; import { Box, LinearProgress, Stack } from "@mui/material";
import { useEffect, useMemo, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import ReportLists from "./ReportLists"; import ReportLists from "./ReportLists";
import { useAuth } from "@/lib/contexts/auth";
const statusOptions = [ const statusOptions = [
{ value: "", label: "همه وضعیت ها" }, { value: "", label: "همه وضعیت ها" },
@@ -30,6 +31,7 @@ const axisOptions = [
const ReportPage = () => { const ReportPage = () => {
const { data: userPermissions } = usePermissions(); const { data: userPermissions } = usePermissions();
const hasProvincesPermission = userPermissions.includes("show-safety-and-privacy-operator-cartable"); const hasProvincesPermission = userPermissions.includes("show-safety-and-privacy-operator-cartable");
const { user } = useAuth()
const requestServer = useRequest(); const requestServer = useRequest();
const [data, setData] = useState(null); const [data, setData] = useState(null);
const [isLoading, setLoading] = useState(true); const [isLoading, setLoading] = useState(true);
@@ -167,18 +169,36 @@ const ReportPage = () => {
return acc; return acc;
}, {}) }, {})
); );
useEffect(() => { useEffect(() => {
const fetchData = async () => { const fetchData = async () => {
try { try {
setLoading(true); setLoading(true);
const province_id = hasProvincesPermission
? filterData.province_id.value
: user.province_id;
const adjustedFilterData = hasProvincesPermission
? filterData
: {
...filterData,
province_id: {
id: "province_id",
filterMode: "equals",
datatype: "numeric",
value: province_id,
},
};
const filters = DataTableFilterDataStructure(adjustedFilterData, isArrayEmpty);
const params = new URLSearchParams(); const params = new URLSearchParams();
const filters = DataTableFilterDataStructure(filterData, isArrayEmpty);
params.set("filters", JSON.stringify(filters || [])); params.set("filters", JSON.stringify(filters || []));
const query = params.toString();
const province_id = filterData.province_id.value;
if (province_id === "") { if (province_id === "") {
try { try {
const response = await requestServer(`${GET_ROAD_SAFETY_PROVINCE_ACTIVITY_REPORT}?${query}`); const response = await requestServer(`${GET_ROAD_SAFETY_PROVINCE_ACTIVITY_REPORT}?${params.toString()}`);
const result = response.data.data; const result = response.data.data;
const nationalReportForItem = result.activities.find((report) => report.province_id === -1); const nationalReportForItem = result.activities.find((report) => report.province_id === -1);
const nationalReport = { const nationalReport = {
@@ -198,10 +218,13 @@ const ReportPage = () => {
}; };
}), }),
]); ]);
} catch (e) {} } catch (e) {
console.log(e);
}
} else { } else {
params.set("province_id", province_id);
try { try {
const response = await requestServer(`${GET_ROAD_SAFETY_CITY_ACTIVITY_REPORT}?${params}`); const response = await requestServer(`${GET_ROAD_SAFETY_CITY_ACTIVITY_REPORT}?${params.toString()}`);
const result = response.data.data; const result = response.data.data;
const nationalReportForItem = result.activities.find( const nationalReportForItem = result.activities.find(
(report) => report.edare_shahri_id == "-1" (report) => report.edare_shahri_id == "-1"
@@ -222,7 +245,7 @@ const ReportPage = () => {
}; };
}), }),
]); ]);
} catch (e) {} } catch (e) { console.log(e); }
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);