update combo layout and field update

src/auth/utils.js

@@ -132,6 +132,13 @@ export const getPaymentMethod = (paymentMethod) => {
   return "other";
 }
 
+export const getPaymentMethodGLD = (paymentMethod) => {
+  if (paymentMethod == "online") return 'Online';
+  if (paymentMethod == "demandNote") return 'Demand Note';
+  if (paymentMethod == "office") return 'NPGO Collection Office';
+  return "other";
+}
+
 export const getSearchCriteria = (path) =>{
   let searchCriteria = ""
   if (localStorage.getItem('searchCriteria')==""){
@@ -155,4 +162,12 @@ export const checkSearchCriteriaPath = (path) =>{
             }
           }
   }
-}
+}
+
+export const getPaymentMethodByCode = (code) => {
+  if (code === "01,PPSB,PPS") return "PPS";
+  if (code === "02,BCMP,CreditCard" || code === "03,BCMP,CreditCard") return "CreditCard";
+  if (code === "04,BCFP,FPS") return "FPS";
+  return "other";
+};
+

src/pages/DemandNote/Create/SearchForm.js

@@ -173,6 +173,11 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
                                     setIssueSelected(newValue);
                                 }
                             }}
+                            sx={{
+                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                '& .MuiOutlinedInput-root': { height: 40 }
+                            }}
                             renderInput={(params) => (
                                 <TextField {...params}
                                     label="Gazette Issue"

src/pages/DemandNote/Export/SearchForm.js

@@ -174,6 +174,11 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => {
                                     setIssueSelected(newValue);
                                 }
                             }}
+                            sx={{
+                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                '& .MuiOutlinedInput-root': { height: 40 }
+                            }}
                             renderInput={(params) => (
                                 <TextField {...params}
                                     label="Gazette Issue"

src/pages/DemandNote/Search/SearchForm.js

@@ -211,6 +211,11 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                 onChange={(event, newValue) => {
                                     setIssueSelected(newValue);
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Gazette Issue No."
@@ -256,6 +261,11 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                                 setOrgSelected({});
                                             }
                                         }}
+                                        sx={{
+                                            '& .MuiInputBase-root': { alignItems: 'center' },
+                                            '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                            '& .MuiOutlinedInput-root': { height: 40 }
+                                        }}
                                         renderInput={(params) => (
                                             <TextField {...params}
                                                 label="Organisation"
@@ -420,6 +430,11 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                         setSelectedStatus(newValue);
                                     }
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 getOptionLabel={(option) => option.label}
                                 renderInput={(params) => (
                                     <TextField

src/pages/DemandNote/Search_Public/SearchForm.js

@@ -167,6 +167,11 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData, onG
                                         setIssueSelected(newValue);
                                     }
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label={intl.formatMessage({ id: 'gazetteCount' })}
@@ -274,6 +279,11 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData, onG
                                         setSelectedStatus(newValue);
                                     }
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField
                                         {...params}

src/pages/GFMIS/SearchForm.js

@@ -180,6 +180,11 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria, onGr
                                             setPayMethod(newValue);
                                         }
                                     }}
+                                    sx={{
+                                        '& .MuiInputBase-root': { alignItems: 'center' },
+                                        '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                        '& .MuiOutlinedInput-root': { height: 40 }
+                                    }}
                                     renderInput={(params) => (
                                         <TextField {...params}
                                             label="Payment Means"

src/pages/GazetteIssue/ExportForm.js

@@ -81,9 +81,9 @@ const SearchGazetteIssueForm = ({ applyExport, comboData, waitDownload}) => {
                                 setSelectedYear(newValue);
                             }}
                             sx={{
-                                "& .MuiInputBase-root": { height: "41px" },
-                                "#year-combo": { padding: "0px 0px 0px 0px" },
-                                "& .MuiAutocomplete-endAdornment": { top: "auto" },
+                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                '& .MuiOutlinedInput-root': { height: 40 }
                             }}
                             renderInput={(params) => <TextField {...params} placeholder={""}/>}
                         />

src/pages/GazetteIssue/SearchForm.js

@@ -79,9 +79,9 @@ const SearchGazetteIssueForm = ({ applySearch, comboData, onGridReady}) => {
                                 setSelectedYear(newValue);
                             }}
                             sx={{
-                                "& .MuiInputBase-root": { height: "41px" },
-                                "#year-combo": { padding: "0px 0px 0px 0px" },
-                                "& .MuiAutocomplete-endAdornment": { top: "auto" },
+                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                '& .MuiOutlinedInput-root': { height: 40 }
                             }}
                             renderInput={(params) => <TextField {...params} placeholder={""}/>}
                         />

src/pages/GazetteIssue/index.js

@@ -1,4 +1,3 @@
-// material-ui
 import {
     Grid,
     Typography,
@@ -16,7 +15,7 @@ import MainCard from 'components/MainCard';
 
 const ExportForm = Loadable(React.lazy(() => import('./ExportForm')));
 const SearchForm = Loadable(React.lazy(() => import('./SearchForm')));
-const GazetteIssueTable = Loadable(React.lazy(() => import('./DataGrid')))
+const GazetteIssueTable = Loadable(React.lazy(() => import('./DataGrid')));
 
 const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
@@ -26,9 +25,9 @@ const BackgroundHead = {
     backgroundRepeat: 'no-repeat',
     backgroundColor: '#0C489E',
     backgroundPosition: 'right'
-}
-import {PNSPS_LONG_BUTTON_THEME} from "themes/buttonConst";
-import {ThemeProvider} from "@emotion/react";
+};
+import { PNSPS_LONG_BUTTON_THEME } from "themes/buttonConst";
+import { ThemeProvider } from "@emotion/react";
 import { dateStr_Year } from "utils/DateUtils";
 import { notifySaveSuccess } from 'utils/CommonFunction';
 import { isGrantedAny } from "auth/utils";
