From 112577e2cb52cd56b2fcf4adef2ba88157c500ed Mon Sep 17 00:00:00 2001
From: "jason.lam" <jason.lam@2fi-solutions.com.hk>
Date: Tue, 23 Jan 2024 14:59:31 +0800
Subject: [PATCH] update GLD layout

---
 src/pages/DemandNote/Create/SearchForm.js            |  1 +
 src/pages/DemandNote/Search/SearchForm.js            | 12 ++++++------
 src/pages/Payment/Search_GLD/SearchForm.js           |  1 +
 src/pages/Proof/Search_GLD/SearchForm.js             |  4 ++++
 src/pages/PublicNotice/Search_GLD/SearchForm.js      |  2 ++
 .../UserSearchForm_Individual.js                     |  1 +
 .../UserSearchForm_Organization.js                   |  1 +
 .../pnspsUserGroupSearchPage/UserGroupSearchForm.js  |  8 ++------
 src/themes/themeConst.js                             |  2 +-
 9 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/pages/DemandNote/Create/SearchForm.js b/src/pages/DemandNote/Create/SearchForm.js
index 339e8c9..740cde8 100644
--- a/src/pages/DemandNote/Create/SearchForm.js
+++ b/src/pages/DemandNote/Create/SearchForm.js
@@ -144,6 +144,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
                     <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 1 }}>
                         <Autocomplete
                             disablePortal
+                            size="small"
                             id="issueId"
                             options={issueCombo}
                             value={issueSelected}
diff --git a/src/pages/DemandNote/Search/SearchForm.js b/src/pages/DemandNote/Search/SearchForm.js
index d58283d..3a8bc4a 100644
--- a/src/pages/DemandNote/Search/SearchForm.js
+++ b/src/pages/DemandNote/Search/SearchForm.js
@@ -105,6 +105,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                 {...register("issueId")}
                                 disablePortal
                                 id="issueId"
+                                size="small"
                                 options={issueCombo}
                                 value={issueSelected}
                                 inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""}
@@ -145,6 +146,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                         {...register("orgId")}
                                         disablePortal
                                         id="orgId"
+                                        size="small"
                                         options={orgCombo}
                                         value={orgSelected}
                                         inputValue={(orgSelected?.label) ? orgSelected?.label : ""}
@@ -220,6 +222,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                         <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
                             <Autocomplete
                                 multiple
+                                size="small"
                                 {...register("status")}
                                 id="status"
                                 options={ComboData.denmandNoteStatus}
@@ -258,20 +261,17 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
 
                     {/*last row*/}
                     <Grid container maxWidth justifyContent="flex-end">
-                        <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
+                        <Grid item sx={{ ml: 3, mr: 3 }}>
                             <Button
                                 size="large"
                                 variant="contained"
                                 onClick={resetForm}
-                                sx={{
-                                    textTransform: 'capitalize',
-                                    alignItems: 'end'
-                                }}>
+                                >
                                 <Typography variant="h5">Clear</Typography>
                             </Button>
                         </Grid>
 
-                        <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
+                        <Grid item sx={{ ml: 3, mr: 3}}>
                             <Button
                                 size="large"
                                 variant="contained"
diff --git a/src/pages/Payment/Search_GLD/SearchForm.js b/src/pages/Payment/Search_GLD/SearchForm.js
index 505c814..90e0a0c 100644
--- a/src/pages/Payment/Search_GLD/SearchForm.js
+++ b/src/pages/Payment/Search_GLD/SearchForm.js
@@ -138,6 +138,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                         <Autocomplete
                             {...register("status")}
                             disablePortal={false}
+                            size="small"
                             id="status"
                             filterOptions={(options) => options}
                             options={ComboData.paymentStatus}
diff --git a/src/pages/Proof/Search_GLD/SearchForm.js b/src/pages/Proof/Search_GLD/SearchForm.js
index f364d23..b07b338 100644
--- a/src/pages/Proof/Search_GLD/SearchForm.js
+++ b/src/pages/Proof/Search_GLD/SearchForm.js
@@ -132,6 +132,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                             <Autocomplete
                                 {...register("issueId")}
                                 disablePortal
