From 38bf9d7c11fa1c0436b734982e3465643dff23a0 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Mon, 19 May 2025 16:26:56 +0330 Subject: [PATCH 1/3] change position operation column to first --- src/components/dashboard/roadSafety/operator/OperatorList.jsx | 2 +- .../dashboard/roadSafety/supervisor/SupervisorList.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/dashboard/roadSafety/operator/OperatorList.jsx b/src/components/dashboard/roadSafety/operator/OperatorList.jsx index 5e6c12c..7498e32 100644 --- a/src/components/dashboard/roadSafety/operator/OperatorList.jsx +++ b/src/components/dashboard/roadSafety/operator/OperatorList.jsx @@ -490,7 +490,7 @@ const OperatorList = () => { table_name={"roadSafetyOperatorList"} TableToolbar={Toolbar} enableRowActions - positionActionsColumn={"last"} + positionActionsColumn={"first"} RowActions={RowActions} /> diff --git a/src/components/dashboard/roadSafety/supervisor/SupervisorList.jsx b/src/components/dashboard/roadSafety/supervisor/SupervisorList.jsx index c0acffd..93271f9 100644 --- a/src/components/dashboard/roadSafety/supervisor/SupervisorList.jsx +++ b/src/components/dashboard/roadSafety/supervisor/SupervisorList.jsx @@ -596,7 +596,7 @@ const SupervisorList = () => { table_name={"roadSafetyOperatorList"} TableToolbar={Toolbar} enableRowActions - positionActionsColumn={"last"} + positionActionsColumn={"first"} RowActions={RowActions} /> From 0ebf515e1c187d89d4ca74ac5e65dea88d55adb8 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Mon, 19 May 2025 16:27:16 +0330 Subject: [PATCH 2/3] fotmattiong --- .../headerWithLogo/HaederBottom/index.jsx | 20 +++++++------ .../Sidebar/SidebarListItems.jsx | 23 +++++++++++++-- .../headerWithSidebar/Sidebar/SidebarMenu.jsx | 29 ++++++++++++------- .../Sidebar/SidebarSubitems.jsx | 24 +++++++++++++-- src/core/utils/routes.js | 12 +++++--- 5 files changed, 78 insertions(+), 30 deletions(-) diff --git a/src/components/layouts/dashboard/headerWithLogo/HaederBottom/index.jsx b/src/components/layouts/dashboard/headerWithLogo/HaederBottom/index.jsx index 3a1de86..1599d86 100644 --- a/src/components/layouts/dashboard/headerWithLogo/HaederBottom/index.jsx +++ b/src/components/layouts/dashboard/headerWithLogo/HaederBottom/index.jsx @@ -25,15 +25,17 @@ const HeaderBottom = () => { theme.palette.primary2.contrastText }}>rms.rmto.ir - - theme.palette.primary.main, - borderRadius: 2, - borderStyle: "dashed", - }}> + + theme.palette.primary.main, + borderRadius: 2, + borderStyle: "dashed", + }} + > diff --git a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx index 5b6c9df..092ac1c 100644 --- a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx +++ b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx @@ -1,5 +1,15 @@ import { ExpandLess, ExpandMore } from "@mui/icons-material"; -import { Collapse, List, ListItem, ListItemButton, ListItemIcon, ListItemText, Stack, useMediaQuery, useTheme } from "@mui/material"; +import { + Collapse, + List, + ListItem, + ListItemButton, + ListItemIcon, + ListItemText, + Stack, + useMediaQuery, + useTheme, +} from "@mui/material"; import Link from "next/link"; import SidebarBadge from "./SidebarBadge"; import SidebarSubitems from "./SidebarSubitems"; @@ -21,7 +31,7 @@ const SidebarListItems = ({ menuItem, dispatch, handleDrawerClose }) => { dispatch({ type: "COLLAPSE_MENU", id: menuItem.id }); } else { if (isMobile) { - handleDrawerClose() + handleDrawerClose(); } } }} @@ -62,7 +72,14 @@ const SidebarListItems = ({ menuItem, dispatch, handleDrawerClose }) => { }} > {menuItem.Subitems.map((subitem, index) => { - return ; + return ( + + ); })} ) : null} diff --git a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarMenu.jsx b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarMenu.jsx index 8359ad9..f27005e 100644 --- a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarMenu.jsx +++ b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarMenu.jsx @@ -54,16 +54,16 @@ function reducer(state, action) { return state.map((item) => item.hasSubitems ? { - ...item, - Subitems: item.Subitems.map((subitem) => - subitem.hasSubitems - ? { - ...subitem, - Subitems: toggleSubitems(subitem.Subitems, action.id), - } - : subitem - ), - } + ...item, + Subitems: item.Subitems.map((subitem) => + subitem.hasSubitems + ? { + ...subitem, + Subitems: toggleSubitems(subitem.Subitems, action.id), + } + : subitem + ), + } : item ); @@ -105,7 +105,14 @@ const SidebarMenu = ({ handleDrawerClose }) => { {userPermissions && ( {menuItems.map((menuItem) => { - return ; + return ( + + ); })} )} diff --git a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx index 7567889..0e5267c 100644 --- a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx +++ b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx @@ -1,5 +1,16 @@ import { ExpandLess, ExpandMore } from "@mui/icons-material"; -import { Box, Collapse, List, ListItem, ListItemButton, ListItemIcon, ListItemText, Stack, useMediaQuery, useTheme } from "@mui/material"; +import { + Box, + Collapse, + List, + ListItem, + ListItemButton, + ListItemIcon, + ListItemText, + Stack, + useMediaQuery, + useTheme, +} from "@mui/material"; import Link from "next/link"; import SidebarBadge from "./SidebarBadge"; @@ -20,7 +31,7 @@ const SidebarSubitems = ({ subitem, dispatch, handleDrawerClose }) => { dispatch({ type: "COLLAPSE_SUB_ITEMS", id: subitem.id }); } else { if (isMobile) { - handleDrawerClose() + handleDrawerClose(); } } }} @@ -71,7 +82,14 @@ const SidebarSubitems = ({ subitem, dispatch, handleDrawerClose }) => { }} > {subitem.Subitems.map((subSubitem, index) => { - return ; + return ( + + ); })} ) : null} diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index 22163c8..d62703a 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -146,12 +146,16 @@ export const REJECT_ROAD_SAFETY_BY_SUPERVISOR = api + "/api/v3/safety_and_privac export const DESERIALIZE_JUDICIARY_DOCUMENT = api + "/api/v3/safety_and_privacy/deserialize"; export const GET_SAFETY_AND_PRIVACY_ITEM = api + "/api/v3/safety_and_privacy/sub_items"; -export const GET_ROAD_SAFETY_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/country_activity"; -export const GET_ROAD_SAFETY_CITY_ACTIVITY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/province_activity"; +export const GET_ROAD_SAFETY_PROVINCE_ACTIVITY_REPORT = + api + "/api/v3/safety_and_privacy_report/operator/country_activity"; +export const GET_ROAD_SAFETY_CITY_ACTIVITY_REPORT = + api + "/api/v3/safety_and_privacy_report/operator/province_activity"; export const GET_ROAD_SAFETY_REPORT_MAP = api + "/api/v3/safety_and_privacy/map"; export const GET_ROAD_SAFETY_DETAILS = api + "/api/v3/safety_and_privacy/operator"; -export const EXPORT_COUNTRY_ROAD_SAFETY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/country_excel_activity"; -export const EXPORT_PROVINCE_ROAD_SAFETY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/province_excel_activity"; +export const EXPORT_COUNTRY_ROAD_SAFETY_REPORT = + api + "/api/v3/safety_and_privacy_report/operator/country_excel_activity"; +export const EXPORT_PROVINCE_ROAD_SAFETY_REPORT = + api + "/api/v3/safety_and_privacy_report/operator/province_excel_activity"; // permission table export const GET_PERMISSION_TABLE_LIST = api + "/api/v3/permissions"; From 5d8451704fe1a17f001bce0e026362b0b2619453 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Mon, 19 May 2025 16:27:53 +0330 Subject: [PATCH 3/3] change version to 1.1.4 --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index c192076..b470aa2 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ HOST="rms.witel.ir" -NEXT_PUBLIC_VERSION="1.1.3" +NEXT_PUBLIC_VERSION="1.1.4" NEXT_PUBLIC_API_URL="https://rms.witel.ir" NEXT_PUBLIC_MAPTILE_ENDPOINT="https://rmsmap.rmto.ir/141map" \ No newline at end of file