@@ -110,7 +110,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight, | |||||
count={_rows.length} | count={_rows.length} | ||||
page={page} | page={page} | ||||
rowsPerPage={pageSize} | rowsPerPage={pageSize} | ||||
rowsPerPageOptions={[5, 10, 25, 50]} | |||||
rowsPerPageOptions={[10]} | |||||
labelDisplayedRows={({ from, to, count }) => | labelDisplayedRows={({ from, to, count }) => | ||||
`${from}-${to} ${intl.formatMessage({ id: "of" })} ${count}` | `${from}-${to} ${intl.formatMessage({ id: "of" })} ${count}` | ||||
} | } | ||||
@@ -118,7 +118,7 @@ export default function BaseGrid({rows}) { | |||||
} | } | ||||
return ( | return ( | ||||
<div style={{minHeight: 400, width: '100%', padding: 4}}> | |||||
<div style={{minHeight: 400, height:"100%", width: '100%', padding: 4}}> | |||||
<FiDataGrid | <FiDataGrid | ||||
rows={rows} | rows={rows} | ||||
columns={columns} | columns={columns} | ||||
@@ -35,7 +35,12 @@ const UserSearchPage_Individual = () => { | |||||
url: GET_PUBLIC_NOTICE_LIST, | url: GET_PUBLIC_NOTICE_LIST, | ||||
params: searchCriteria, | params: searchCriteria, | ||||
onSuccess: function(responseData){ | onSuccess: function(responseData){ | ||||
setRecord(responseData); | |||||
setRecord( | |||||
[ | |||||
responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0], | |||||
responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0] | |||||
] | |||||
); | |||||
} | } | ||||
}); | }); | ||||
} | } | ||||
@@ -45,7 +50,7 @@ const UserSearchPage_Individual = () => { | |||||
} | } | ||||
return ( | return ( | ||||
<Grid container> | |||||
<Grid container sx={{ display: 'flex', flexDirection: 'column', height: '100%' }}> | |||||
{/*row 1*/} | {/*row 1*/} | ||||
<Grid item xs={12} md={12} lg={12} sx={{mb:-3}}> | <Grid item xs={12} md={12} lg={12} sx={{mb:-3}}> | ||||
<SearchForm | <SearchForm | ||||
@@ -58,11 +63,14 @@ const UserSearchPage_Individual = () => { | |||||
<MainCard elevation={0} | <MainCard elevation={0} | ||||
border={false} | border={false} | ||||
content={false} | content={false} | ||||
sx={{width: "-webkit-fill-available"}} | |||||
sx={{width: "-webkit-fill-available",height: "100%", minHeight:'100%'}} | |||||
> | > | ||||
<EventTable | |||||
recordList={record} | |||||
/> | |||||
<div style={{height: '100%', width: '100%' , minHeight:'80vh'}}> | |||||
<EventTable | |||||
autoHeight | |||||
recordList={record} | |||||
/> | |||||
</div> | |||||
</MainCard> | </MainCard> | ||||
</Grid> | </Grid> | ||||
@@ -121,7 +121,7 @@ export default function SearchPublicNoticeTable({ recordList }) { | |||||
} | } | ||||
return ( | return ( | ||||
<div style={{ minHeight: 400, width: '100%' }}> | |||||
<div style={{ minHeight: 400, height: "100%", width: '100%' }}> | |||||
<FiDataGrid | <FiDataGrid | ||||
rows={rows} | rows={rows} | ||||
columns={columns} | columns={columns} | ||||
@@ -129,9 +129,9 @@ const PublicNotice = () => { | |||||
{ | { | ||||
JSON.parse(localStorage.getItem('userData')).creditor ? ( | JSON.parse(localStorage.getItem('userData')).creditor ? ( | ||||
<Grid item xs={12} sm={12} md={12} lg={12} sx={{ minHeight: '75vh', maxWidth: '1%',width: "-webkit-fill-available", backgroundColor: "#fff", mt: 3, mr: 3, ml: 3, mb: 3, ..._sx }}> | |||||
<Grid item xs={12} sm={12} md={12} lg={12} sx={{ height:'100%', maxWidth: '1%',width: "-webkit-fill-available", backgroundColor: "#fff", mt: 3, mr: 3, ml: 3, mb: 3, ..._sx }}> | |||||
<TabContext value={selectedTab}> | <TabContext value={selectedTab}> | ||||
<Box sx={{ borderBottom: 1, borderColor: 'divider', overflowX: 'auto', }}> | |||||
<Box sx={{ borderBottom: 1, borderColor: 'divider', overflowX: 'auto', overflowY:'auto' }}> | |||||
<TabList onChange={handleChange} aria-label="lab API tabs example" sx={{ display: 'flex', flexDirection: 'row' }}> | <TabList onChange={handleChange} aria-label="lab API tabs example" sx={{ display: 'flex', flexDirection: 'row' }}> | ||||
<Tab label={intl.formatMessage({id: 'processing'}) + " (" + submittedList?.length + ")"} value="1" /> | <Tab label={intl.formatMessage({id: 'processing'}) + " (" + submittedList?.length + ")"} value="1" /> | ||||
<Tab label={intl.formatMessage({id: 'pendingPublish'}) + " (" + pendingPublishList?.length + ")"} value="3" /> | <Tab label={intl.formatMessage({id: 'pendingPublish'}) + " (" + pendingPublishList?.length + ")"} value="3" /> | ||||
@@ -166,7 +166,7 @@ const PublicNotice = () => { | |||||
</TabContext> | </TabContext> | ||||
</Grid> | </Grid> | ||||
) : ( | ) : ( | ||||
<Grid item xs={12} sx={{ minHeight: '75vh', maxWidth: '95%', width: "-webkit-fill-available", backgroundColor: "#fff", mt: 3, mr: 3, ml: 3, mb: 3, ..._sx }}> | |||||
<Grid item xs={12} sx={{ minHeight: '80vh',height:"100%", maxHeight:'300vh', maxWidth: '95%', width: "-webkit-fill-available", backgroundColor: "#fff", mt: 3, mr: 3, ml: 3, mb: 3, ..._sx }}> | |||||
<TabContext value={selectedTab}> | <TabContext value={selectedTab}> | ||||
<Box sx={{ borderBottom: 1, borderColor: 'divider' }}> | <Box sx={{ borderBottom: 1, borderColor: 'divider' }}> | ||||
<TabList onChange={handleChange} aria-label="lab API tabs example"> | <TabList onChange={handleChange} aria-label="lab API tabs example"> | ||||