Browse Source

fix bug

master
Anna Ho 1 year ago
parent
commit
1d333ced05
5 changed files with 24 additions and 32 deletions
  1. +3
    -3
      src/pages/DemandNote/Search/DataGrid.js
  2. +1
    -3
      src/pages/GFMIS/DataGrid.js
  3. +0
    -2
      src/pages/Payment/Search_GLD/DataGrid.js
  4. +20
    -23
      src/pages/PublicNotice/Search_GLD/DataGrid.js
  5. +0
    -1
      src/pages/PublicNotice/Search_GLD/index.js

+ 3
- 3
src/pages/DemandNote/Search/DataGrid.js View File

@@ -339,13 +339,13 @@ export default function SearchDemandNote({ searchCriteria, applySearch }) {
customPageSize={100} customPageSize={100}
getRowHeight={() => 'auto'} getRowHeight={() => 'auto'}
onRowDoubleClick={handleRowDoubleClick} onRowDoubleClick={handleRowDoubleClick}
doLoad={{
doLoad={React.useMemo(() => ({
url: UrlUtils.DEMAND_NOTE_LIST, url: UrlUtils.DEMAND_NOTE_LIST,
params: _searchCriteria, params: _searchCriteria,
callback: (responseData)=>{
callback: function (responseData) {
setRows(responseData?.records); setRows(responseData?.records);
} }
}}
}), [_searchCriteria])}
/> />
</Box> </Box>
<div> <div>


+ 1
- 3
src/pages/GFMIS/DataGrid.js View File

@@ -68,9 +68,7 @@ export default function SearchTable({ searchCriteria }) {
onRowDoubleClick={handleEditClick} onRowDoubleClick={handleEditClick}
doLoad={{ doLoad={{
url:GFIMIS_LIST, url:GFIMIS_LIST,
params:_searchCriteria,
callback: function(){
}
params:_searchCriteria
}} }}
/> />
</div> </div>


+ 0
- 2
src/pages/Payment/Search_GLD/DataGrid.js View File

@@ -99,8 +99,6 @@ export default function SearchPaymentTable({ searchCriteria }) {
doLoad={{ doLoad={{
url:PAYMENT_LIST, url:PAYMENT_LIST,
params:_searchCriteria, params:_searchCriteria,
callback: function(){
}
}} }}
/> />
</div> </div>


+ 20
- 23
src/pages/PublicNotice/Search_GLD/DataGrid.js View File

@@ -8,7 +8,7 @@ import {
Stack, Stack,
Dialog, DialogTitle, DialogContent, DialogActions, Dialog, DialogTitle, DialogContent, DialogActions,
} from '@mui/material'; } from '@mui/material';
import * as UrlUtils from "utils/ApiPathConst";
import { GET_PUBLIC_NOTICE_LIST, SET_PUBLIC_NOTICE_STATUS_PUBLISH_BULK } from "utils/ApiPathConst";
import * as HttpUtils from "utils/HttpUtils"; import * as HttpUtils from "utils/HttpUtils";
import * as DateUtils from "utils/DateUtils"; import * as DateUtils from "utils/DateUtils";
import * as FormatUtils from "utils/FormatUtils"; import * as FormatUtils from "utils/FormatUtils";
@@ -21,17 +21,15 @@ import { FormattedMessage, useIntl } from "react-intl";


export default function SearchPublicNoticeTable({ searchCriteria }) { export default function SearchPublicNoticeTable({ searchCriteria }) {


const [rows, setRows] = React.useState([]);
const [_searchCriteria, set_searchCriteria] = React.useState(searchCriteria); const [_searchCriteria, set_searchCriteria] = React.useState(searchCriteria);


const [rows, setRows] = React.useState();
const navigate = useNavigate() const navigate = useNavigate()


const [selectedRowItems, setSelectedRowItems] = React.useState([]); const [selectedRowItems, setSelectedRowItems] = React.useState([]);
const [isConfirmPopUp, setIsConfirmPopUp] = React.useState(false); const [isConfirmPopUp, setIsConfirmPopUp] = React.useState(false);
const [isWarningPopUp, setIsWarningPopUp] = React.useState(false); const [isWarningPopUp, setIsWarningPopUp] = React.useState(false);




const intl = useIntl(); const intl = useIntl();


React.useEffect(() => { React.useEffect(() => {
@@ -40,14 +38,14 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {




function genIssueNo(params) { function genIssueNo(params) {
const issueNo = params.row.issueYear+ " Vol. " + FormatUtils.zeroPad(params.row.issueVolume, 3)+ ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2)+ ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)")
const issueNo = params.row.issueYear + " Vol. " + FormatUtils.zeroPad(params.row.issueVolume, 3) + ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2) + ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)")
return issueNo return issueNo
} }


function genGroupNo(params) { function genGroupNo(params) {
let groupNo = params.row.groupNo let groupNo = params.row.groupNo
if (groupNo!=null){
groupNo = <><br/><div>{groupNo}</div></>
if (groupNo != null) {
groupNo = <><br /><div>{groupNo}</div></>
} }
return groupNo return groupNo
} }
@@ -77,7 +75,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
headerName: 'With Proof', headerName: 'With Proof',
width: 120, width: 120,
renderCell: (params) => { renderCell: (params) => {
return [params.row.proofId!=null?"Yes":""]
return [params.row.proofId != null ? "Yes" : ""]
}, },
}, },
{ {
@@ -111,12 +109,12 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
headerName: 'Gazette Issue No. / Gazette Code', headerName: 'Gazette Issue No. / Gazette Code',
flex: 1.5, flex: 1.5,
minWidth: 350, minWidth: 350,
renderCell: (params) =>(
renderCell: (params) => (
<div> <div>
{genIssueNo(params)} {genIssueNo(params)}
{genGroupNo(params)} {genGroupNo(params)}
</div> </div>
) )
}, },
]; ];
@@ -136,21 +134,20 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
for (var i = 0; i < datas?.length; i++) { for (var i = 0; i < datas?.length; i++) {
appIdList.push(datas[i].id); appIdList.push(datas[i].id);
} }
if(appIdList.length<1){
if (appIdList.length < 1) {
setIsWarningPopUp(true); setIsWarningPopUp(true);
}else{
} else {
HttpUtils.post({ HttpUtils.post({
url: UrlUtils.SET_PUBLIC_NOTICE_STATUS_PUBLISH_BULK,
url: SET_PUBLIC_NOTICE_STATUS_PUBLISH_BULK,
params: { params: {
ids: appIdList ids: appIdList
}, },
onSuccess: () => { onSuccess: () => {
reloadFunction()
searchCriteria.reload = new Date();
notifyActionSuccess("Action Success!") notifyActionSuccess("Action Success!")
} }
}); });
} }
} }


