Feature/amiriis parakandegi

src/core/components/DataTable/filter/FilterBody.jsx

@@ -1,32 +1,15 @@
 "use client";
 
-import FilterBodyField from "@/core/components/DataTable/filter/FilterBodyField";
+import FilterBodyControllerWithDependency from "@/core/components/DataTable/filter/FilterBodyControllerWithDependency";
 import FilterHeader from "@/core/components/DataTable/filter/FilterHeader";
 import useDataTable from "@/lib/hooks/useDataTable";
 import { yupResolver } from "@hookform/resolvers/yup";
-import { Box, Button, Drawer, styled } from "@mui/material";
+import { Box, Button } from "@mui/material";
 import { useEffect, useState } from "react";
-import { Controller, useForm, useWatch } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import * as Yup from "yup";
+import ScrollBox from "../../ScrollBox";
 import FilterBodyController from "./FilterBodyController";
-import FilterBodyControllerWithDependency from "@/core/components/DataTable/filter/FilterBodyControllerWithDependency";
-
-const ScrollBox = styled(Box)({
-    flexGrow: 1,
-    overflowY: "scroll",
-    maxWidth: "450px",
-    "::-webkit-scrollbar": {
-        width: "5px",
-    },
-    "::-webkit-scrollbar-track": {
-        boxShadow: "inset 0 0 5px #fff",
-        borderRadius: "5px",
-    },
-    "::-webkit-scrollbar-thumb": {
-        background: "#155175",
-        borderRadius: "0px",
-    },
-});
 
 function FilterBody({ columns, drawerState, setDrawerState }) {
     const { filterData, setFilterData } = useDataTable();
@@ -89,7 +72,7 @@ function FilterBody({ columns, drawerState, setDrawerState }) {
             {Object.keys(filterData).length > 0 && (
                 <ScrollBox>
                     <form onSubmit={handleSubmit(onSubmit)}>
-                        <Box sx={{ px: 1, py: 3 }}>
+                        <Box sx={{ px: 2, py: 3 }}>
                             {columns.map((column) =>
                                 column.enableColumnFilter ? (
                                     column.dependencyId ? (

src/core/components/DataTable/filter/index.jsx

@@ -2,7 +2,7 @@
 import { useState } from "react";
 import FilterButton from "@/core/components/DataTable/filter/FilterButton";
 import FilterBody from "@/core/components/DataTable/filter/FilterBody";
-import { Drawer } from "@mui/material";
+import { Box, Drawer } from "@mui/material";
 
 function FilterColumn({ columns, user_id, page_name, table_name }) {
     const [open, setOpen] = useState(false);
@@ -15,14 +15,18 @@ function FilterColumn({ columns, user_id, page_name, table_name }) {
                 onClose={() => setOpen(false)}
                 sx={{ overflowY: "hidden", display: "flex", flexDirection: "column", height: "100%", zIndex: "1300" }}
             >
-                <FilterBody
-                    columns={columns}
-                    drawerState={open}
-                    setDrawerState={setOpen}
-                    user_id={user_id}
-                    page_name={page_name}
-                    table_name={table_name}
-                />
+                <Box sx={{ width: { xs: 300, sm: 450 } }}>
+                    {open && (
+                        <FilterBody
+                            columns={columns}
+                            drawerState={open}
+                            setDrawerState={setOpen}
+                            user_id={user_id}
+                            page_name={page_name}
+                            table_name={table_name}
+                        />
+                    )}
+                </Box>
             </Drawer>
         </>
     );

src/core/components/LoadingHardPage.jsx

@@ -6,15 +6,12 @@ import SvgError from "@/core/components/svgs/SvgError";
 const LoadingImage = styled(Box)({
     "@keyframes load": {
         "0%": {
-            // opacity: 0,
             transform: "scale(1)",
         },
         "50%": {
-            // opacity: 1,
             transform: "scale(.5)",
         },
         "100%": {
-            // opacity: 0,
             transform: "scale(1)",
         },
     },

src/core/components/MapInfoOneMarker.jsx

@@ -38,9 +38,9 @@ const createCustomIcon = (size, iconUrl, labelText, color) => {
 const MAX_ZOOM_FOR_MARKER = 13;
 
 const MapInteraction = ({ setValue, startLat, startLng }) => {
-    const [isMarkerLocked, setIsMarkerLocked] = useState(!!(startLat && startLng)); // وضعیت قفل مارکر
+    const [isMarkerLocked, setIsMarkerLocked] = useState(!!(startLat && startLng));
     const [enableSend, setEnableSend] = useState(false);
-    const [startIconColor, setStartIconColor] = useState(startLat ? "#1CAC66" : "#003d4f"); // رنگ آیکن شروع
+    const [startIconColor, setStartIconColor] = useState(startLat ? "#1CAC66" : "#003d4f");
     const [markerPosition, setMarkerPosition] = useState(
         startLat && startLng ? { lat: startLat, lng: startLng } : null
     );

src/core/components/MapInfoTwoMarker.jsx

@@ -37,13 +37,13 @@ const createCustomIcon = (size, iconUrl, labelText, color) => {
 const MAX_ZOOM_FOR_MARKER = 13;
 
 const MapInteraction = ({ setValue, startLat, startLng, endLat, endLng }) => {
-    const [isStartLocked, setIsStartLocked] = useState(!!(startLat && startLng)); // وضعیت قفل نقطه آغاز
-    const [isEndLocked, setIsEndLocked] = useState(!!(endLat && endLng)); // وضعیت قفل نقطه پایان
+    const [isStartLocked, setIsStartLocked] = useState(!!(startLat && startLng));
+    const [isEndLocked, setIsEndLocked] = useState(!!(endLat && endLng));
     const [startPosition, setStartPosition] = useState(startLat && startLng ? { lat: startLat, lng: startLng } : null);
     const [endPosition, setEndPosition] = useState(endLat && endLng ? { lat: endLat, lng: endLng } : null);
     const [enableSend, setEnableSend] = useState(false);
-    const [startIconColor, setStartIconColor] = useState(startLat ? "#1CAC66" : "#003d4f"); // رنگ آیکن شروع
-    const [endIconColor, setEndIconColor] = useState(endLat ? "#D13131" : "#003d4f"); // رنگ آیکن پایان
+    const [startIconColor, setStartIconColor] = useState(startLat ? "#1CAC66" : "#003d4f");
+    const [endIconColor, setEndIconColor] = useState(endLat ? "#D13131" : "#003d4f");
     const startRef = useRef();
     const endRef = useRef();
 

src/core/components/ScrollBox.jsx

@@ -0,0 +1,19 @@
+import { Box, styled } from "@mui/material";
+
+const ScrollBox = styled(Box)({
+    flexGrow: 1,
+    overflowY: "auto",
+    maxWidth: "450px",
+    "::-webkit-scrollbar": {
+        width: "5px",
+    },
+    "::-webkit-scrollbar-track": {
+        boxShadow: "inset 0 0 5px #fff",
+        borderRadius: "5px",
+    },
+    "::-webkit-scrollbar-thumb": {
+        background: "#155175",
+        borderRadius: "0px",
+    },
+});
+export default ScrollBox;

src/core/utils/pageMenu.js

@@ -137,7 +137,7 @@ export const pageMenu = [
                 id: "roadItemManagmentMap",
                 label: "پراکندگی بر روی نقشه",
                 type: "page",
-                route: process.env.NEXT_PUBLIC_API_URL + "/v2/map?type=road_items",
+                route: "/dashboard/road-items/reports/map",
                 icon: <MapIcon sx={{ width: "inherit", height: "inherit" }} />,
                 permissions: [
                     "show-road-item-supervise-cartable",

src/core/utils/routes.js

@@ -69,6 +69,8 @@ export const RESTORE_BY_SUPERVISOR = api + "/api/v3/road_items/restore";
 export const GET_CAR_LIST_SEARCH = api + "/api/v3/cmms_machines/search";
 export const GET_RAHDARANS_LIST_SEARCH = api + "/api/v3/rahdaran/search";
 export const GET_OBSERVED_GASHT_LIST = api + "/api/v3/observed_items/filter";
+export const GET_ROAD_ITEMS_REPORT_MAP = api + "/api/v3/road_item_reports/activities_on_map";
+export const GET_ROAD_ITEM = api + "/api/v3/road_item_reports/show_on_map";
 export const GET_PROVINCE_ACTIVITY_PER_ITEM = api + "/api/v3/road_item_reports/country_activity_per_item";
 export const GET_CITY_ACTIVITY_PER_ITEM = api + "/api/v3/road_item_reports/province_activity_per_item";
 export const GET_PROVINCE_ACTIVITY_PER_SUB_ITEM = api + "/api/v3/road_item_reports/country_activity_per_sub_item";