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

Merge branch 'feature/remove_addition_column' into 'develop'

Browse Source 
remove addition columns

See merge request witel-front-end/rms!14
This commit is contained in:
AmirHossein Mahmoodi
2024-07-30 07:58:00 +00:00
parent 628dfe68ca fd7821473f
commit 2c68c576ce
6 changed files with 110 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/dashboard/inquiryPrivacyFencing/Actions/Create/index.jsx
View File

@@ -1,12 +1,15 @@
"use client";
import DialogTransition from "@/core/components/DialogTransition";
import { AddCircle, Close } from "@mui/icons-material";
import { Button, Dialog, DialogTitle, IconButton } from "@mui/material";
import { Button, Dialog, DialogTitle, IconButton, useMediaQuery } from "@mui/material";
import CreateOrUpdateForm from "../../Forms/CreateOrUpdate";
import { SET_INQUIRE_PRIVACY_FENCING } from "@/core/utils/routes";
import { useState } from "react";
import { useTheme } from "@emotion/react";
const InquiryPrivacyFencingCreate = ({ mutate }) => {
const theme = useTheme();
const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
const [open, setOpen] = useState(false);
const handleOpen = () => {
@@ -19,11 +22,22 @@ const InquiryPrivacyFencingCreate = ({ mutate }) => {
return (
<>
<Button variant="contained" color="primary2" startIcon={<AddCircle />} onClick={handleOpen}>
ایجاد پاسخ به استعلام
</Button>
{isMobile ? (
<IconButton aria-label="ایجاد پاسخ به استعلام" color="primary" onClick={handleOpen}>
<AddCircle sx={{ fontSize: "25px" }} />
</IconButton>
) : (
<Button
variant="contained"
color="primary"
startIcon={<AddCircle />}
onClick={handleOpen}
>
ایجاد پاسخ به استعلام
</Button>
)}
<Dialog open={open} fullScreen TransitionComponent={DialogTransition}>
<DialogTitle sx={{ m: 0, p: 2, borderBottom: 1, borderColor: 'divider' }} id="create-dialog">
<DialogTitle sx={{ m: 0, p: 2, borderBottom: 1, borderColor: "divider" }} id="create-dialog">
ایجاد پاسخ به استعلام
</DialogTitle>
<IconButton

99
src/components/dashboard/inquiryPrivacyFencing/index.jsx
View File

@@ -4,80 +4,12 @@ import { useMemo } from "react";
import Toolbar from "@/components/dashboard/inquiryPrivacyFencing/Toolbar";
import DataTable from "@/core/components/DataTable";
import { GET_INQUIRY_PRIVACY_FENCING_ROUTE } from "@/core/utils/routes";
import { Box } from "@mui/material";
import PageTitle from "@/core/components/PageTitle";
const InquiryPrivacyFencingPage = () => {
const columns = useMemo(
() => [
{
accessorKey: "fullname",
header: "نام کامل",
id: "fullname",
columns: [
{
accessorKey: "first_name",
header: "اسم",
id: "first_name",
columns: [
{
accessorKey: "part1",
header: "فامیل",
id: "part1",
enableColumnFilter: false,
datatype: "text",
columns: [
{
accessorKey: "part1_1",
header: "part1_1",
id: "part1_1",
enableColumnFilter: false,
datatype: "text",
},
{
accessorKey: "part1_2",
header: "part1_2",
id: "part1_2",
enableColumnFilter: false,
datatype: "text",
},
],
},
{
accessorKey: "part2",
header: "part2",
id: "part2",
enableColumnFilter: false,
datatype: "text",
},
],
},
{
accessorKey: "last_name",
header: "last_name",
id: "last_name",
enableColumnFilter: false,
datatype: "text",
},
],
},
{
accessorKey: "something",
header: "something",
id: "something",
columns: [
{
accessorKey: "something1",
header: "something1",
id: "something1",
},
{
accessorKey: "something2",
header: "something2",
id: "something2",
enableColumnFilter: false,
datatype: "text",
},
],
},
{
accessorKey: "dabirkhaneh_number",
header: "شماره دبیرخانه درخواست",
@@ -85,7 +17,6 @@ const InquiryPrivacyFencingPage = () => {
enableColumnFilter: false,
datatype: "text",
filterFn: "notEquals",
columnFilterModeOptions: ["equals", "notEquals", "contains"],
},
{
accessorKey: "marjae_pasokh",
@@ -94,7 +25,6 @@ const InquiryPrivacyFencingPage = () => {
enableColumnFilter: false,
datatype: "text",
filterFn: "equals",
columnFilterModeOptions: ["equals", "notEquals", "contains", "lessThan", "greaterThan", "fuzzy"],
},
{
accessorKey: "motaghazi_is_legal",
@@ -269,7 +199,6 @@ const InquiryPrivacyFencingPage = () => {
header: "ماه",
id: "max_month",
enableColumnFilter: false,
columnFilterModeOptions: ["equals", "notEquals", "contains"],
},
{
accessorKey: "max_day",
@@ -306,15 +235,21 @@ const InquiryPrivacyFencingPage = () => {
);
return (
<DataTable
need_filter={false}
columns={columns}
table_url={GET_INQUIRY_PRIVACY_FENCING_ROUTE}
user_id={0}
page_name={"inquiryPrivacyFencing"}
table_name={"inquiryPrivacyFencingList"}
TableToolbar={Toolbar}
/>
<>
<PageTitle title={"احداث و بهره برداری دیوارکشی و مستحدثات"} />
<Box sx={{ p: 2, border: "1px solid #e1e1e1" }}>
<DataTable
table_title={"لیست استعلام ها"}
need_filter={false}
columns={columns}
table_url={GET_INQUIRY_PRIVACY_FENCING_ROUTE}
user_id={0}
page_name={"inquiryPrivacyFencing"}
table_name={"inquiryPrivacyFencingList"}
TableToolbar={Toolbar}
/>
</Box>
</>
);
};
export default InquiryPrivacyFencingPage;

13
src/core/components/DataTable/Main.js
View File

@@ -11,7 +11,17 @@ import { flattenObjectOfObjects } from "@/core/utils/flattenObjectOfObjects";
const DataTable_Main = (props) => {
const request = useRequest();
const { filterData, sortData, setSortData, hideData } = useDataTable();
const { need_filter, table_url, user_id, page_name, table_name, columns, initialStateProps, TableToolbar } = props;
const {
need_filter,
table_url,
user_id,
page_name,
table_name,
columns,
initialStateProps,
TableToolbar,
table_title,
} = props;
const flatColumns = flattenArrayOfObjects(columns, "columns");
const [pagination, setPagination] = useState({ pageIndex: 0, pageSize: 10 });
const flattenHideData = flattenObjectOfObjects(hideData);
@@ -109,6 +119,7 @@ const DataTable_Main = (props) => {
return (
<DataTable_Paper
table={table}
table_title={table_title}
need_filter={need_filter}
mutate={mutate}
table_url={table_url}

48
src/core/components/DataTable/table/Paper.js
View File

@@ -5,16 +5,17 @@ import DataTable_TopToolbar from "../toolbar/TopToolbar";
import DataTable_TableContainer from "./TableContainer";
const DataTable_Paper = ({
table,
table_name,
columns,
user_id,
page_name,
mutate,
need_filter,
table_url,
...rest
}) => {
table,
table_name,
columns,
user_id,
page_name,
mutate,
need_filter,
table_url,
table_title,
...rest
}) => {
const {
getState,
options: {
@@ -49,19 +50,19 @@ const DataTable_Paper = ({
style={{
...(isFullScreen
? {
bottom: 0,
height: "100dvh",
left: 0,
margin: 0,
maxHeight: "100dvh",
maxWidth: "100dvw",
padding: 0,
position: "fixed",
right: 0,
top: 0,
width: "100dvw",
zIndex: 999,
}
bottom: 0,
height: "100dvh",
left: 0,
margin: 0,
maxHeight: "100dvh",
maxWidth: "100dvw",
padding: 0,
position: "fixed",
right: 0,
top: 0,
width: "100dvw",
zIndex: 999,
}
: {}),
...paperProps?.style,
}}
@@ -84,6 +85,7 @@ const DataTable_Paper = ({
user_id={user_id}
page_name={page_name}
table_name={table_name}
table_title={table_title}
/>
))}
<DataTable_TableContainer table={table} />

32
src/core/components/DataTable/toolbar/TopToolbar.js
View File

@@ -1,5 +1,5 @@
import { getCommonToolbarStyles, parseFromValuesOrFunc } from "@/core/utils/utils";
import { Box, useMediaQuery } from "@mui/material";
import { Box, Typography, useMediaQuery } from "@mui/material";
import DataTable_LinearProgressBar from "./LinearProgressBar";
import DataTable_TablePagination from "./TablePagination";
import FilterColumn from "@/core/components/DataTable/filter";
@@ -7,7 +7,17 @@ import UpdateTable from "@/core/components/DataTable/update/UpdateTable";
import ResetStorage from "@/core/components/DataTable/reset/ResetStorage";
import HideColumn from "@/core/components/DataTable/hide";
const DataTable_TopToolbar = ({ mutate, need_filter, table, columns, table_url, user_id, page_name, table_name }) => {
const DataTable_TopToolbar = ({
mutate,
need_filter,
table,
columns,
table_url,
user_id,
page_name,
table_name,
table_title,
}) => {
const {
getState,
options: {
@@ -47,11 +57,12 @@ const DataTable_TopToolbar = ({ mutate, need_filter, table, columns, table_url,
>
<Box
sx={{
alignItems: "flex-start",
flexWrap: { xs: "wrap", sm: "no-wrap" },
boxSizing: "border-box",
display: "flex",
gap: "0.5rem",
justifyContent: "space-between",
alignItems: "center",
py: "0.5rem",
position: stackAlertBanner ? "relative" : "absolute",
right: 0,
@@ -59,15 +70,22 @@ const DataTable_TopToolbar = ({ mutate, need_filter, table, columns, table_url,
width: "100%",
}}
>
{renderTopToolbarCustomActions?.({ table }) ?? <span />}
<Box sx={{
display: "flex",
alignItems: "center",
order: { xs: 2, sm: 1 },
}}>{renderTopToolbarCustomActions?.({ table })}</Box>
<Typography sx={{ textAlign: "center", order: { xs: 1, sm: 2 }, width: { xs: "100%", sm: "unset" } }}
fontWeight={600}>{table_title || ""}</Typography>
{enableToolbarInternalActions && (
<Box
sx={{
alignItems: "center",
display: "flex",
flexWrap: "wrap-reverse",
gap: "0.5rem",
flexWrap: "wrap-reverse",
display: "flex",
alignItems: "center",
justifyContent: "flex-end",
order: 3,
}}
>
<ResetStorage user_id={user_id}

12
src/core/components/PageTitle.jsx Normal file
View File

@@ -0,0 +1,12 @@
"use client";
import { Chip, Divider, Typography } from "@mui/material";
const PageTitle = ({ title }) => {
return (
<Divider sx={{ mb: 2 }}><Chip
label={<Typography fontSize={14} fontWeight={500}>{title}</Typography>} /></Divider>
);
};
export default PageTitle;