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

fix ui date display bug

master
Alex Cheung 1 year ago
parent
bfa8afc93c
commit
23abcb420b
14 changed files with 280 additions and 63 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +100
    -11
      src/pages/Announcement/Search/SearchForm.js
  2. +97
    -7
      src/pages/Announcement/Search_Public/SearchForm.js
  3. +8
    -4
      src/pages/AuditLog/AuditLogSearchForm.js
  4. +10
    -6
      src/pages/DemandNote/Search/SearchForm.js
  5. +6
    -2
      src/pages/DemandNote/Search_Public/SearchForm.js
  6. +4
    -2
      src/pages/GFMIS/SearchForm.js
  7. +1
    -1
      src/pages/Organization/DetailPage/OrganizationCard.js
  8. +8
    -4
      src/pages/Payment/Search_GLD/SearchForm.js
  9. +8
    -4
      src/pages/Payment/Search_Public/SearchForm.js
  10. +8
    -4
      src/pages/Proof/Search_GLD/SearchForm.js
  11. +8
    -4
      src/pages/Proof/Search_Public/SearchForm.js
  12. +8
    -4
      src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
  13. +8
    -4
      src/pages/PublicNotice/Search_GLD/SearchForm.js
  14. +6
    -6
      src/pages/Recon/SearchForm.js

+ 100
- 11
src/pages/Announcement/Search/SearchForm.js View File

@@ -11,28 +11,109 @@ import * as DateUtils from "utils/DateUtils";
import {ThemeProvider} from "@emotion/react"; import {ThemeProvider} from "@emotion/react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
import { makeStyles } from '@mui/styles';
// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //

const useStyles = makeStyles(() => ({
root: {
position: "relative"
},
display: {
position: "absolute",
top: 2,
left: 12,
bottom: 2,
background: "white",
pointerEvents: "none",
right: 50,
display: "flex",
alignItems: "center"
},
}));


const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => { const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
const navigate = useNavigate() const navigate = useNavigate()


const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom); const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo); const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo);
const [fromDateValue, setFromDateValue] = React.useState("dd / mm / yyyy");
const [toDateValue, setToDateValue] = React.useState("dd / mm / yyyy");

React.useEffect(() => {
// console.log(minDate)
setFromDateValue(minDate);
}, [minDate]);
React.useEffect(() => {
setToDateValue(maxDate);
}, [maxDate]);
function FormDateInputComponent({inputRef, ...props }) {
const classes = useStyles();
return (
<>
<div className={classes.display}>
{DateUtils.dateStr(fromDateValue)=="Invalid Date"?
fromDateValue
:
DateUtils.dateStr(fromDateValue)}
</div>
<input
// className={classes.input}
ref={inputRef}
{...props}
// onChange={handleChange}
value={fromDateValue}
max= {maxDate}
/>
</>
);
}

function ToDateInputComponent({inputRef, ...props }) {
const classes = useStyles();
return (
<>
<div className={classes.display}>
{DateUtils.dateStr(toDateValue)=="Invalid Date"?
toDateValue
:
DateUtils.dateStr(toDateValue)}
</div>
<input
// className={classes.input}
ref={inputRef}
{...props}
// onChange={handleChange}
value={toDateValue}
min = {minDate}
/>
</>
);
}


const marginBottom = 2.5; const marginBottom = 2.5;
const { reset, register, handleSubmit } = useForm() const { reset, register, handleSubmit } = useForm()
const onSubmit = (data) => { const onSubmit = (data) => {
let sentDateFrom = "";
let sentDateTo = "";
if( fromDateValue!="dd / mm / yyyy"&&toDateValue!="dd / mm / yyyy"){
sentDateFrom = DateUtils.dateValue(fromDateValue)
sentDateTo = DateUtils.dateValue(toDateValue)
}

const temp = { const temp = {
key: data.key, key: data.key,
dateFrom: data.dateFrom,
dateTo: data.dateTo,
dateFrom: sentDateFrom,
dateTo: sentDateTo,
}; };
applySearch(temp); applySearch(temp);
}; };




function resetForm() { function resetForm() {
setMinDate(DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)))
setMaxDate(DateUtils.dateValue(new Date()))
reset(); reset();
} }


