Przeglądaj źródła

CR023 - update gazette issue import

CR023
Jason Chuang 6 godzin temu
rodzic
commit
6d73b74803
2 zmienionych plików z 4 dodań i 16 usunięć
  1. +3
    -3
      src/components/FiDataGrid.js
  2. +1
    -13
      src/pages/GazetteIssue/DataGrid.js

+ 3
- 3
src/components/FiDataGrid.js Wyświetl plik

@@ -114,7 +114,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
delete params.sort; delete params.sort;
delete params.direction; delete params.direction;
} }
if (disablePagingOnGazetteIssue && hasGazetteIssueFilter(params)) {
if (!pagination || (disablePagingOnGazetteIssue && hasGazetteIssueFilter(params))) {
delete params.start; delete params.start;
delete params.limit; delete params.limit;
} else { } else {
@@ -130,7 +130,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
} }
}; };


const ignorePaging = disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad?.params);
const ignorePaging = !pagination || (disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad?.params));
const effectivePagination = pagination && !ignorePaging; const effectivePagination = pagination && !ignorePaging;


useEffect(() => { useEffect(() => {
@@ -216,7 +216,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
if (_doLoad.params == undefined) return; if (_doLoad.params == undefined) return;
if (_doLoad.params.searchCriteria !== undefined) return; if (_doLoad.params.searchCriteria !== undefined) return;
if (_doLoad.params == null) _doLoad.params = {}; if (_doLoad.params == null) _doLoad.params = {};
if (disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad.params)) {
if (!pagination || (disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad.params))) {
delete _doLoad.params.start; delete _doLoad.params.start;
delete _doLoad.params.limit; delete _doLoad.params.limit;
} else { } else {


+ 1
- 13
src/pages/GazetteIssue/DataGrid.js Wyświetl plik

@@ -68,18 +68,6 @@ export default function GazetteIssueTable({ searchCriteria, applyGridOnReady })
return <div style={{ margin: 4 }}>{dateStr(closingDate)}</div> return <div style={{ margin: 4 }}>{dateStr(closingDate)}</div>
}, },
}, },
{
id: 'closingDateOff',
field: 'closingDateOff',
headerName: 'Closing Date Off',
flex: 2,
minWidth: 150,
renderCell: (params) => {
// console.log(params)
let closingDateOff = params.row.closingDateOff;
return <div style={{ margin: 4 }}>{dateStr(closingDateOff)}</div>
},
},
{ {
id: 'issueDesc', id: 'issueDesc',
field: 'issueDesc', field: 'issueDesc',
@@ -97,7 +85,7 @@ export default function GazetteIssueTable({ searchCriteria, applyGridOnReady })
<div style={{ height: "fit-content", width: '100%' }}> <div style={{ height: "fit-content", width: '100%' }}>
<FiDataGrid <FiDataGrid
columns={columns} columns={columns}
customPageSize={10}
pagination={false}
// onRowDoubleClick={handleRowDoubleClick} // onRowDoubleClick={handleRowDoubleClick}
getRowHeight={() => 'auto'} getRowHeight={() => 'auto'}
applyGridOnReady={applyGridOnReady} applyGridOnReady={applyGridOnReady}


Ładowanie…
Anuluj
Zapisz