From 9ab48d256efe6aba446579f8f09f6444abd1f6cc Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Fri, 10 Nov 2023 17:13:12 +0800
Subject: [PATCH] update

---
 src/pages/Proof/Search_Public/DataGrid.js     | 36 +++++++++----------
 src/pages/Proof/Search_Public/SearchForm.js   |  4 +--
 .../Details_Public/ApplicationDetailCard.js   |  6 ++--
 src/pages/User/SearchPage/UserSearchForm.js   |  2 +-
 .../UserSearchForm_Individual.js              |  2 +-
 5 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/pages/Proof/Search_Public/DataGrid.js b/src/pages/Proof/Search_Public/DataGrid.js
index 96c2f33..76ffefc 100644
--- a/src/pages/Proof/Search_Public/DataGrid.js
+++ b/src/pages/Proof/Search_Public/DataGrid.js
@@ -37,7 +37,8 @@ export default function SearchPublicNoticeTable({ recordList }) {
         navigate('/proof/reply/' + params.row.id);
     };
 
-    const getGroupTitle = (title) => {
+    /*eslint no-irregular-whitespace: ["error", { "skipComments": true }]*/
+    /*const getGroupTitle = (title) => {
         switch (title) {
             case 'Private Bill':
                 return "私人帳單"; 
@@ -52,9 +53,8 @@ export default function SearchPublicNoticeTable({ recordList }) {
             default:
                 return title;
         }
-    }
-
-
+    }*/
+    
     const columns = [
         {
             field: 'actions',
@@ -68,17 +68,17 @@ export default function SearchPublicNoticeTable({ recordList }) {
         {
             id: 'appId',
             field: 'appId',
-            headerName: '申請編號 / 憲報編號 / 憲報期數',
+            headerName: '申請編號 / 憲報期數',
             flex: 1,
             renderCell: (params) => {
                 let appNo = params.row.appNo;
-                let code = params.row.groupNo;
+                // let code = params.row.groupNo;
                 let isssue = 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 <div style={{ margin: 4 }}>{appNo}<br />{code}<br />{isssue}</div>
+                return <div style={{ margin: 4 }}>{appNo}<br />{isssue}</div>
             },
         },
         {
@@ -110,15 +110,15 @@ export default function SearchPublicNoticeTable({ recordList }) {
                 return params?.value ? DateUtils.datetimeStr(params?.value) : "";
             }
         },
-        {
-            id: 'groupTitle',
-            field: 'groupTitle',
-            headerName: '憲報類型',
-            flex: 1,
-            valueGetter: (params) => {
-                return getGroupTitle(params?.value);
-            }
-        },
+        // {
+        //     id: 'groupTitle',
+        //     field: 'groupTitle',
+        //     headerName: '憲報類型',
+        //     flex: 1,
+        //     valueGetter: (params) => {
+        //         return getGroupTitle(params?.value);
+        //     }
+        // },
         {
             id: 'fee',
             field: 'fee',
@@ -147,9 +147,9 @@ export default function SearchPublicNoticeTable({ recordList }) {
                         paginationModel: { page: 0, pageSize: 10 },
                     },
                 }}
-                getRowHeight={()=>"auto"}
+                getRowHeight={() => "auto"}
                 onRowDoubleClick={handleRowDoubleClick}
             />
         </div>
     );
-}
+}
\ No newline at end of file
diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js
index 422cfca..412f291 100644
--- a/src/pages/Proof/Search_Public/SearchForm.js
+++ b/src/pages/Proof/Search_Public/SearchForm.js
@@ -154,7 +154,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
                         />
                     </Grid>
 
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                    {/* <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
                         <Autocomplete
                             {...register("gazettGroup")}
                             disablePortal
@@ -175,7 +175,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
                                 />
                             )}
                         />
-                    </Grid>
+                    </Grid> */}
 
                     <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
                         <TextField
diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
index 7bd2750..8d765ab 100644
--- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
@@ -480,7 +480,7 @@ const ApplicationDetailCard = (
                                                 </Grid>
                                                 <Grid item xs={12} md={9} lg={9} sx={{ display: 'flex', alignItems: 'center' }}>
                                                     <Grid container direction="row" justifyContent="flex-start">
-                                                        <Grid item xs={12} md={5} lg={5} sx={{ display: 'flex', alignItems: 'center' }}>
+                                                        <Grid item xs={12} md={8} lg={8} sx={{ display: 'flex', alignItems: 'center' }}>
                                                             <FormControl variant="outlined" fullWidth  >
                                                                 <Typography
                                                                     fullWidth
@@ -491,11 +491,13 @@ const ApplicationDetailCard = (
                                                                 </Typography>
                                                             </FormControl>
                                                         </Grid>
-                                                        <Grid item md={2} lg={2}>
+                                                        <Grid item md={4} lg={4}>
                                                             <Button
                                                                 size="small"
                                                                 variant="contained"
                                                                 onClick={onDownloadClick()}
+                                                                title="下載"
+                                                                style={{display:"flex-right"}}
                                                                 sx={{
                                                                     textTransform: 'capitalize',
                                                                     alignItems: 'end',
diff --git a/src/pages/User/SearchPage/UserSearchForm.js b/src/pages/User/SearchPage/UserSearchForm.js
index c393d05..a2949d7 100644
--- a/src/pages/User/SearchPage/UserSearchForm.js
+++ b/src/pages/User/SearchPage/UserSearchForm.js
@@ -41,7 +41,7 @@ const UserSearchForm = ({ applySearch }) => {
 
         const temp = {
             username: data.userName,
-            fullenName: data.fullenName,
+            enName: data.fullenName,
             post: data.post,
             email: data.email,
             phone: data.phone,
diff --git a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js
index b7b1de2..28a9ceb 100644
--- a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js
+++ b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js
@@ -29,7 +29,7 @@ const UserSearchForm_Individual = ({ applySearch }) => {
 
         const temp = {
             username: data.userName,
-            fullenName: data.fullenName,
+            fullName: data.fullenName,
             email: data.email,
             phone: data.phone,
             accountFilter: accountFilter,