@@ -54,7 +135,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
</Grid> </Grid>
{/*row 2*/} {/*row 2*/}
<Grid container display="flex" alignItems={"center"}> <Grid container display="flex" alignItems={"center"}>
<Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: marginBottom }}>
<Grid item xs={12} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: marginBottom }}>
<TextField <TextField
fullWidth fullWidth
{...register("key")} {...register("key")}
@@ -67,7 +148,7 @@ 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={12} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}>
<Grid container spacing={1}> <Grid container spacing={1}>
<Grid item xs={6}> <Grid item xs={6}>
<TextField <TextField
@@ -77,14 +158,18 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
type="date" type="date"
label={"Submit Date (From)"} label={"Submit Date (From)"}
defaultValue={searchCriteria.dateFrom} defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
InputProps={{
inputComponent: FormDateInputComponent,
}}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(DateUtils.dateValue(newValue));
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>


@@ -95,15 +180,19 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
shrink: true shrink: true
}} }}
{...register("dateTo")} {...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
InputProps={{
inputComponent: ToDateInputComponent,
}}
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(DateUtils.dateValue(newValue));
if(newValue.target.value!=""){
setMaxDate(newValue.target.value);
}
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
label={"Submit Date (To)"} label={"Submit Date (To)"}
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>


+ 97
- 7
src/pages/Announcement/Search_Public/SearchForm.js View File

@@ -12,30 +12,110 @@ import { ThemeProvider } from "@emotion/react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { PNSPS_BUTTON_THEME } from "../../../themes/buttonConst"; import { PNSPS_BUTTON_THEME } from "../../../themes/buttonConst";
import { FormattedMessage, useIntl } from "react-intl"; import { FormattedMessage, useIntl } from "react-intl";
import { makeStyles } from '@mui/styles';
// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //

const useStyles = makeStyles(() => ({
root: {
position: "relative"
},
display: {
position: "absolute",
top: 2,
left: 12,
bottom: 2,
background: "white",
pointerEvents: "none",
right: 50,
display: "flex",
alignItems: "center"
},
}));


const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
const navigate = useNavigate() const navigate = useNavigate()


const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom); const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo); const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo);
const [fromDateValue, setFromDateValue] = React.useState("dd / mm / yyyy");
const [toDateValue, setToDateValue] = React.useState("dd / mm / yyyy");


const intl = useIntl(); const intl = useIntl();


React.useEffect(() => {
// console.log(minDate)
setFromDateValue(minDate);
}, [minDate]);
React.useEffect(() => {
setToDateValue(maxDate);
}, [maxDate]);
function FormDateInputComponent({inputRef, ...props }) {
const classes = useStyles();
return (
<>
<div className={classes.display}>
{DateUtils.dateStr(fromDateValue)=="Invalid Date"?
fromDateValue
:
DateUtils.dateStr(fromDateValue)}
</div>
<input
// className={classes.input}
ref={inputRef}
{...props}
// onChange={handleChange}
value={fromDateValue}
max= {maxDate}
/>
</>
);
}

function ToDateInputComponent({inputRef, ...props }) {
const classes = useStyles();
return (
<>
<div className={classes.display}>
{DateUtils.dateStr(toDateValue)=="Invalid Date"?
toDateValue
:
DateUtils.dateStr(toDateValue)}
</div>
<input
// className={classes.input}
ref={inputRef}
{...props}
// onChange={handleChange}
value={toDateValue}
min = {minDate}
/>
</>
);
}

const marginBottom = 2.5; const marginBottom = 2.5;
const { reset, register, handleSubmit } = useForm() const { reset, register, handleSubmit } = useForm()
const onSubmit = (data) => { const onSubmit = (data) => {
let sentDateFrom = "";
let sentDateTo = "";
if( fromDateValue!="dd / mm / yyyy"&&toDateValue!="dd / mm / yyyy"){
sentDateFrom = DateUtils.dateValue(fromDateValue)!="Invalid Date"?DateUtils.dateValue(fromDateValue):""
sentDateTo = DateUtils.dateValue(toDateValue)!="Invalid Date"?DateUtils.dateValue(toDateValue):""
}
const temp = { const temp = {
key: data.key, key: data.key,
dateFrom: data.dateFrom,
dateTo: data.dateTo,
dateFrom: sentDateFrom,
dateTo: sentDateTo,
}; };
applySearch(temp); applySearch(temp);
}; };




