From 1db68708aae4df15bedb9b3fee81aac8d60319a6 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Wed, 10 Apr 2024 16:09:56 +0800
Subject: [PATCH] fix ui

---
 .../Announcement/Search_Public/SearchForm.js  |   8 +-
 src/pages/Recon/SearchForm.js                 | 130 ++++++++++++------
 2 files changed, 91 insertions(+), 47 deletions(-)

diff --git a/src/pages/Announcement/Search_Public/SearchForm.js b/src/pages/Announcement/Search_Public/SearchForm.js
index 56683ed..451c745 100644
--- a/src/pages/Announcement/Search_Public/SearchForm.js
+++ b/src/pages/Announcement/Search_Public/SearchForm.js
@@ -9,7 +9,7 @@ import { useForm } from "react-hook-form";
 import * as React from "react";
 import * as DateUtils from "utils/DateUtils";
 import { ThemeProvider } from "@emotion/react";
-import { useNavigate } from "react-router-dom";
+// import { useNavigate } from "react-router-dom";
 import { PNSPS_BUTTON_THEME } from "../../../themes/buttonConst";
 import { FormattedMessage, useIntl } from "react-intl";
 import { makeStyles } from '@mui/styles';
@@ -32,7 +32,7 @@ const useStyles = makeStyles(() => ({
   }));
 
 const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
-    const navigate = useNavigate()
+    // const navigate = useNavigate()
 
     const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
     const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo);
@@ -209,7 +209,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                     {/*last row*/}
                     <Grid container maxWidth justifyContent="flex-end">
                         <ThemeProvider theme={PNSPS_BUTTON_THEME}>
-                            <Grid item sx={{ ml: 3 }}>
+                            {/* <Grid item sx={{ ml: 3 }}>
                                 <Button
                                     variant="contained"
                                     color="green"
@@ -219,7 +219,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                 >
                                     <FormattedMessage id="create"></FormattedMessage>
                                 </Button>
-                            </Grid>
+                            </Grid> */}
                             <Grid item sx={{ ml: 3 }}>
                                 <Button
                                     variant="contained"
diff --git a/src/pages/Recon/SearchForm.js b/src/pages/Recon/SearchForm.js
index 6dbdde6..22b0121 100644
--- a/src/pages/Recon/SearchForm.js
+++ b/src/pages/Recon/SearchForm.js
@@ -286,6 +286,23 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
         generateReport(temp);
     }
 
+    const clearHandler = () => () => {
+        setSysTxnMinDate(searchCriteria.dateFrom)
+        setsysTxnMaxDate(searchCriteria.dateTo)
+        setTxnMinDate(searchCriteria.dateFrom)
+        setTxnMaxDate(searchCriteria.dateTo)
+        setCollMinDate(searchCriteria.dateFrom)
+        setCollMaxDate(searchCriteria.dateTo)
+        setSysTxnFromDateValue("")
+        setSysTxnToDateValue("")
+        setTxnFromDateValue("")
+        setTxnToDateValue("")
+        setCollFromDateValue("")
+        setCollToDateValue("")
+        setStatus(ComboData.paymentStatus[0])
+        setMethod(ComboData.paymentMethod[0])
+    }
+
     return (
         <MainCard xs={12} md={12} lg={12}
             border={false}
@@ -504,59 +521,86 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
                             </Grid>
                         </Grid>
                     </Grid>
-
-                    <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"/>
-                            </Grid>
-                            :
-                            <ThemeProvider theme={PNSPS_BUTTON_THEME}>
+                    <Grid container direction="row" justifyContent="space-between">
+                        <Grid item>
+                            <Grid container justifyContent="flex-Start" direction="row"  alignItems="center" spacing={3}>
                                 <Grid item sx={{ ml: 3, mb: 3, }} >
+                                    {/* <ThemeProvider theme={PNSPS_BUTTON_THEME}>
                                         <Button
                                             variant="contained"
-                                            type="submit"
+                                            color="cancel"
+                                            onClick={clearHandler()}
                                         >
-                                            View
-                                        </Button>
+                                            Reset
+                                        </Button>    
+                                    </ThemeProvider> */}
                                 </Grid>
-
-                                <Grid item sx={{ ml: 3, mb: 3, }} >
-                                    <Grid container spacing={3}>
-                                        <Grid item sx={{ ml: 3, mr:3 }} >
+                            </Grid>
+                        </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"/>
+                                    </Grid>
+                                    :
+                                    <ThemeProvider theme={PNSPS_BUTTON_THEME}>
+                                        <Grid item sx={{ mr: 3, mb: 3, }} >
                                             <Button
                                                 variant="contained"
-                                                onClick={generateFileHandler("csv")}
+                                                color="cancel"
+                                                onClick={clearHandler()}
                                             >
-                                                Generate CSV
-                                            </Button>
+                                                Reset
+                                            </Button>    
                                         </Grid>
-                                        
-                                        <Grid item sx={{ ml: 3, }} >
-                                            <Button
-                                                variant="contained"
-                                                onClick={generateFileHandler("pdf")}
-                                            >
-                                                Generate PDF
-                                            </Button>
+                                        <Grid item sx={{ ml: 3, mb: 3, }} >
+                                                <Button
+                                                    variant="contained"
+                                                    type="submit"
+                                                >
+                                                    View
+                                                </Button>
                                         </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 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"/>
+                                            :
+                                                <Button
+                                                    variant="contained"
+                                                    onClick={generatePDFHandler}
+                                                >
+                                                    Generate PDF
+                                                </Button>
+                                            }
+                                        </Grid> */}
+                                    </ThemeProvider>
+                                }
+                            </Grid>
+                        </Grid>
                     </Grid>
                 </Grid>
             </form>