return (<> return (<>
@@ -159,7 +156,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
<Grid container direction="row" justifyContent="flex-start" alignItems="center" sx={{ p: 1 }} > <Grid container direction="row" justifyContent="flex-start" alignItems="center" sx={{ p: 1 }} >
<Button <Button
variant="contained" variant="contained"
onClick={()=>setIsConfirmPopUp(true)}
onClick={() => setIsConfirmPopUp(true)}
> >
Published Published
</Button> </Button>
@@ -179,13 +176,13 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
customPageSize={10} customPageSize={10}
getRowHeight={() => 'auto'} getRowHeight={() => 'auto'}
onRowDoubleClick={handleRowDoubleClick} onRowDoubleClick={handleRowDoubleClick}
doLoad={{
url:UrlUtils.GET_PUBLIC_NOTICE_LIST,
params:_searchCriteria,
callback: function(responseData){
doLoad={React.useMemo(() => ({
url: GET_PUBLIC_NOTICE_LIST,
params: _searchCriteria,
callback: function (responseData) {
setRows(responseData?.records); setRows(responseData?.records);
} }
}}
}), [_searchCriteria])}
/> />
</div> </div>
<div> <div>
@@ -207,7 +204,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
</DialogTitle> </DialogTitle>
<DialogContent style={{ display: 'flex', }}> <DialogContent style={{ display: 'flex', }}>
<Stack direction="column" justifyContent="space-between"> <Stack direction="column" justifyContent="space-between">
<Typography variant="h4" style={{ padding: '16px' }}>Please Confirm to mark selected application as Published.</Typography>
<Typography variant="h4" style={{ padding: '16px' }}>Please Confirm to mark selected application as Published.</Typography>
</Stack> </Stack>
</DialogContent> </DialogContent>
<DialogActions> <DialogActions>
@@ -216,7 +213,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
<FormattedMessage id="close" /> <FormattedMessage id="close" />
</Typography></Button> </Typography></Button>


<Button onClick={()=>doPublish()} aria-label={intl.formatMessage({ id: 'confirm' })}>
<Button onClick={() => doPublish()} aria-label={intl.formatMessage({ id: 'confirm' })}>
<Typography variant="h5"> <Typography variant="h5">
<FormattedMessage id="confirm" /> <FormattedMessage id="confirm" />
</Typography></Button> </Typography></Button>


+ 0
- 1
src/pages/PublicNotice/Search_GLD/index.js View File

@@ -29,7 +29,6 @@ const BackgroundHead = {
// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


const UserSearchPage_Individual = () => { const UserSearchPage_Individual = () => {

const [orgCombo, setOrgCombo] = React.useState([]); const [orgCombo, setOrgCombo] = React.useState([]);
const [issueCombo, setIssueCombo] = React.useState([]); const [issueCombo, setIssueCombo] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({ const [searchCriteria, setSearchCriteria] = React.useState({


Loading…
Cancel
Save