function resetForm() { function resetForm() {
setMinDate(DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)))
setMaxDate(DateUtils.dateValue(new Date()))
reset(); reset();
} }


@@ -80,13 +160,18 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
type="date" type="date"
label={intl.formatMessage({ id: 'dateFrom' }) + ":"} label={intl.formatMessage({ id: 'dateFrom' }) + ":"}
defaultValue={searchCriteria.dateFrom} defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
InputProps={{
inputComponent: FormDateInputComponent,
}}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(DateUtils.dateValue(newValue));
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>


@@ -101,14 +186,19 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
shrink: true shrink: true
}} }}
{...register("dateTo")} {...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
InputProps={{
inputComponent: ToDateInputComponent,
}}
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(DateUtils.dateValue(newValue));
if(newValue.target.value!=""){
setMaxDate(newValue.target.value);
}
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
//label={"Submit Date(To)"} //label={"Submit Date(To)"}
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>


+ 8
- 4
src/pages/AuditLog/AuditLogSearchForm.js View File

@@ -189,12 +189,14 @@ const AuditLogSearchForm = ({ applySearch, searchCriteria}) => {
inputComponent: FormDateInputComponent, inputComponent: FormDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(newValue.target.value);
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>


@@ -213,13 +215,15 @@ const AuditLogSearchForm = ({ applySearch, searchCriteria}) => {
inputComponent: ToDateInputComponent, inputComponent: ToDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(newValue.target.value);
if(newValue.target.value!=""){
setMaxDate(newValue.target.value);
}
}} }}
id="modifiedTo" id="modifiedTo"
type="date" type="date"
label="Modified To" label="Modified To"
defaultValue={searchCriteria.modifiedTo} defaultValue={searchCriteria.modifiedTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>


+ 10
- 6
src/pages/DemandNote/Search/SearchForm.js View File

@@ -361,12 +361,14 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
inputComponent: FormDateInputComponent, inputComponent: FormDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(newValue.target.value);
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>


@@ -381,13 +383,15 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
inputComponent: ToDateInputComponent, inputComponent: ToDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(newValue.target.value);
if(newValue.target.value!=""){
setMaxDate(newValue.target.value);
}
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
label={"Issue Date (To)"} label={"Issue Date (To)"}
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>
@@ -412,7 +416,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>


@@ -434,7 +438,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
type="date" type="date"
label={"Due Date (To)"} label={"Due Date (To)"}
defaultValue={searchCriteria.dueDateTo} defaultValue={searchCriteria.dueDateTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>


+ 6
- 2
src/pages/DemandNote/Search_Public/SearchForm.js View File

@@ -256,7 +256,9 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
inputComponent: FormDateInputComponent, inputComponent: FormDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(newValue.target.value);
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
@@ -275,7 +277,9 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
inputComponent: ToDateInputComponent, inputComponent: ToDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(newValue.target.value);
if(newValue.target.value!=""){
setMaxDate(newValue.target.value);
}
}} }}
id="dateTo" id="dateTo"
type="date" type="date"


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

@@ -134,12 +134,14 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria }) =>
inputComponent: FormDateInputComponent, inputComponent: FormDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(newValue.target.value);
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>




+ 1
- 1
src/pages/Organization/DetailPage/OrganizationCard.js View File

@@ -440,7 +440,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
shrink: true shrink: true
}} }}
disabled={(!editMode && !createMode)} disabled={(!editMode && !createMode)}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>


+ 8
- 4
src/pages/Payment/Search_GLD/SearchForm.js View File

@@ -167,12 +167,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
inputComponent: FormDateInputComponent, inputComponent: FormDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(newValue.target.value);
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
<Grid item xs={6}> <Grid item xs={6}>
@@ -186,13 +188,15 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
inputComponent: ToDateInputComponent, inputComponent: ToDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(newValue.target.value);
if(newValue.target.value!=""){
setMaxDate(newValue.target.value);
}
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
label="Transaction Date (To)" label="Transaction Date (To)"
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>


