alex
/
PNSPS-frontend-MaterialUI
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

GLD user UI update

master
Anna Ho 1 year ago
parent
e6f75c960a
commit
09f1e6430f
20 changed files with 90 additions and 105 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      src/pages/Announcement/Search/DataGrid.js
  2. +5
    -9
      src/pages/Announcement/Search/SearchForm.js
  3. +2
    -2
      src/pages/DemandNote/Search/DataGrid.js
  4. +13
    -20
      src/pages/DemandNote/Search/SearchForm.js
  5. +4
    -4
      src/pages/EmailTemplate/Search_GLD/DataGrid.js
  6. +1
    -1
      src/pages/GFMIS/DataGrid.js
  7. +4
    -1
      src/pages/GFMIS/SearchForm.js
  8. +3
    -1
      src/pages/GFMIS/index.js
  9. +1
    -1
      src/pages/Payment/Details_GLD/DataGrid.js
  10. +5
    -5
      src/pages/Payment/Details_GLD/PaymentDetails.js
  11. +11
    -11
      src/pages/Payment/Search_GLD/DataGrid.js
  12. +7
    -10
      src/pages/Payment/Search_GLD/SearchForm.js
  13. +1
    -1
      src/pages/Payment/Search_GLD/index.js
  14. +2
    -2
      src/pages/Proof/Search_GLD/DataGrid.js
  15. +9
    -11
      src/pages/Proof/Search_GLD/SearchForm.js
  16. +3
    -3
      src/pages/PublicNotice/Search_GLD/DataGrid.js
  17. +10
    -14
      src/pages/PublicNotice/Search_GLD/SearchForm.js
  18. +1
    -1
      src/pages/User/SearchPage/UserTable.js
  19. +2
    -2
      src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js
  20. +4
    -4
      src/pages/User/SearchPage_Organization/UserTable_Organization.js

+ 2
- 2
src/pages/Announcement/Search/DataGrid.js View File