@@ -40,19 +39,12 @@ const Index = () => {
     const [holidayComboData, setHolidayComboData] = React.useState([]);
     const [onReady, setOnReady] = React.useState(false);
     const [onGridReady, setGridOnReady] = React.useState(false);
-
     const [onSearchReady, setOnSearchReady] = React.useState(false);
     const [onExportReady, setOnExportReady] = React.useState(false);
     const [searchCriteria, setSearchCriteria] = React.useState({
         year: dateStr_Year(new Date()),
-        // dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
     });
-    
-    const [exportCriteria, setExportCriteria] = React.useState({
-        // year: dateStr_Year(new Date()),
-        // dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
-    });
-
+    const [exportCriteria, setExportCriteria] = React.useState({});
     const [attachments, setAttachments] = React.useState([]);
     const [waitImport, setWaitImport] = React.useState(false);
     const [waitDownload, setWaitDownload] = React.useState(false);
@@ -60,11 +52,9 @@ const Index = () => {
     const [warningText, setWarningText] = React.useState("");
 
     React.useEffect(() => {
-        // console.log(searchCriteria)
-        setOnSearchReady(false)
+        setOnSearchReady(false);
         loadCombo();
     }, [searchCriteria]);
-    
 
     function loadCombo() {
         HttpUtils.get({
@@ -72,9 +62,8 @@ const Index = () => {
             onSuccess: (responseData) => {
                 let combo = responseData;
                 setComboData(combo);
-                setOnSearchReady(true)
-                loadHolidayCombo(true)
-                // setOnReady(true);
+                setOnSearchReady(true);
+                loadHolidayCombo(true);
             }
         });
     }
@@ -83,19 +72,19 @@ const Index = () => {
         HttpUtils.get({
             url: UrlUtils.GET_HOLIDAY_COMBO,
             onSuccess: (responseData) => {
-                let combo = responseData
-                setHolidayComboData(combo)
-                setOnExportReady(true)
-                setOnReady(true)
+                let combo = responseData;
+                setHolidayComboData(combo);
+                setOnExportReady(true);
+                setOnReady(true);
             }
         });
     }
 
     function applySearch(input) {
-        setGridOnReady(true)
+        setGridOnReady(true);
         setSearchCriteria(input);
     }
-    
+
     function applyExport(input) {
         setExportCriteria(input);
     }
@@ -105,8 +94,7 @@ const Index = () => {
     }
 
     React.useEffect(() => {
-        if (Object.keys(exportCriteria).length  > 0) {
-            // console.log(exportCriteria)
+        if (Object.keys(exportCriteria).length > 0) {
             doExport();
         }
     }, [exportCriteria]);
@@ -120,51 +108,47 @@ const Index = () => {
     const readFile = (event) => {
         let file = event.target.files[0];
         if (file) {
-            if (!file.name.toLowerCase().substr(file.name.length - 5).includes(".xlsx")) {
+            if (!file.name.toLowerCase().endsWith(".xlsx")) {
                 setWarningText("Please upload a valid file (File format: .xlsx).");
                 setIsWarningPopUp(true);
-                document.getElementById("uploadFileBtn").value = "";
+                event.target.value = "";
                 return;
             }
             file['id'] = attachments.length;
-            setAttachments([
-                ...attachments,
-                file
-            ]);
-            document.getElementById("uploadFileBtn").value = "";
+            setAttachments([...attachments, file]);
+            event.target.value = "";
         }
-    }
+    };
 
-    const doExport=()=>{
-        setWaitDownload(true)
+    const doExport = () => {
+        setWaitDownload(true);
         HttpUtils.fileDownload({
             url: UrlUtils.GET_ISSUE_LIST,
             params: exportCriteria,
             onResponse: () => {
-                setTimeout(()=> setWaitDownload(false), 500)
+                setTimeout(() => setWaitDownload(false), 500);
             }
         });
-    }
+    };
 
     const importHoliday = () => {
         setWaitImport(true);
         if (!attachments || attachments.length <= 0) {
             setWarningText("Please upload file.");
-            setSaving(false);
+            setWaitImport(false);
             return;
         }
         HttpUtils.postWithFiles({
             url: UrlUtils.POST_ISSUE_FILE,
             files: attachments,
             onSuccess: () => {
-                notifySaveSuccess()
+                notifySaveSuccess();
                 setWaitImport(false);
                 setAttachments([]);
                 loadCombo();
-                loadForm();
             }
         });
-    }
+    };
 
     return (
         !onReady ?
@@ -175,7 +159,7 @@ const Index = () => {
             </Grid>
             :
             (
-                <Grid container sx={{minHeight: '87vh', backgroundColor: 'backgroundColor.default'}} direction="column" justifyContent="flex-start" alignItems="center" >
+                <Grid container sx={{ minHeight: '87vh', backgroundColor: 'backgroundColor.default' }} direction="column" justifyContent="flex-start" alignItems="center">
                     <Grid item xs={12} width="100%">
                         <div style={BackgroundHead} width="100%">
                             <Stack direction="row" height='70px'>
@@ -183,63 +167,56 @@ const Index = () => {
                             </Stack>
                         </div>
                     </Grid>
-                    {!onExportReady?
-                        <LoadingComponent />:
+
+                    {!onExportReady ?
+                        <LoadingComponent /> :
                         <Grid item xs={12} md={12} lg={12} width="100%">
-                            <ExportForm 
+                            <ExportForm
                                 applyExport={applyExport}
                                 comboData={holidayComboData}
                                 waitDownload={waitDownload}
                             />
                         </Grid>
                     }
-                    {isGrantedAny(["MAINTAIN_GAZETTE_ISSUE"]) ?
+
+                    {isGrantedAny(["MAINTAIN_GAZETTE_ISSUE"]) &&
                         <Grid item xs={12} md={12} lg={6} width="100%">
-                            <Stack direction="row" justifyContent="flex-start" alignItems="center" spacing={2} sx={{ml:2,mt:1}} >
+                            <Stack direction="row" justifyContent="flex-start" alignItems="center" spacing={2} sx={{ ml: 2, mt: 1 }}>
                                 <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
-                                    <input
-                                        id="uploadFileBtn"
-                                        name="file"
-                                        type="file"
-                                        accept=".xlsx"
-                                        style={{ display: 'none' }}
+                                    <Button
+                                        component="label"
+                                        variant="contained"
+                                        size="large"
                                         disabled={waitImport}
-                                        onChange={(event) => {
-                                            readFile(event)
-                                        }}
-                                    />
-                                    <label htmlFor="uploadFileBtn">
-                                        <Button
-                                            component="span"
-                                            variant="contained"
-                                            size="large"
+                                    >
+                                        <Typography variant="h5">Upload Files</Typography>
+                                        <input
+                                            type="file"
+                                            accept=".xlsx"
+                                            hidden
                                             disabled={waitImport}
-                                        >
-                                            <Typography variant="h5">Upload Files</Typography>
-                                        </Button>
-                                    </label>
+                                            onChange={readFile}
+                                        />
+                                    </Button>
                                 </ThemeProvider>
-                                
                             </Stack>
                         </Grid>
-                        :null
                     }
-                    {/*row 1*/}
+
+                    {/* Row 1 */}
                     <Grid item xs={12} md={12} lg={12} width="100%">
-                        <SearchForm 
+                        <SearchForm
                             applySearch={applySearch}
                             comboData={comboData}
                             onGridReady={onGridReady}
                         />
                     </Grid>
-                    {/*row 2*/}
-                    {!onSearchReady?
-                        <LoadingComponent/>:
+
+                    {/* Row 2 */}
+                    {!onSearchReady ?
+                        <LoadingComponent /> :
                         <Grid item xs={12} md={12} lg={12} width="100%">
-                            <MainCard elevation={0}
-                                border={false}
-                                content={false}
-                            >
+                            <MainCard elevation={0} border={false} content={false}>
                                 <GazetteIssueTable
                                     searchCriteria={searchCriteria}
                                     applyGridOnReady={applyGridOnReady}
@@ -247,30 +224,33 @@ const Index = () => {
                             </MainCard>
                         </Grid>
                     }
-                    <div>
-                        <Dialog
-                            open={isWarningPopUp}
-                            onClose={() => setIsWarningPopUp(false)}
-                            PaperProps={{
-                                sx: {
-                                    minWidth: '40vw',
-                                    maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
-                                    maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
-                                }
-                            }}
-                        >
-                            <DialogTitle><Typography variant="h3">Warning</Typography></DialogTitle>
-                            <DialogContent style={{ display: 'flex', }}>
-                                <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>
-                            </DialogContent>
-                            <DialogActions>
-                                <Button onClick={() => setIsWarningPopUp(false)}><Typography variant="h5">OK</Typography></Button>
-                            </DialogActions>
-                        </Dialog>
-                    </div>
-                </Grid >
+
+                    <Dialog
+                        open={isWarningPopUp}
+                        onClose={() => setIsWarningPopUp(false)}
+                        PaperProps={{
+                            sx: {
+                                minWidth: '40vw',
+                                maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                                maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                            }
+                        }}
+                    >
+                        <DialogTitle>
+                            <Typography variant="h3">Warning</Typography>
+                        </DialogTitle>
+                        <DialogContent style={{ display: 'flex' }}>
+                            <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>
+                        </DialogContent>
+                        <DialogActions>
+                            <Button onClick={() => setIsWarningPopUp(false)}>
+                                <Typography variant="h5">OK</Typography>
+                            </Button>
+                        </DialogActions>
+                    </Dialog>
+                </Grid>
             )
     );
 };
 
-export default Index;
+export default Index;

src/pages/Holiday/SearchForm.js

@@ -79,9 +79,9 @@ const SearchHolidayForm = ({ applySearch, comboData, onGridReady}) => {
                                 setSelectedYear(newValue);
                             }}
                             sx={{
-                                "& .MuiInputBase-root": { height: "41px" },
-                                "#year-combo": { padding: "0px 0px 0px 0px" },
-                                "& .MuiAutocomplete-endAdornment": { top: "auto" },
+                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                '& .MuiOutlinedInput-root': { height: 40 }
                             }}
                             renderInput={(params) => <TextField {...params} placeholder={""}/>}
                         />

src/pages/Holiday/index.js

@@ -1,4 +1,3 @@
-// material-ui
 import {
     Grid,
     Typography,
@@ -12,9 +11,8 @@ import * as HttpUtils from "utils/HttpUtils";
 
 import Loadable from 'components/Loadable';
 const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));
-const HolidayTable = Loadable(React.lazy(() => import('pages/Holiday/DataGrid')))
-import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
-// import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline';
+const HolidayTable = Loadable(React.lazy(() => import('pages/Holiday/DataGrid')));
+import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png';
 import MainCard from 'components/MainCard';
 const SearchForm = Loadable(React.lazy(() => import('./SearchForm')));
 
@@ -26,10 +24,10 @@ const BackgroundHead = {
     backgroundRepeat: 'no-repeat',
     backgroundColor: '#0C489E',
     backgroundPosition: 'right'
-}
-// import { useNavigate } from "react-router";
-import {PNSPS_LONG_BUTTON_THEME} from "themes/buttonConst";
-import {ThemeProvider} from "@emotion/react";
+};
+
+import { PNSPS_LONG_BUTTON_THEME } from "themes/buttonConst";
+import { ThemeProvider } from "@emotion/react";
 import { dateStr_Year } from "utils/DateUtils";
 import { notifySaveSuccess } from 'utils/CommonFunction';
 import { isGrantedAny } from "auth/utils";
@@ -44,10 +42,8 @@ const Index = () => {
     const [onSearchReady, setOnSearchReady] = React.useState(false);
     const [onGridReady, setGridOnReady] = React.useState(false);
 
-    // const navigate = useNavigate()
     const [searchCriteria, setSearchCriteria] = React.useState({
         year: dateStr_Year(new Date()),
-        // dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
     });
     const [attachments, setAttachments] = React.useState([]);
     const [waitImport, setWaitImport] = React.useState(false);
@@ -55,33 +51,21 @@ const Index = () => {
     const [isWarningPopUp, setIsWarningPopUp] = React.useState(false);
     const [warningText, setWarningText] = React.useState("");
 
-    // React.useLayoutEffect(() => {
-    //     loadForm();
-    // }, []);
-
-    // React.useLayoutEffect(() => {
-    //     if (comboData) {
-    //         setOnReady(true);
-    //     }
-    // }, [comboData]);
-
     React.useEffect(() => {
-        // console.log(searchCriteria)
-        setOnSearchReady(false)
+        setOnSearchReady(false);
         loadForm();
     }, [searchCriteria]);
-    
+
     function loadForm() {
         HttpUtils.get({
             url: UrlUtils.GET_HOLIDAY,
             params: searchCriteria,
             onSuccess: (responseData) => {
-                // console.log(responseData)
                 setRecord(responseData);
-                if (comboData.length == 0) {
+                if (comboData.length === 0) {
                     loadCombo();
-                }else{
-                    setOnSearchReady(true)
+                } else {
+                    setOnSearchReady(true);
                 }
             }
         });
@@ -94,13 +78,13 @@ const Index = () => {
                 let combo = responseData;
                 setComboData(combo);
                 setOnReady(true);
-                setOnSearchReady(true)
+                setOnSearchReady(true);
             }
         });
     }
 
     function applySearch(input) {
-        setGridOnReady(true)
+        setGridOnReady(true);
         setSearchCriteria(input);
     }
 
@@ -115,52 +99,51 @@ const Index = () => {
     }, [attachments]);
 
     const readFile = (event) => {
-        let file = event.target.files[0];
+        let file = event.target.files && event.target.files[0];
         if (file) {
-            if (!file.name.toLowerCase().substr(file.name.length - 5).includes(".xlsx")) {
+            if (!file.name.toLowerCase().endsWith(".xlsx")) {
                 setWarningText("Please upload a valid file (File format: .xlsx).");
                 setIsWarningPopUp(true);
-                document.getElementById("uploadFileBtn").value = "";
+                // clear the input value
+                event.target.value = "";
                 return;
             }
             file['id'] = attachments.length;
-            setAttachments([
-                ...attachments,
-                file
-            ]);
-            document.getElementById("uploadFileBtn").value = "";
+            setAttachments(prev => [...prev, file]);
+            // clear the input value
+            event.target.value = "";
         }
-    }
+    };
 
-    const doExport=()=>{
-        setWaitDownload(true)
+    const doExport = () => {
+        setWaitDownload(true);
         HttpUtils.fileDownload({
             url: UrlUtils.GET_HOLIDAY_TEMPLATE,
             onResponse: () => {
-                setTimeout(()=> setWaitDownload(false), 500)
+                setTimeout(() => setWaitDownload(false), 500);
             }
         });
-    }
+    };
 
     const importHoliday = () => {
         setWaitImport(true);
         setOnSearchReady(false);
         if (!attachments || attachments.length <= 0) {
             setWarningText("Please upload file.");
-            setSaving(false);
+            setWaitImport(false);
             return;
         }
         HttpUtils.postWithFiles({
             url: UrlUtils.POST_HOLIDAY,
             files: attachments,
             onSuccess: () => {
-                notifySaveSuccess()
+                notifySaveSuccess();
                 setWaitImport(false);
                 setAttachments([]);
                 loadForm();
             }
         });
-    }
+    };
 
     return (
         !onReady ?
@@ -171,7 +154,7 @@ const Index = () => {
             </Grid>
             :
             (
-                <Grid container sx={{minHeight: '87vh', backgroundColor: 'backgroundColor.default'}} direction="column" justifyContent="flex-start" alignItems="center" >
+                <Grid container sx={{ minHeight: '87vh', backgroundColor: 'backgroundColor.default' }} direction="column" justifyContent="flex-start" alignItems="center" >
                     <Grid item xs={12} width="100%">
                         <div style={BackgroundHead} width="100%">
                             <Stack direction="row" height='70px'>
@@ -179,69 +162,60 @@ const Index = () => {
                             </Stack>
                         </div>
                     </Grid>
+
                     <Grid item xs={12} md={12} lg={6} width="100%">
-                        <Stack direction="row" justifyContent="flex-start" alignItems="center" spacing={2} sx={{ml:2,mt:1}} >
-                        
+                        <Stack direction="row" justifyContent="flex-start" alignItems="center" spacing={2} sx={{ ml: 2, mt: 1 }} >
+
                             <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
-                                <label htmlFor="downloadFileBtn">
-                                    <Button
-                                        component="span"
-                                        variant="contained"
-                                        size="large"
-                                        disabled={waitDownload}
-                                        onClick={doExport}
-                                    >
-                                        <Typography variant="h5">Export</Typography>
-                                    </Button>
-                                </label>
+                                <Button
+                                    variant="contained"
+                                    size="large"
+                                    disabled={waitDownload}
+                                    onClick={doExport}
+                                >
+                                    <Typography variant="h5">Export</Typography>
+                                </Button>
                             </ThemeProvider>
+
                             {isGrantedAny(["MAINTAIN_GAZETTE_ISSUE"]) ?
                                 <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
-                                    <input
-                                        id="uploadFileBtn"
-                                        name="file"
-                                        type="file"
-                                        accept=".xlsx"
-                                        style={{ display: 'none' }}
+                                    <Button
+                                        component="label"
+                                        variant="contained"
+                                        size="large"
                                         disabled={waitImport}
-                                        onChange={(event) => {
-                                            readFile(event)
-                                        }}
-                                    />
-                                    <label htmlFor="uploadFileBtn">
-                                        <Button
-                                            component="span"
-                                            variant="contained"
-                                            size="large"
+                                    >
+                                        <Typography variant="h5">Upload Files</Typography>
+                                        <input
+                                            name="file"
+                                            type="file"
+                                            accept=".xlsx"
+                                            hidden
                                             disabled={waitImport}
-                                        >
-                                            <Typography variant="h5">Upload Files</Typography>
-                                        </Button>
-                                    </label>
+                                            onChange={readFile}
+                                        />
+                                    </Button>
                                 </ThemeProvider>
-                                :null
+                                : null
                             }
                         </Stack>
                     </Grid>
 
-                    {/*row 1*/}
+                    {/* row 1 */}
                     <Grid item xs={12} md={12} lg={12} width="100%">
-                        <SearchForm 
+                        <SearchForm
                             applySearch={applySearch}
-                            // generateXML={generateXML}
                             searchCriteria={searchCriteria}
                             comboData={comboData}
                             onGridReady={onGridReady}
                         />
                     </Grid>
-                    {/*row 2*/}
-                    {!onSearchReady?
-                        <LoadingComponent/>:
+
+                    {/* row 2 */}
+                    {!onSearchReady ?
+                        <LoadingComponent /> :
                         <Grid item xs={12} md={12} lg={12} width="100%">
-                            <MainCard elevation={0}
-                                border={false}
-                                content={false}
-                            >
+                            <MainCard elevation={0} border={false} content={false}>
                                 <HolidayTable
                                     recordList={record}
                                     applyGridOnReady={applyGridOnReady}
@@ -249,30 +223,29 @@ const Index = () => {
                             </MainCard>
                         </Grid>
                     }
-                    <div>
-                        <Dialog
-                            open={isWarningPopUp}
-                            onClose={() => setIsWarningPopUp(false)}
-                            PaperProps={{
-                                sx: {
-                                    minWidth: '40vw',
-                                    maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
-                                    maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
-                                }
-                            }}
-                        >
-                            <DialogTitle><Typography variant="h3">Warning</Typography></DialogTitle>
-                            <DialogContent style={{ display: 'flex', }}>
-                                <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>
-                            </DialogContent>
-                            <DialogActions>
-                                <Button onClick={() => setIsWarningPopUp(false)}><Typography variant="h5">OK</Typography></Button>
-                            </DialogActions>
-                        </Dialog>
-                    </div>
+
+                    <Dialog
+                        open={isWarningPopUp}
+                        onClose={() => setIsWarningPopUp(false)}
+                        PaperProps={{
+                            sx: {
+                                minWidth: '40vw',
+                                maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                                maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                            }
+                        }}
+                    >
+                        <DialogTitle><Typography variant="h3">Warning</Typography></DialogTitle>
+                        <DialogContent style={{ display: 'flex' }}>
+                            <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>
+                        </DialogContent>
+                        <DialogActions>
+                            <Button onClick={() => setIsWarningPopUp(false)}><Typography variant="h5">OK</Typography></Button>
+                        </DialogActions>
+                    </Dialog>
                 </Grid >
             )
     );
 };
 
-export default Index;
+export default Index;

src/pages/Organization/SearchPage/OrganizationSearchForm.js

@@ -149,6 +149,11 @@ const OrganizationSearchForm = ({ applySearch, onGridReady, searchCriteria }) =>
                                         }
                                         
                                     }}
+                                    sx={{
+                                        '& .MuiInputBase-root': { alignItems: 'center' },
+                                        '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                        '& .MuiOutlinedInput-root': { height: 40 }
+                                    }}
                                     getOptionLabel={(option) => option.label}
                                     renderInput={(params) => (
                                         <TextField

src/pages/Payment/Search_GLD/DataGrid.js

@@ -8,6 +8,8 @@ import * as PaymentStatus from "utils/statusUtils/PaymentStatus"
 import { useNavigate } from "react-router-dom";
 import { FiDataGrid } from "components/FiDataGrid";
 import { clickableLink } from 'utils/CommonFunction';
+import { getPaymentMethodByCode} from "auth/utils";
+
 import {
     Checkbox,
     Dialog, DialogTitle, DialogContent, DialogActions,
@@ -99,7 +101,7 @@ export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, a
             flex: 1,
             width: 150,
             renderCell: (params) => {
-                return params?.value
+                return getPaymentMethodByCode(params?.value)
             }
         },
         {

src/pages/Payment/Search_GLD/SearchForm.js

@@ -204,6 +204,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
                                         setStatus(newValue);
                                     }
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Status"
@@ -233,6 +238,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
                                         setPayMethod(newValue);
                                     }
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Payment Means"

src/pages/Payment/Search_Public/SearchForm.js

@@ -200,6 +200,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
                                     setStatus(ComboData.paymentStatus[0]);
                                 }
                             }}
+                            sx={{
+                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                '& .MuiOutlinedInput-root': { height: 40 }
+                            }}
                             renderInput={(params) => (
                                 <TextField {...params}
                                     label={intl.formatMessage({id: 'status'})}

src/pages/Proof/Create_FromApp/ProofForm.js

@@ -1,4 +1,3 @@
-// material-ui
 import {
     Dialog, DialogTitle, DialogContent, DialogActions,
     Typography,
@@ -180,17 +179,18 @@ const FormPanel = ({ formData }) => {
     });
 
     const readFile = (event) => {
-        let file = event.target.files[0];
+        let file = event.target.files && event.target.files[0];
         if (file) {
             if (!file.name.toLowerCase().substr(file.name.length - 4).includes(".pdf")) {
                 setWarningText("Please upload a valid file (File format: .pdf).");
                 setIsWarningPopUp(true);
-                document.getElementById("uploadFileBtn").value = "";
+                event.target.value = "";
                 return;
             }
             if (file.size >= (10 * 1024 * 1034)) {
                 setWarningText("The file size for uploading should be less than 10MB");
                 setIsWarningPopUp(true);
+                event.target.value = "";
                 return;
             }
             file['id'] = attachments.length;
@@ -198,10 +198,12 @@ const FormPanel = ({ formData }) => {
                 ...attachments,
                 file
             ]);
-            document.getElementById("uploadFileBtn").value = "";
+            event.target.value = "";
         }
     }
 
+    const maxUploadsForType = (groupType) => (groupType === "Private Bill" ? 2 : 1);
+
     return (
         <MainCard xs={12} md={12} lg={12}
             border={false}
@@ -275,27 +277,22 @@ const FormPanel = ({ formData }) => {
                     </Grid>
 
                     <Grid item xs={12} md={12}>
-                        <input
-                            id="uploadFileBtn"
-                            name="file"
-                            type="file"
-                            accept=".pdf"
-                            style={{ display: 'none' }}
-                            disabled={attachments.length >= (formik.values.groupType == "Private Bill" ? 2 : 1)}
-                            onChange={(event) => {
-                                readFile(event)
-                            }}
-                        />
-                        <label htmlFor="uploadFileBtn">
-                            <Button
-                                component="span"
-                                variant="contained"
-                                size="large"
-                                disabled={attachments.length >= (formik.values.groupType == "Private Bill" ? 2 : 1)}
-                            >
-                                <Typography variant="h5">Upload Files</Typography>
-                            </Button>
-                        </label>
+                        <Button
+                            component="label"
+                            variant="contained"
+                            size="large"
+                            disabled={attachments.length >= maxUploadsForType(formik.values.groupType)}
+                        >
+                            <Typography variant="h5">Upload Files</Typography>
+                            <input
+                                name="file"
+                                type="file"
+                                accept=".pdf"
+                                hidden
+                                disabled={attachments.length >= maxUploadsForType(formik.values.groupType)}
+                                onChange={readFile}
+                            />
+                        </Button>
                     </Grid>
 
 
@@ -403,7 +400,10 @@ const FormPanel = ({ formData }) => {
 
                                     <Autocomplete
                                         sx={{
-                                            width: "15%"
+                                            width: "15%",
+                                            '& .MuiInputBase-root': { alignItems: 'center' },
+                                            '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                            '& .MuiOutlinedInput-root': { height: 40 }
                                         }}
                                         disablePortal
                                         id="price"

src/pages/Proof/Search_GLD/SearchForm.js

@@ -232,6 +232,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 onChange={(event, newValue) => {
                                     setIssueSelected(newValue);
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Gazette Issue No."
@@ -256,6 +261,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 onChange={(event, newValue) => {
                                     setGroupSelected(newValue);
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Gazette Group"
@@ -355,6 +365,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         setStatus(newValue);
                                     }
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Status"
@@ -387,6 +402,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                                 setOrgSelected({});
                                             }
                                         }}
+                                        sx={{
+                                            '& .MuiInputBase-root': { alignItems: 'center' },
+                                            '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                            '& .MuiOutlinedInput-root': { height: 40 }
+                                        }}
                                         renderInput={(params) => (
                                             <TextField {...params}
                                                 label="Organisation"

src/pages/Proof/Search_Public/SearchForm.js

@@ -210,6 +210,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData, o
                             onChange={(event, newValue) => {
                                 setIssueSelected(newValue);
                             }}
+                            sx={{
+                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                '& .MuiOutlinedInput-root': { height: 40 }
+                            }}
                             renderInput={(params) => (
                                 <TextField {...params}
                                     label={intl.formatMessage({id: 'gazetteCount'})}
@@ -335,6 +340,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData, o
                                     setStatus(ComboData.proofStatus[0]);
                                 }
                             }}
+                            sx={{
+                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                '& .MuiOutlinedInput-root': { height: 40 }
+                            }}
                             renderInput={(params) => (
                                 <TextField {...params}
                                     label={intl.formatMessage({id: 'status'})}

src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js

@@ -9,7 +9,7 @@ import {
     Stack,
     Dialog, DialogTitle, DialogContent, DialogActions, InputAdornment, Autocomplete
 } from '@mui/material';
-import { isGranted, delBugMode, getPaymentMethod} from "auth/utils";
+import { isGranted, delBugMode, getPaymentMethodGLD} from "auth/utils";
 const MainCard = Loadable(lazy(() => import('components/MainCard')));
 import { useForm } from "react-hook-form";
 import {
@@ -34,7 +34,7 @@ import DownloadIcon from '@mui/icons-material/Download';
 import ReplayIcon from '@mui/icons-material/Replay';
 import { notifyDownloadSuccess } from 'utils/CommonFunction';
 import { isGrantedAny } from "auth/utils";
-import { useIntl } from "react-intl";
+// import { useIntl } from "react-intl";
 
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 const ApplicationDetailCard = (
@@ -58,7 +58,7 @@ const ApplicationDetailCard = (
     const [mode, setMode] = useState("");
 
     const { register, handleSubmit } = useForm()
-    const intl = useIntl();
+    // const intl = useIntl();
 
     const [isWarningPopUp, setIsWarningPopUp] = useState(false);
     const [warningText, setWarningText] = useState("");
@@ -762,7 +762,7 @@ const ApplicationDetailCard = (
                                                                         id='paymentMethod'
                                                                         variant="h5"
                                                                     >
-                                                                        {currentApplicationDetailData.paymentMethod!=null?intl.formatMessage({ id: getPaymentMethod(currentApplicationDetailData.paymentMethod)}):""}
+                                                                        {currentApplicationDetailData.paymentMethod!=null?getPaymentMethodGLD(currentApplicationDetailData.paymentMethod):""}
                                                                     </Typography>
                                                                 </FormControl>
                                                             </Grid>
@@ -935,6 +935,11 @@ const ApplicationDetailCard = (
                                         onChange={(event, newValue) => {
                                             setPaymentMeans(newValue);
                                         }}
+                                        sx={{
+                                            '& .MuiInputBase-root': { alignItems: 'center' },
+                                            '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                            '& .MuiOutlinedInput-root': { height: 40 }
+                                        }}
                                         renderInput={(params) => (
                                             <TextField {...params}
                                                 label=""

src/pages/PublicNotice/Details_GLD/StatusChangeDialog.js

@@ -160,6 +160,11 @@ const StatusChangeDialog = (props) => {
                   props.setSelectedGazetteGroupInputType("");
                 }
               }}
+              sx={{
+                  '& .MuiInputBase-root': { alignItems: 'center' },
+                  '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                  '& .MuiOutlinedInput-root': { height: 40 }
+              }}
               // sx={{"& .MuiInputBase-root": { height: "41px" },"#idDocType":{padding: "0px 0px 0px 0px"}, "& .MuiAutocomplete-endAdornment": { top: "auto" },}}
               renderInput={(params) => <TextField {...params} placeholder="" />}
             />

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -393,6 +393,11 @@ export default function SubmittedTab({ setCount, url }) {
                                     // console.log(newValue)
                                     setSelectedCareOf(newValue);
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => <TextField {...params} />}
                             />
                         </Grid>

src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js

@@ -242,6 +242,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
                                     setStatus(newValue);
                                 }
                             }}
+                            sx={{
+                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                '& .MuiOutlinedInput-root': { height: 40 }
+                            }}
                             renderInput={(params) => (
                                 <TextField {...params}
                                     label={intl.formatMessage({id: 'status'})}

src/pages/PublicNotice/Search_GLD/SearchForm.js

@@ -279,6 +279,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         setSelectedStatus(newValue);
                                     }
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 getOptionLabel={(option) => option.label}
                                 renderInput={(params) => (
                                     <TextField
@@ -304,8 +309,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         size="small"
                                         value={orgSelected}
                                         getOptionLabel={(option) => option?.name ?? ""}
-                                        inputValue={inputValue}                       // 👈 controlled input text
-                                        onInputChange={(event, newInputValue) => {    // 👈 update when user types
+                                        inputValue={inputValue}                       
+                                        onInputChange={(event, newInputValue) => {   
                                             setInputValue(newInputValue);
                                         }}
                                         onChange={(event, newValue) => {
@@ -315,6 +320,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                             setOrgSelected({});
                                             }
                                         }}
+                                        sx={{
+                                            '& .MuiInputBase-root': { alignItems: 'center' },
+                                            '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                            '& .MuiOutlinedInput-root': { height: 40 }
+                                        }}
                                         renderInput={(params) => (
                                             <TextField
                                             {...params}
@@ -351,6 +361,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 onChange={(event, newValue) => {
                                         setIssueSelected(newValue);
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Gazette Issue No."
@@ -375,6 +390,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 onChange={(event, newValue) => {
                                     setGroupSelected(newValue);
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Gazette Group"
@@ -412,6 +432,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         setSelectedMode(newValue);
                                     }
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 getOptionLabel={(option) => option.label}
                                 renderInput={(params) => (
                                     <TextField

src/pages/PublicNotice/Search_Mark_As_Paid_GLD/DataGrid.js

@@ -185,7 +185,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea
         {
             id: 'demandNoteNo',
             field: 'demandNoteNo',
-            headerName: 'Demand Note No.',
+            headerName: 'Remarks',
             flex: 2,
             minWidth: 200,
             renderCell: (params) => {            

src/pages/PublicNotice/Search_Mark_As_Paid_GLD/SearchForm.js

@@ -266,38 +266,10 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         setSelectedStatus(newValue);
                                     }
                                 }}
-                                getOptionLabel={(option) => option.label}
-                                renderInput={(params) => (
-                                    <TextField
-                                        {...params}
-                                        label="Status"
-                                        InputLabelProps={{
-                                            shrink: true
-                                        }}
-                                    />
-                                )}
-                            />
-                            {/* <Autocomplete
-                                multiple
-                                {...register("status")}
-                                id="status"
-                                size="small"
-                                options={ComboData.publicNoticeStatic_GLD}
-                                value={selectedStatus}
-                                onChange={(event, newValue) => {
-                                    const findAllIndex = newValue.findIndex((ele) => {
-                                        return ele.type === "all"
-                                    })
-
-                                    if (findAllIndex > -1) {
-                                        setSelectedStatus([newValue[findAllIndex]]);
-                                        setSelectedLabelsString('all')
-                                    } else {
-                                        const selectedLabels = newValue.map(option => option.type);
-                                        const selectedLabelsString = `${selectedLabels.join(',')}`;
-                                        setSelectedStatus(newValue);
-                                        setSelectedLabelsString(selectedLabelsString);
-                                    }
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
                                 }}
                                 getOptionLabel={(option) => option.label}
                                 renderInput={(params) => (
@@ -309,7 +281,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         }}
                                     />
                                 )}
-                            /> */}
+                            />
                         </Grid>
 
                         {
@@ -325,7 +297,6 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         value={orgSelected}
                                         getOptionLabel={(option) => option.name? option.name : ""}
                                         inputValue={orgSelected ? orgSelected.name!=undefined?orgSelected.name:"" : ""}
-
                                         onChange={(event, newValue) => {
                                             if (newValue !== null) {
                                                 setOrgSelected(newValue);
@@ -333,6 +304,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                                 setOrgSelected({});
                                             }
                                         }}
+                                        sx={{
+                                            '& .MuiInputBase-root': { alignItems: 'center' },
+                                            '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                            '& .MuiOutlinedInput-root': { height: 40 }
+                                        }}
                                         renderInput={(params) => (
                                             <TextField {...params}
                                                 label="Organisation"
@@ -367,6 +343,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 onChange={(event, newValue) => {
                                         setIssueSelected(newValue);
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Gazette Issue No."

src/pages/Recon/SearchForm.js

@@ -192,6 +192,11 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, onLoad }) => {
                                         setMethod(newValue);
                                     }
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Payment Method"
@@ -219,6 +224,11 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, onLoad }) => {
                                         setStatus(newValue);
                                     }
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Payment Status"

src/pages/Report/FullListForm.js

@@ -125,6 +125,11 @@ const FullListForm = ({ searchCriteria, issueComboData}) => {
                                 onChange={(event, newValue) => {
                                         setIssueSelected(newValue);
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Gazette Issue No."

src/pages/Report/SummaryForm.js

@@ -145,6 +145,11 @@ const SummaryForm = ({ searchCriteria, issueComboData}) => {
                                 onChange={(event, newValue) => {
                                         setIssueSelected(newValue);
                                 }}
+                                sx={{
+                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                }}
                                 renderInput={(params) => (
                                     <TextField {...params}
                                         label="Gazette Issue No."

src/pages/Report/index.js

@@ -72,21 +72,28 @@ const ReportSearchPage = () => {
             </Grid>
             :
             <Grid container sx={{ minHeight: '95vh',backgroundColor: 'backgroundColor.default' }} direction="column">
-                <Grid item xs={12}>
+                <Grid item xs={12} mb={2}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
-                            <Typography ml={15} color='#FFF' variant="h4" sx={{ "textShadow": "0px 0px 25px #0C489E" }}>Announcement</Typography>
+                            <Typography ml={15} color='#FFF' variant="h4" sx={{ "textShadow": "0px 0px 25px #0C489E" }}>Report</Typography>
                         </Stack>
                     </div>
                 </Grid>
                 {/*row 1*/}
-                <Grid item xs={12} md={12} lg={12} sx={{mb: -1}}>
+                <Grid item xs={12} md={12} lg={12} sx={{mb: 2}}>
+                    <Typography variant="pnspsFormHeader" ml={2}>
+                        Gazette Notice Full List
+                    </Typography>
+                    
                     <FullListForm
                         searchCriteria={searchCriteria}
                         issueComboData={issueCombo}
                     />
                 </Grid>
                 <Grid item xs={12} md={12} lg={12} sx={{mb: -1}}>
+                    <Typography variant="pnspsFormHeader" ml={2}>
+                        Summary of Gazette Notice
+                    </Typography>
                     <SummaryForm
                         searchCriteria={searchCriteria}
                         issueComboData={issueCombo}

src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js

@@ -147,6 +147,11 @@ const UserSearchForm_Individual = ({ applySearch, onGridReady, searchCriteria })
                                     setAccountFilter("All");
                                 }
                             }}
+                            sx={{
+                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                '& .MuiOutlinedInput-root': { height: 40 }
+                            }}
                             renderInput={(params) => (
                                 <TextField {...params}
                                     label="Status"

src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js

@@ -119,6 +119,11 @@ const UserSearchForm_Organization = ({applySearch, orgComboData, onGridReady, se
                                                 setOrgSelected({});
                                             }
                                         }}
+                                        sx={{
+                                            '& .MuiInputBase-root': { alignItems: 'center' },
+                                            '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                            '& .MuiOutlinedInput-root': { height: 40 }
+                                        }}
                                         renderInput={(params) => (
                                             <TextField {...params}
                                                 label="Organisation"
@@ -214,12 +219,17 @@ const UserSearchForm_Organization = ({applySearch, orgComboData, onGridReady, se
                                         options={["All", "Active","Locked","Not Verified"]}
                                         value={accountFilter}
                                         onChange={(event, newValue) => {
-                                        if (newValue !== null){
-                                            setAccountFilter(newValue);
-                                        }else{
-                                            setAccountFilter("All");
-                                        }
-                                    }}
+                                            if (newValue !== null){
+                                                setAccountFilter(newValue);
+                                            }else{
+                                                setAccountFilter("All");
+                                            }
+                                        }}
+                                        sx={{
+                                            '& .MuiInputBase-root': { alignItems: 'center' },
+                                            '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                            '& .MuiOutlinedInput-root': { height: 40 }
+                                        }}
                                         renderInput={(params) => (
                                         <TextField {...params}
                                             label="Status"

src/pages/authentication/auth-forms/BusCustomFormWizard.js

@@ -1035,9 +1035,11 @@ const BusCustomFormWizard = (props) => {
                                             onChange={(event, newValue) => {
                                                 setSelectedAddress4(newValue);
                                             }}
-                                            sx={{ "& .MuiInputBase-root": { height: "41px" },
-                                                "#address4-combo": { padding: "0px 0px 0px 3px" },
-                                                "& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
+                                            sx={{
+                                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                                '& .MuiOutlinedInput-root': { height: 40 }
+                                            }}
                                             renderInput={(params) => <TextField error={checkDistrict} {...params} placeholder={intl.formatMessage({id: 'region'})}
                                             />}
                                         />
@@ -1083,8 +1085,11 @@ const BusCustomFormWizard = (props) => {
                                                     setCheckCountry(true)
                                                 }
                                             }}
-
-                                            sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address5-combo": { padding: "0px 0px 0px 3px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
+                                            sx={{
+                                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                                '& .MuiOutlinedInput-root': { height: 40 }
+                                            }}
                                             renderInput={(params) => <TextField {...params} placeholder={intl.formatMessage({id: 'regionOrCountry'})} />}
                                         />
                                         {formik.touched.address1 && formik.errors.address1 && (

src/pages/authentication/auth-forms/CustomFormWizard.js

@@ -1101,7 +1101,11 @@ const CustomFormWizard = (props) => {
                                                             setSelectedIdDocType({});
                                                         }
                                                     }}
-                                                    sx={{ "#address4-combo": { padding: "0px 0px 0px 0px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
+                                                    sx={{
+                                                        '& .MuiInputBase-root': { alignItems: 'center' },
+                                                        '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                                        '& .MuiOutlinedInput-root': { height: 40 }
+                                                    }}
                                                     renderInput={(params) => <TextField
                                                         {...params}
                                                         error={formik.touched.idDocType && (selectedIdDocType === null || selectedIdDocType?.type == null)}
@@ -1402,9 +1406,9 @@ const CustomFormWizard = (props) => {
                                                 setSelectedAddress4(newValue);
                                             }}
                                             sx={{
-                                                "& .MuiInputBase-root": { height: "41px" },
-                                                "#address4-combo": { padding: "0px 0px 0px 3px" },
-                                                "& .MuiAutocomplete-endAdornment": { top: "auto" },
+                                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                                '& .MuiOutlinedInput-root': { height: 40 }
                                             }}
                                             renderInput={(params) => <TextField error={checkDistrict} {...params} placeholder={intl.formatMessage({ id: 'region' })}
                                             />}
@@ -1452,8 +1456,11 @@ const CustomFormWizard = (props) => {
                                                     setCheckCountry(true)
                                                 }
                                             }}
-
-                                            sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address5-combo": { padding: "0px 0px 0px 3px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
+                                            sx={{
+                                                '& .MuiInputBase-root': { alignItems: 'center' },
+                                                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                                '& .MuiOutlinedInput-root': { height: 40 }
+                                            }}
                                             renderInput={(params) => <TextField {...params} placeholder={intl.formatMessage({ id: 'regionOrCountry' })} />}
                                         />
                                         {formik.touched.address1 && formik.errors.address1 && (

src/pages/authentication/auth-forms/IAmSmartFormWizard.js

@@ -615,7 +615,11 @@ const CustomFormWizard = (props) => {
                                                 onChange={(event, newValue) => {
                                                     setSelectedAddress4(newValue);
                                                 }}
-                                                sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address4-combo": { padding: "0px 0px 0px 0px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
+                                                sx={{
+                                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                                }}
                                                 renderInput={(params) => <TextField error={checkDistrict} {...params} placeholder={intl.formatMessage({ id: 'region' })}
                                                 />}
                                             />
@@ -640,8 +644,11 @@ const CustomFormWizard = (props) => {
                                                         setCheckCountry(true)
                                                     }
                                                 }}
-    
-                                                sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address5-combo": { padding: "0px 0px 0px 0px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
+                                                sx={{
+                                                    '& .MuiInputBase-root': { alignItems: 'center' },
+                                                    '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                                    '& .MuiOutlinedInput-root': { height: 40 }
+                                                }}
                                                 renderInput={(params) => <TextField {...params} placeholder={intl.formatMessage({ id: 'regionOrCountry' })} />}
                                             />
                                             {formik.touched.address1 && formik.errors.address1 && (

src/pages/pnspsUserGroupDetailPage/UserAddCard.js

@@ -128,6 +128,11 @@ const UserAddCard = ({ isCollectData, updateGroupMember, userGroupData, isNewRec
                                             // console.log(newValue)
                                             setSelectedUser(newValue);
                                         }}
+                                        sx={{
+                                            '& .MuiInputBase-root': { alignItems: 'center' },
+                                            '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                                            '& .MuiOutlinedInput-root': { height: 40 }
+                                        }}
                                         renderInput={(params) => <TextField {...params} />}
                                     />
                                 </Grid>

src/utils/Combo.js

@@ -41,13 +41,9 @@ export default function Combo ({valueName, disabled, form, dataList, filterOptio
                 }
             }}
             sx={{
-                "& .MuiInputBase-root": { 
-                    height: "41px", 
-                    padding: "0px 0px 0px 8px" 
-                },
-                "& .MuiAutocomplete-endAdornment": { 
-                    top: "auto" 
-                },
+                '& .MuiInputBase-root': { alignItems: 'center' },
+                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                '& .MuiOutlinedInput-root': { height: 40 },
                 "& .MuiInputBase-input.Mui-disabled": {
                     WebkitTextFillColor: "#000000",
                     background: "#f8f8f8",

src/utils/SelectBase.js

@@ -40,13 +40,9 @@ export default function Combo ({valueName, disabled, form, dataList, filterOptio
                 }
             }}
             sx={{
-                "& .MuiInputBase-root": { 
-                    height: "41px", 
-                    padding: "0px 0px 0px 8px" 
-                },
-                "& .MuiAutocomplete-endAdornment": { 
-                    top: "auto" 
-                },
+                '& .MuiInputBase-root': { alignItems: 'center' },
+                '& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
+                '& .MuiOutlinedInput-root': { height: 40 },
                 "& .MuiInputBase-input.Mui-disabled": {
                     WebkitTextFillColor: "#000000",
                     background: "#f8f8f8",