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

Merge branch 'release/v1.1.4'

Browse Source
This commit is contained in:
AmirHossein Mahmoodi
2025-05-19 16:28:11 +03:30
parent f8500706ae 5d8451704f
commit decc5c4e48
8 changed files with 81 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@@ -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"

2
src/components/dashboard/roadSafety/operator/OperatorList.jsx
View File

@@ -490,7 +490,7 @@ const OperatorList = () => {
table_name={"roadSafetyOperatorList"}
TableToolbar={Toolbar}
enableRowActions
positionActionsColumn={"last"}
positionActionsColumn={"first"}
RowActions={RowActions}
/>
</Box>

2
src/components/dashboard/roadSafety/supervisor/SupervisorList.jsx
View File

@@ -596,7 +596,7 @@ const SupervisorList = () => {
table_name={"roadSafetyOperatorList"}
TableToolbar={Toolbar}
enableRowActions
positionActionsColumn={"last"}
positionActionsColumn={"first"}
RowActions={RowActions}
/>
</Box>

20
src/components/layouts/dashboard/headerWithLogo/HaederBottom/index.jsx
View File

@@ -25,15 +25,17 @@ const HeaderBottom = () => {
<Typography sx={{ color: (theme) => theme.palette.primary2.contrastText }}>rms.rmto.ir</Typography>
</Stack>
</Stack>
<Stack sx={{ display: { xs: 'none', sm: 'flex' } }}>
<Box sx={{
p: 1,
background: "#fff",
border: 2,
borderColor: (theme) => theme.palette.primary.main,
borderRadius: 2,
borderStyle: "dashed",
}}>
<Stack sx={{ display: { xs: "none", sm: "flex" } }}>
<Box
sx={{
p: 1,
background: "#fff",
border: 2,
borderColor: (theme) => theme.palette.primary.main,
borderRadius: 2,
borderStyle: "dashed",
}}
>
<Image alt="" priority src={HeaderLogo.src} width={140} height={32} />
</Box>
</Stack>

23
src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx
View File

@@ -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 <SidebarSubitems handleDrawerClose={handleDrawerClose} key={index} dispatch={dispatch} subitem={subitem} />;
return (
<SidebarSubitems
handleDrawerClose={handleDrawerClose}
key={index}
dispatch={dispatch}
subitem={subitem}
/>
);
})}
</List>
) : null}

29
src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarMenu.jsx
View File

@@ -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 && (
<List sx={{ overflow: "auto", flex: 1 }} disablePadding dense>
{menuItems.map((menuItem) => {
return <SidebarListItems handleDrawerClose={handleDrawerClose} dispatch={dispatch} key={menuItem.id} menuItem={menuItem} />;
return (
<SidebarListItems
handleDrawerClose={handleDrawerClose}
dispatch={dispatch}
key={menuItem.id}
menuItem={menuItem}
/>
);
})}
</List>
)}

24
src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx
View File

@@ -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 <SidebarSubitems handleDrawerClose={handleDrawerClose} key={index} dispatch={dispatch} subitem={subSubitem} />;
return (
<SidebarSubitems
handleDrawerClose={handleDrawerClose}
key={index}
dispatch={dispatch}
subitem={subSubitem}
/>
);
})}
</List>
) : null}

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

@@ -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";