+ 8
- 4
src/pages/Payment/Search_Public/SearchForm.js View File

@@ -184,12 +184,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
inputComponent: FormDateInputComponent, inputComponent: FormDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(newValue.target.value);
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>


@@ -204,13 +206,15 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
inputComponent: ToDateInputComponent, inputComponent: ToDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(newValue.target.value);
if(newValue.target.value!=""){
setMaxDate(newValue.target.value);
}
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
label={intl.formatMessage({id: 'payDateTo'})} label={intl.formatMessage({id: 'payDateTo'})}
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>


+ 8
- 4
src/pages/Proof/Search_GLD/SearchForm.js View File

@@ -292,12 +292,14 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
inputComponent: FormDateInputComponent, inputComponent: FormDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(newValue.target.value);
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
@@ -312,13 +314,15 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
inputComponent: ToDateInputComponent, inputComponent: ToDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(newValue.target.value);
if(newValue.target.value!=""){
setMaxDate(newValue.target.value);
}
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
label="Proof Issue Date (To)" label="Proof Issue Date (To)"
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>


+ 8
- 4
src/pages/Proof/Search_Public/SearchForm.js View File

@@ -292,12 +292,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
inputComponent: FormDateInputComponent, inputComponent: FormDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(newValue.target.value);
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>


@@ -312,13 +314,15 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
inputComponent: ToDateInputComponent, inputComponent: ToDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(newValue.target.value);
if(newValue.target.value!=""){
setMaxDate(newValue.target.value);
}
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
label={intl.formatMessage({id: 'proofDateTo'})} label={intl.formatMessage({id: 'proofDateTo'})}
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>


+ 8
- 4
src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js View File

@@ -179,12 +179,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
inputComponent: FormDateInputComponent, inputComponent: FormDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(newValue.target.value);
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>


@@ -205,9 +207,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
inputComponent: ToDateInputComponent, inputComponent: ToDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(newValue.target.value);
if(newValue.target.value!=""){
setMaxDate(newValue.target.value);
}
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
{isORGLoggedIn()? {isORGLoggedIn()?


+ 8
- 4
src/pages/PublicNotice/Search_GLD/SearchForm.js View File

@@ -227,12 +227,14 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
inputComponent: FormDateInputComponent, inputComponent: FormDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMinDate(newValue.target.value);
if(newValue.target.value!=""){
setMinDate(newValue.target.value);
}
}} }}
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
@@ -247,13 +249,15 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
inputComponent: ToDateInputComponent, inputComponent: ToDateInputComponent,
}} }}
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(newValue.target.value);
if(newValue.target.value!=""){
setMaxDate(newValue.target.value);
}
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
label={"Submit Date (To)"} label={"Submit Date (To)"}
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>


+ 6
- 6
src/pages/Recon/SearchForm.js View File

@@ -382,7 +382,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
<Grid item xs={4}> <Grid item xs={4}>
@@ -402,7 +402,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
type="date" type="date"
label="PNSPS Transaction Date (To)" label="PNSPS Transaction Date (To)"
////defaultValue={searchCriteria.dateTo} ////defaultValue={searchCriteria.dateTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>
@@ -430,7 +430,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
<Grid item xs={4}> <Grid item xs={4}>
@@ -450,7 +450,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
type="date" type="date"
label="FI Transaction Date (To)" label="FI Transaction Date (To)"
//defaultValue={searchCriteria.dateTo} //defaultValue={searchCriteria.dateTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>
@@ -478,7 +478,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
<Grid item xs={4}> <Grid item xs={4}>
@@ -498,7 +498,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
type="date" type="date"
label="Bank Credit Date (To)" label="Bank Credit Date (To)"
//defaultValue={searchCriteria.dateTo} //defaultValue={searchCriteria.dateTo}
sx={{ "& .MuiInputBase-input": {display:"block"} }}
sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
/> />
</Grid> </Grid>
</Grid> </Grid>


Write Preview
Loading…
Cancel
Save