+                                size="small"
                                 id="issueId"
                                 options={issueCombo}
                                 value={issueSelected}
@@ -155,6 +156,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                             <Autocomplete
                                 {...register("gazettGroup")}
                                 disablePortal
+                                size="small"
                                 id="gazettGroup"
                                 options={ComboData.groupTitle}
                                 value={groupSelected}
@@ -229,6 +231,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 {...register("status")}
                                 disablePortal
                                 id="status"
+                                size="small"
                                 filterOptions={(options) => options}
                                 options={ComboData.proofStatus}
                                 value={status}
@@ -256,6 +259,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         {...register("orgId")}
                                         disablePortal={false}
                                         id="orgId"
+                                        size="small"
                                         options={orgCombo}
                                         value={orgSelected}
                                         inputValue={(orgSelected?.label) ? orgSelected?.label : ""}
diff --git a/src/pages/PublicNotice/Search_GLD/SearchForm.js b/src/pages/PublicNotice/Search_GLD/SearchForm.js
index b0376c6..633dd2a 100644
--- a/src/pages/PublicNotice/Search_GLD/SearchForm.js
+++ b/src/pages/PublicNotice/Search_GLD/SearchForm.js
@@ -237,6 +237,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         disablePortal
                                         id="orgId"
                                         options={orgCombo}
+                                        size="small"
                                         value={orgSelected}
                                         inputValue={(orgSelected?.label) ? orgSelected?.label : ""}
                                         onChange={(event, newValue) => {
@@ -261,6 +262,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                             <Autocomplete
                                 {...register("issueId")}
                                 disablePortal
+                                size="small"
                                 id="issueId"
                                 size="small"
                                 options={issueCombo}
diff --git a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js
index 28a9ceb..d89b152 100644
--- a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js
+++ b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js
@@ -110,6 +110,7 @@ const UserSearchForm_Individual = ({ applySearch }) => {
                             {...register("accountFilter")}
                             disablePortal
                             id="accountFilter"
+                            size="small"
                             options={["Active", "Locked", "Not verified"]}
                             value={accountFilter}
                             onChange={(event, newValue) => {
diff --git a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js
index 1e414ef..80c37cc 100644
--- a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js
+++ b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js
@@ -139,6 +139,7 @@ const UserSearchForm_Organization = ({applySearch}) => {
                                   {...register("accountFilter")}
                                     disablePortal
                                     id="accountFilter"
+                                    size="small"
                                     options={["All", "Active","Locked","Not verified"]}
                                     value={accountFilter}   
                                     onChange={(event, newValue) => {
diff --git a/src/pages/pnspsUserGroupSearchPage/UserGroupSearchForm.js b/src/pages/pnspsUserGroupSearchPage/UserGroupSearchForm.js
index 1c956ce..baa3a31 100644
--- a/src/pages/pnspsUserGroupSearchPage/UserGroupSearchForm.js
+++ b/src/pages/pnspsUserGroupSearchPage/UserGroupSearchForm.js
@@ -79,14 +79,10 @@ const UserGroupSearchForm = ({ applySearch }) => {
                 >
                     <Grid item xs={3} md={3} sx={{ ml: 3, mr: 1 }}>
                         <Button
-                            size="large"
                             variant="contained"
                             onClick={handleNewGroupClick}
-                            sx={{
-                                textTransform: 'capitalize',
-                                alignItems: 'end',
-                            }}>
-                            <AddCircleOutlineIcon sx={{ mr: 1, mb: 0.5 }} />
+                            startIcon={<AddCircleOutlineIcon sx={{alignItems:"center"}}/>}
+                            >
                             <Typography variant="h5">New Group</Typography>
                         </Button>
                     </Grid>
diff --git a/src/themes/themeConst.js b/src/themes/themeConst.js
index 7ff2665..ce35db6 100644
--- a/src/themes/themeConst.js
+++ b/src/themes/themeConst.js
@@ -77,7 +77,7 @@ export const PNSPS_THEME = createTheme({
                     },
                     '&.MuiButton-root':{
                         fontSize: '1.2rem',
-                        alignItems: 'normal',
+                        alignItems: 'center',
                     },
                 }
             }