| @@ -13,8 +13,8 @@ import {PNSPS_BUTTON_THEME} from "../../themes/buttonConst"; | |||
| import {ThemeProvider} from "@emotion/react"; | |||
| import * as ComboData from "utils/ComboData"; | |||
| import * as DateUtils from "utils/DateUtils"; | |||
| import Loadable from 'components/Loadable'; | |||
| const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); | |||
| // import Loadable from 'components/Loadable'; | |||
| // const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); | |||
| import {DatePicker} from "@mui/x-date-pickers/DatePicker"; | |||
| import dayjs from "dayjs"; | |||
| @@ -422,66 +422,63 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, onLoad }) => { | |||
| </Grid> | |||
| <Grid item> | |||
| <Grid container justifyContent="flex-end" direction="row" alignItems="center" spacing={3}> | |||
| {onLoad? | |||
| <Grid item sx={{ ml: 3, mb: 3, mr:6 }} > | |||
| <LoadingComponent disableText={true} alignItems="flex-start"/> | |||
| <ThemeProvider theme={PNSPS_BUTTON_THEME}> | |||
| <Grid item sx={{ mr: 3, mb: 3, }} > | |||
| <Button | |||
| variant="contained" | |||
| color="cancel" | |||
| onClick={clearHandler()} | |||
| > | |||
| Reset | |||
| </Button> | |||
| </Grid> | |||
| : | |||
| <ThemeProvider theme={PNSPS_BUTTON_THEME}> | |||
| <Grid item sx={{ mr: 3, mb: 3, }} > | |||
| <Grid item sx={{ ml: 3, mb: 3, }} > | |||
| <Button | |||
| variant="contained" | |||
| color="cancel" | |||
| onClick={clearHandler()} | |||
| type="submit" | |||
| disabled={onLoad} | |||
| > | |||
| Reset | |||
| </Button> | |||
| </Grid> | |||
| <Grid item sx={{ ml: 3, mb: 3, }} > | |||
| View | |||
| </Button> | |||
| </Grid> | |||
| <Grid item sx={{ ml: 3, mb: 3, }} > | |||
| <Grid container spacing={3}> | |||
| <Grid item sx={{ ml: 3, mr:3 }} > | |||
| <Button | |||
| variant="contained" | |||
| type="submit" | |||
| onClick={generateFileHandler("csv")} | |||
| disabled={onLoad} | |||
| > | |||
| View | |||
| Generate CSV | |||
| </Button> | |||
| </Grid> | |||
| <Grid item sx={{ ml: 3, mb: 3, }} > | |||
| <Grid container spacing={3}> | |||
| <Grid item sx={{ ml: 3, mr:3 }} > | |||
| <Button | |||
| variant="contained" | |||
| onClick={generateFileHandler("csv")} | |||
| > | |||
| Generate CSV | |||
| </Button> | |||
| </Grid> | |||
| <Grid item sx={{ ml: 3, }} > | |||
| <Button | |||
| variant="contained" | |||
| onClick={generateFileHandler("pdf")} | |||
| > | |||
| Generate PDF | |||
| </Button> | |||
| </Grid> | |||
| </Grid> | |||
| </Grid> | |||
| {/* <Grid item sx={{ ml: 3, mr: 3, mb: 3, }} > | |||
| {onDownload? | |||
| <LoadingComponent disableText={true} alignItems="flex-start"/> | |||
| : | |||
| <Grid item sx={{ ml: 3, }} > | |||
| <Button | |||
| variant="contained" | |||
| onClick={generatePDFHandler} | |||
| onClick={generateFileHandler("pdf")} | |||
| disabled={onLoad} | |||
| > | |||
| Generate PDF | |||
| </Button> | |||
| } | |||
| </Grid> */} | |||
| </ThemeProvider> | |||
| } | |||
| </Grid> | |||
| </Grid> | |||
| </Grid> | |||
| {/* <Grid item sx={{ ml: 3, mr: 3, mb: 3, }} > | |||
| {onDownload? | |||
| <LoadingComponent disableText={true} alignItems="flex-start"/> | |||
| : | |||
| <Button | |||
| variant="contained" | |||
| onClick={generatePDFHandler} | |||
| > | |||
| Generate PDF | |||
| </Button> | |||
| } | |||
| </Grid> */} | |||
| </ThemeProvider> | |||
| </Grid> | |||
| </Grid> | |||
| </Grid> | |||