From 6679f0067c75389b20da8f15244c67cae5db7fb7 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Thu, 28 Dec 2023 11:58:54 +0800
Subject: [PATCH] fix bug

---
 src/pages/DemandNote/Create/DataGrid.js   |  2 +-
 src/pages/DemandNote/Create/SearchForm.js | 13 ++++++++-----
 src/pages/DemandNote/Search/DataGrid.js   |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/pages/DemandNote/Create/DataGrid.js b/src/pages/DemandNote/Create/DataGrid.js
index 3747f8b..9dad92c 100644
--- a/src/pages/DemandNote/Create/DataGrid.js
+++ b/src/pages/DemandNote/Create/DataGrid.js
@@ -66,7 +66,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             field: 'contactPerson',
             headerName: 'Contact Person',
             flex: 1,
-            valueGetter: (params) => {
+            renderCell: (params) => {
                 let company = params.row.enCompanyName != null ? " (" + (params.row.enCompanyName) + ")" : "";
 
                 let phone = JSON.parse(params.row.contactTelNo);
diff --git a/src/pages/DemandNote/Create/SearchForm.js b/src/pages/DemandNote/Create/SearchForm.js
index a6da8b7..54c317f 100644
--- a/src/pages/DemandNote/Create/SearchForm.js
+++ b/src/pages/DemandNote/Create/SearchForm.js
@@ -48,6 +48,11 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => {
         }
     }, [issueComboData]);
 
+    
+    React.useEffect(() => {
+        onPreView();
+    }, [issueSelected]);
+
     function getIssueLabel(data) {
         if (data == {}) return "";
         return data.year
@@ -74,8 +79,6 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => {
 
     const onPreView = () => {
         if (!issueSelected?.id) {
-            setFailText("Fail Preview : Please select Gazette Issue.");
-            setIsFailPopUp(true);
             return;
         }
         const temp = {
@@ -101,7 +104,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => {
 
                 {/*row 2*/}
                 <Grid container alignItems={"center"}>
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3 }}>
+                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb:1 }}>
                         <Autocomplete
                             disablePortal
                             id="issueId"
@@ -124,7 +127,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => {
                             )}
                         />
                     </Grid>
-                    <Grid item sx={{ ml: 3, mr: 3}} >
+                    {/* <Grid item sx={{ ml: 3, mr: 3}} >
                         <Button
                             size="large"
                             variant="contained"
@@ -135,7 +138,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => {
                             }}>
                             <Typography variant="h5">Preview</Typography>
                         </Button>
-                    </Grid>
+                    </Grid> */}
                     <Grid item sx={{ ml: 3, mr: 3}} >
                         <Button
                             size="large"
diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js
index bffc25b..c7539a8 100644
--- a/src/pages/DemandNote/Search/DataGrid.js
+++ b/src/pages/DemandNote/Search/DataGrid.js
@@ -62,7 +62,7 @@ export default function SeaarchDemandNote({ recordList }) {
         {
             field: 'dnNo',
             headerName: 'DN No.',
-            width: 175,
+            width: 200,
             renderCell: (params) => {
                 return <Button onClick={handleDnClick(params)}><u>{params.row.dnNo}</u></Button>;
             },
@@ -104,7 +104,7 @@ export default function SeaarchDemandNote({ recordList }) {
             id: 'issueDate',
             field: 'issueDate',
             headerName: 'Submit Date',
-            flex: 1,
+            width: 175,
             valueGetter: (params) => {
                 return DateUtils.dateStr(params?.value);
             }
@@ -122,7 +122,7 @@ export default function SeaarchDemandNote({ recordList }) {
             headerName: 'DN Sent Date',
             flex: 1,
             valueGetter: (params) => {
-                return DateUtils.datetimeStr(params?.value);
+                return params?.value?DateUtils.datetimeStr(params?.value)+" - "+params.row.sentBy:"";
             }
         },
         {