@@ -25,7 +25,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
const columns = [ const columns = [
{ {
field: 'announceDate', field: 'announceDate',
headerName: 'Announce Date',
headerName: 'Announcement Date',
width: 250, width: 250,
cellClassName: 'announceDate', cellClassName: 'announceDate',
renderCell: (params) => { renderCell: (params) => {
@@ -35,7 +35,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{ {
id: 'subjec', id: 'subjec',
field: 'subjec', field: 'subjec',
headerName: 'Subjec',
headerName: 'Subject',
minWidth: 400, minWidth: 400,
renderCell: (params) => { renderCell: (params) => {
return <> return <>


+ 5
- 9
src/pages/Announcement/Search/SearchForm.js View File

@@ -68,14 +68,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
</Grid> </Grid>


<Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}> <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}>
<Grid container>
<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid container spacing={1}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
{...register("dateFrom")} {...register("dateFrom")}
id="dateFrom" id="dateFrom"
type="date" type="date"
label={"Submit Date(From)"}
label={"Submit Date (From)"}
defaultValue={searchCriteria.dateFrom} defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }} InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => { onChange={(newValue) => {
@@ -87,11 +87,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
/> />
</Grid> </Grid>


<Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{mt:0.8, display: 'flex', justifyContent:"center", alignItems: 'flex-start'}}>
To
</Grid>

<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
InputLabelProps={{ InputLabelProps={{
@@ -104,7 +100,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
//label={"Submit Date(To)"}
label={"Submit Date (To)"}
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
/> />
</Grid> </Grid>


+ 2
- 2
src/pages/DemandNote/Search/DataGrid.js View File

@@ -164,7 +164,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
const columns = [ const columns = [
{ {
field: 'appNo', field: 'appNo',
headerName: 'App No.',
headerName: 'Application No.',
width: 150, width: 150,
}, },
{ {
@@ -211,7 +211,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
}, },
{ {
field: 'amount', field: 'amount',
headerName: 'Amount($)',
headerName: 'Amount ($)',
width: 120, width: 120,
align: 'right', align: 'right',
valueGetter: (params) => { valueGetter: (params) => {


+ 13
- 20
src/pages/DemandNote/Search/SearchForm.js View File

@@ -142,7 +142,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Gazette Issue"
label="Gazette Issue No."
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
@@ -156,7 +156,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
fullWidth fullWidth
{...register("appNo")} {...register("appNo")}
id='appNo' id='appNo'
label={"App No."}
label={"Application No."}
defaultValue={searchCriteria.appNo} defaultValue={searchCriteria.appNo}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
@@ -182,7 +182,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="BR No./Organisation"
label="BR No./ Organisation"
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
@@ -208,8 +208,8 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
</Grid> </Grid>


<Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}> <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
<Grid container>
<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid container spacing={1}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
{...register("dateFrom")} {...register("dateFrom")}
@@ -227,11 +227,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
/> />
</Grid> </Grid>


<Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{mt:0.8, display: 'flex', justifyContent:"center", alignItems: 'flex-start'}}>
To
</Grid>

<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
InputLabelProps={{ InputLabelProps={{
@@ -244,7 +240,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
//label={"Submit Date(To)"}
label={"Issue Date (To)"}
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
/> />
</Grid> </Grid>
@@ -252,14 +248,14 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
</Grid> </Grid>


<Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}> <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
<Grid container>
<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid container spacing={1}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
{...register("dueDateFrom")} {...register("dueDateFrom")}
id="dueDateFrom" id="dueDateFrom"
type="date" type="date"
label={"Due Date(From)"}
label={"Due Date (From)"}
defaultValue={searchCriteria.dueDateFrom} defaultValue={searchCriteria.dueDateFrom}
InputProps={{ inputProps: { max: maxDueDate } }} InputProps={{ inputProps: { max: maxDueDate } }}
onChange={(newValue) => { onChange={(newValue) => {
@@ -271,11 +267,8 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
/> />
</Grid> </Grid>


<Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{mt:0.8, display: 'flex', justifyContent:"center", alignItems: 'flex-start'}}>
To
</Grid>

<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
InputLabelProps={{ InputLabelProps={{
@@ -288,7 +281,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
}} }}
id="dueDateTo" id="dueDateTo"
type="date" type="date"
//label={"Submit Date(To)"}
label={"Due Date (To)"}
defaultValue={searchCriteria.dueDateTo} defaultValue={searchCriteria.dueDateTo}
/> />
</Grid> </Grid>


+ 4
- 4
src/pages/EmailTemplate/Search_GLD/DataGrid.js View File

@@ -55,25 +55,25 @@ export default function EmailTemplateTable({ recordList }) {
{ {
id: 'params', id: 'params',
field: 'params', field: 'params',
headerName: 'Params',
headerName: 'Parameters',
flex: 1, flex: 1,
}, },
{ {
id: 'subjectCht', id: 'subjectCht',
field: 'subjectCht', field: 'subjectCht',
headerName: 'SubjectCht',
headerName: 'Subject (Cht)',
flex: 1, flex: 1,
}, },
{ {
id: 'subjectChs', id: 'subjectChs',
field: 'subjectChs', field: 'subjectChs',
headerName: 'SubjectChs',
headerName: 'Subject (Chs)',
flex: 1, flex: 1,
}, },
{ {
id: 'subjectEng', id: 'subjectEng',
field: 'subjectEng', field: 'subjectEng',
headerName: 'SubjectEng',
headerName: 'Subject (Eng)',
flex: 1, flex: 1,
}, },
]; ];


+ 1
- 1
src/pages/GFMIS/DataGrid.js View File

@@ -59,7 +59,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{ {
id: 'payAmount', id: 'payAmount',
field: 'payAmount', field: 'payAmount',
headerName: 'Payment Amount',
headerName: 'Amount ($)',
flex: 5, flex: 5,
valueGetter: (params) => { valueGetter: (params) => {
return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : ""; return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";


+ 4
- 1
src/pages/GFMIS/SearchForm.js View File

@@ -73,7 +73,10 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria }) =>
type="date" type="date"
label="Credit Date" label="Credit Date"
defaultValue={searchCriteria.dateFrom} defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
InputProps={{
inputProps: {
max: maxDate,
} }}
// onChange={(newValue) => { // onChange={(newValue) => {
// setMinDate(DateUtils.dateStr(newValue)); // setMinDate(DateUtils.dateStr(newValue));
// }} // }}


+ 3
- 1
src/pages/GFMIS/index.js View File

@@ -127,7 +127,9 @@ const Index = () => {
<Grid item xs={12}> <Grid item xs={12}>
<div style={BackgroundHead}> <div style={BackgroundHead}>
<Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
<Typography ml={15} color='#FFF' variant="h4">GFMIS</Typography>
<Typography ml={15} color='#FFF' variant="h4">
GFMIS Generate XML
</Typography>
</Stack> </Stack>
</div> </div>
</Grid> </Grid>


+ 1
- 1
src/pages/Payment/Details_GLD/DataGrid.js View File

@@ -54,7 +54,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{ {
id: 'fee', id: 'fee',
field: 'fee', field: 'fee',
headerName: 'Amount (HK$)',
headerName: 'Amount ($)',
width: 150, width: 150,
valueGetter: (params) => { valueGetter: (params) => {
return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : ""; return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";


+ 5
- 5
src/pages/Payment/Details_GLD/PaymentDetails.js View File

@@ -70,7 +70,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
<Grid container > <Grid container >
<Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}> <Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
<FormLabel sx={{ color: "#000000" }}> <FormLabel sx={{ color: "#000000" }}>
Trans No.:
Transaction No.:
</FormLabel> </FormLabel>
</Grid> </Grid>
<Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}> <Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}>
@@ -84,7 +84,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
<Grid container > <Grid container >
<Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}> <Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
<FormLabel sx={{ color: "#000000" }}> <FormLabel sx={{ color: "#000000" }}>
Trans Date:
Transaction Date:
</FormLabel> </FormLabel>
</Grid> </Grid>
<Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}> <Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}>
@@ -98,7 +98,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
<Grid container > <Grid container >
<Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}> <Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
<FormLabel sx={{ color: "#000000" }}> <FormLabel sx={{ color: "#000000" }}>
Trans Time:
Transaction Time:
</FormLabel> </FormLabel>
</Grid> </Grid>
<Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}> <Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}>
@@ -112,7 +112,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
<Grid container > <Grid container >
<Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}> <Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
<FormLabel sx={{ color: "#000000" }}> <FormLabel sx={{ color: "#000000" }}>
EGIS Ref No.:
EGIS Reference No.:
</FormLabel> </FormLabel>
</Grid> </Grid>
<Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}> <Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}>
@@ -153,7 +153,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
<Grid item xs={12} md={12}> <Grid item xs={12} md={12}>
<Grid container alignItems="center"> <Grid container alignItems="center">
<Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}> <Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
<FormLabel sx={{ fontSize: "16px", color: "#000000" }}>
<FormLabel sx={{ color: "#000000" }}>
Payment Receipt: Payment Receipt:
</FormLabel> </FormLabel>
</Grid> </Grid>


+ 11
- 11
src/pages/Payment/Search_GLD/DataGrid.js View File

@@ -40,28 +40,28 @@ export default function SearchPublicNoticeTable({ recordList }) {


const columns = [ const columns = [
{ {
field: 'actions',
headerName: 'Trans. No.',
id: 'appNos',
field: 'appNos',
headerName: 'Application No.',
flex: 1, flex: 1,
cellClassName: 'actions',
renderCell: (params) => { renderCell: (params) => {
return <Button onClick={handleEditClick(params)}><u>{params.row.transNo}</u></Button>;
let appNo = params.row.appNos;
return <div style={{ margin: 4 }}>{appNo}</div>
}, },
}, },
{ {
id: 'appNos',
field: 'appNos',
headerName: 'App No.',
field: 'actions',
headerName: 'Transaction No.',
flex: 1, flex: 1,
cellClassName: 'actions',
renderCell: (params) => { renderCell: (params) => {
let appNo = params.row.appNos;
return <div style={{ margin: 4 }}>{appNo}</div>
return <Button onClick={handleEditClick(params)}><u>{params.row.transNo}</u></Button>;
}, },
}, },
{ {
id: 'transDateTime', id: 'transDateTime',
field: 'transDateTime', field: 'transDateTime',
headerName: 'Trans. Date',
headerName: 'Transaction Date',
flex: 1, flex: 1,
valueGetter: (params) => { valueGetter: (params) => {
return DateUtils.dateStr(params?.value); return DateUtils.dateStr(params?.value);
@@ -78,7 +78,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{ {
id: 'payAmount', id: 'payAmount',
field: 'payAmount', field: 'payAmount',
headerName: 'Amount',
headerName: 'Amount ($)',
width: 150, width: 150,
valueGetter: (params) => { valueGetter: (params) => {
return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : ""; return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";


+ 7
- 10
src/pages/Payment/Search_GLD/SearchForm.js View File

@@ -62,7 +62,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
fullWidth fullWidth
{...register("code")} {...register("code")}
id='code' id='code'
label="App No.:"
label="Application No."
defaultValue={searchCriteria.code} defaultValue={searchCriteria.code}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
@@ -71,14 +71,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
</Grid> </Grid>


<Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}> <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}>
<Grid container>
<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid container spacing={1}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
{...register("dateFrom")} {...register("dateFrom")}
id="dateFrom" id="dateFrom"
type="date" type="date"
label="Trans. Date From"
label="Transaction Date (From)"
defaultValue={searchCriteria.dateFrom} defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }} InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => { onChange={(newValue) => {
@@ -89,10 +89,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
}} }}
/> />
</Grid> </Grid>
<Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{mt:0.8, display: 'flex', justifyContent:"center", alignItems: 'flex-start'}}>
To
</Grid>
<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
InputLabelProps={{ InputLabelProps={{
@@ -105,7 +102,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
label="Trans. Date To"
label="Transaction Date (To)"
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
/> />
</Grid> </Grid>
@@ -117,7 +114,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
fullWidth fullWidth
{...register("transNo")} {...register("transNo")}
id='transNo' id='transNo'
label="Trans. No.:"
label="Transaction No."
defaultValue={searchCriteria.transNo} defaultValue={searchCriteria.transNo}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true


+ 1
- 1
src/pages/Payment/Search_GLD/index.js View File

@@ -69,7 +69,7 @@ const Index = () => {
<div style={BackgroundHead}> <div style={BackgroundHead}>
<Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
<Typography ml={15} color='#FFF' variant="h4"> <Typography ml={15} color='#FFF' variant="h4">
Payment Record
Online Payment Record
</Typography> </Typography>
</Stack> </Stack>
</div> </div>


+ 2
- 2
src/pages/Proof/Search_GLD/DataGrid.js View File

@@ -68,7 +68,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{ {
id: 'replyDate', id: 'replyDate',
field: 'replyDate', field: 'replyDate',
headerName: 'Confirmed/Return Date',
headerName: 'Confirmed/ Return Date',
flex: 1, flex: 1,
valueGetter: (params) => { valueGetter: (params) => {
return params?.value ? DateUtils.datetimeStr(params?.value) : ""; return params?.value ? DateUtils.datetimeStr(params?.value) : "";
@@ -116,7 +116,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{ {
id: 'fee', id: 'fee',
field: 'fee', field: 'fee',
headerName: 'Fee',
headerName: 'Amount ($)',
flex: 1, flex: 1,
valueGetter: (params) => { valueGetter: (params) => {
return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : ""; return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";


+ 9
- 11
src/pages/Proof/Search_GLD/SearchForm.js View File

@@ -142,7 +142,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
fullWidth fullWidth
{...register("code")} {...register("code")}
id='code' id='code'
label="Application / Gazette Code"
label="Application No. / Gazette Code"
defaultValue={searchCriteria.code} defaultValue={searchCriteria.code}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
@@ -165,7 +165,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Gazette Issue"
label="Gazette Issue No."
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
@@ -199,8 +199,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
</Grid> </Grid>


<Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}> <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}>
<Grid container>
<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid container spacing={1}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
{...register("dateFrom")} {...register("dateFrom")}
@@ -217,10 +217,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
}} }}
/> />
</Grid> </Grid>
<Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{mt:0.8, display: 'flex', justifyContent:"center", alignItems: 'flex-start'}}>
To
</Grid>
<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
InputLabelProps={{ InputLabelProps={{
@@ -233,7 +231,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
label="Proof Issue Date(To)"
label="Proof Issue Date (To)"
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
/> />
</Grid> </Grid>
@@ -257,7 +255,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
<Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}> <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
<Autocomplete <Autocomplete
{...register("status")} {...register("status")}
disablePortal
disablePortal={false}
id="status" id="status"
size="small" size="small"
filterOptions={(options) => options} filterOptions={(options) => options}
@@ -296,7 +294,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Organisation"
label="BR No./ Organisation"
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}


+ 3
- 3
src/pages/PublicNotice/Search_GLD/DataGrid.js View File

@@ -42,7 +42,7 @@ export default function SearchPublicNoticeTable({ recordList, reloadFunction })
const columns = [ const columns = [
{ {
field: 'actions', field: 'actions',
headerName: 'App No.',
headerName: 'Application No.',
width: 150, width: 150,
cellClassName: 'actions', cellClassName: 'actions',
renderCell: (params) => { renderCell: (params) => {
@@ -70,7 +70,7 @@ export default function SearchPublicNoticeTable({ recordList, reloadFunction })
{ {
id: 'contactPerson', id: 'contactPerson',
field: 'contactPerson', field: 'contactPerson',
headerName: 'Contact Person',
headerName: 'Client',
flex: 2, flex: 2,
renderCell: (params) => { renderCell: (params) => {
let company = params.row.enCompanyName != null ? params.row.enCompanyName : params.row.chCompanyName; let company = params.row.enCompanyName != null ? params.row.enCompanyName : params.row.chCompanyName;
@@ -109,7 +109,7 @@ export default function SearchPublicNoticeTable({ recordList, reloadFunction })
{ {
id: 'issueId', id: 'issueId',
field: 'issueId', field: 'issueId',
headerName: 'Issue No',
headerName: 'Gazette Issue No.',
flex: 1.5, flex: 1.5,
valueGetter: (params) => { valueGetter: (params) => {
return params.row.issueYear return params.row.issueYear


+ 10
- 14
src/pages/PublicNotice/Search_GLD/SearchForm.js View File

@@ -125,7 +125,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
fullWidth fullWidth
{...register("appNo")} {...register("appNo")}
id='appNo' id='appNo'
label={"App No."}
label={"Application No."}
defaultValue={searchCriteria.appNo} defaultValue={searchCriteria.appNo}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
@@ -134,14 +134,14 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
</Grid> </Grid>


<Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: marginBottom }}> <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: marginBottom }}>
<Grid container>
<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid container spacing={1}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
{...register("dateFrom")} {...register("dateFrom")}
id="dateFrom" id="dateFrom"
type="date" type="date"
label={"Submit Date(From)"}
label={"Submit Date (From)"}
defaultValue={searchCriteria.dateFrom} defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }} InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => { onChange={(newValue) => {
@@ -152,12 +152,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
}} }}
/> />
</Grid> </Grid>

<Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{ mt: 0.8, display: 'flex', justifyContent: "center", alignItems: 'flex-start' }}>
To
</Grid>

<Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
<Grid item xs={6}>
<TextField <TextField
fullWidth fullWidth
InputLabelProps={{ InputLabelProps={{
@@ -170,7 +166,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
//label={"Submit Date(To)"}
label={"Submit Date (To)"}
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
/> />
</Grid> </Grid>
@@ -267,7 +263,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Organisation"
label="BR No./ Organisation"
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
@@ -295,7 +291,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Gazette Issue"
label="Gazette Issue No."
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
@@ -309,7 +305,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
fullWidth fullWidth
{...register("groupNo")} {...register("groupNo")}
id='groupNo' id='groupNo'
label="Gazette Code."
label="Gazette Code"
defaultValue={searchCriteria.groupNo} defaultValue={searchCriteria.groupNo}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true


+ 1
- 1
src/pages/User/SearchPage/UserTable.js View File

@@ -81,7 +81,7 @@ export default function UserTable({recordList,setChangeLocked}) {
{ {
id: 'username', id: 'username',
field: 'username', field: 'username',
headerName: 'User Name',
headerName: 'Username',
flex: 1, flex: 1,
}, },
{ {


+ 2
- 2
src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js View File

@@ -69,7 +69,7 @@ const UserSearchForm_Organization = ({applySearch}) => {
fullWidth fullWidth
{...register("orgName")} {...register("orgName")}
id="orgName" id="orgName"
label="Org Name"
label="Organisation Name"
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
@@ -139,7 +139,7 @@ const UserSearchForm_Organization = ({applySearch}) => {
<Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}> <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
<Autocomplete <Autocomplete
{...register("accountFilter")} {...register("accountFilter")}
disablePortal
disablePortal={false}
id="accountFilter" id="accountFilter"
size="small" size="small"
options={["All", "Active","Locked","Not verified"]} options={["All", "Active","Locked","Not verified"]}


+ 4
- 4
src/pages/User/SearchPage_Organization/UserTable_Organization.js View File

@@ -49,7 +49,7 @@ export default function UserTable_Organization({recordList}) {
{ {
id: 'username', id: 'username',
field: 'username', field: 'username',
headerName: 'User Name',
headerName: 'Username',
flex: 1, flex: 1,
}, },
{ {
@@ -61,19 +61,19 @@ export default function UserTable_Organization({recordList}) {
{ {
id: 'enCompanyName', id: 'enCompanyName',
field: 'enCompanyName', field: 'enCompanyName',
headerName: 'Company(Eng)',
headerName: 'Company (Eng)',
flex: 1, flex: 1,
}, },
{ {
id: 'chCompanyName', id: 'chCompanyName',
field: 'chCompanyName', field: 'chCompanyName',
headerName: 'Company(Ch)',
headerName: 'Company (Ch)',
flex: 1, flex: 1,
}, },
{ {
id: 'brNo', id: 'brNo',
field: 'brNo', field: 'brNo',
headerName: 'Br No',
headerName: 'BR No.',
flex: 1, flex: 1,
}, },
{ {


Write Preview
Loading…
Cancel
Save