+
- {
- setMinDueDate(newValue.target.value);
- }}
- InputLabelProps={{
- shrink: true
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ textField: {
+ // helperText: receiptFromErrorMessage,
+ InputLabelProps: { shrink: true }
+ },
+ }}
+ format="DD/MM/YYYY"
+ label={"Due Date (From)"}
+ value={minDueDate === null ? null : dayjs(minDueDate)}
+ maxDate={maxDueDate === null ? null : dayjs(maxDueDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ setMinDueDate(newValue);
+ }}
+ />
+
+
-
- {
- setMaxDueDate(newValue.target.value);
- }}
- id="dueDateTo"
- type="date"
- label={"Due Date (To)"}
- defaultValue={searchCriteria.dueDateTo}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ textField: {
+ // helperText: receiptFromErrorMessage,
+ InputLabelProps: { shrink: true }
+ },
+ }}
+ format="DD/MM/YYYY"
+ label={"Due Date (To)"}
+ value={maxDueDate === null ? null : dayjs(maxDueDate)}
+ minDate={minDueDate === null ? null : dayjs(minDueDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ setMaxDueDate(newValue);
+ }}
+ />
+
+
diff --git a/src/pages/DemandNote/Search_Public/SearchForm.js b/src/pages/DemandNote/Search_Public/SearchForm.js
index 8e4f816..7b92d4f 100644
--- a/src/pages/DemandNote/Search_Public/SearchForm.js
+++ b/src/pages/DemandNote/Search_Public/SearchForm.js
@@ -15,26 +15,13 @@ import * as FormatUtils from "utils/FormatUtils";
import { FormattedMessage, useIntl } from "react-intl";
import { PNSPS_BUTTON_THEME } from "../../../themes/buttonConst";
import { ThemeProvider } from "@emotion/react";
-import { makeStyles } from '@mui/styles';
+import {DatePicker} from "@mui/x-date-pickers/DatePicker";
+import dayjs from "dayjs";
+import {DemoItem} from "@mui/x-date-pickers/internals/demo";
+import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
+import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
// ==============================|| 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 SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
}) => {
@@ -59,50 +46,6 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
setToDateValue(maxDate);
}, [maxDate]);
- function FormDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(fromDateValue) == "Invalid Date" ?
- fromDateValue
- :
- DateUtils.dateStr(fromDateValue)}
-
-
-
- );
- }
-
- function ToDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(toDateValue) == "Invalid Date" ?
- toDateValue
- :
- DateUtils.dateStr(toDateValue)}
-
-
-
- );
- }
-
const { reset, register, handleSubmit } = useForm()
const onSubmit = (data) => {
let typeArray = [];
@@ -244,48 +187,57 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
- {
- if(newValue.target.value!=""){
- setMinDate(newValue.target.value);
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label={intl.formatMessage({ id: 'sendDateFrom' })}
+ value={minDate === null ? null : dayjs(minDate)}
+ maxDate={maxDate === null ? null : dayjs(maxDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMinDate(newValue);
}
- }}
- InputLabelProps={{
- shrink: true
- }}
- />
+ }}
+ />
+
+
-
- {
- if(newValue.target.value!=""){
- setMaxDate(newValue.target.value);
- }
- }}
- id="dateTo"
- type="date"
- label={intl.formatMessage({ id: 'sendDateTo' })}
- defaultValue={searchCriteria.dateTo}
- />
+
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label={intl.formatMessage({ id: 'sendDateTo' })}
+ value={maxDate === null ? null : dayjs(maxDate)}
+ minDate={minDate === null ? null : dayjs(minDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMaxDate(newValue);
+ }
+ }}
+ />
+
+
diff --git a/src/pages/GFMIS/SearchForm.js b/src/pages/GFMIS/SearchForm.js
index dd72e03..db163ae 100644
--- a/src/pages/GFMIS/SearchForm.js
+++ b/src/pages/GFMIS/SearchForm.js
@@ -1,7 +1,8 @@
// material-ui
import {
Button,
- Grid, TextField,
+ Grid,
+ // TextField,
// Autocomplete,
Typography
} from '@mui/material';
@@ -13,27 +14,13 @@ import {PNSPS_BUTTON_THEME} from "../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
// import * as ComboData from "utils/ComboData";
import * as DateUtils from "utils/DateUtils";
-import { makeStyles } from '@mui/styles';
+import {DatePicker} from "@mui/x-date-pickers/DatePicker";
+import dayjs from "dayjs";
+import {DemoItem} from "@mui/x-date-pickers/internals/demo";
+import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
+import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
// ==============================|| 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",
- width:"70%"
- },
-}));
-
const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria }) => {
// const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
@@ -42,34 +29,15 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria }) =>
// const [status, setStatus] = React.useState(ComboData.paymentStatus[0]);
const [fromDateValue, setFromDateValue] = React.useState("dd / mm / yyyy");
- const { register, handleSubmit, } = useForm()
+ const {
+ // register,
+ handleSubmit,
+ } = useForm()
React.useEffect(() => {
setFromDateValue(minDate);
}, [minDate]);
- function FormDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(fromDateValue) == "Invalid Date" ?
- fromDateValue
- :
- DateUtils.dateStr(fromDateValue)}
-
-
-
- );
- }
-
const onSubmit = () => {
let sentDateFrom = "";
@@ -122,71 +90,77 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria }) =>
{/*row 2*/}
-
- {
- if(newValue.target.value!=""){
- setMinDate(newValue.target.value);
+
+
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label="Credit Date"
+ value={minDate === null ? null : dayjs(minDate)}
+ maxDate={maxDate === null ? null : dayjs(maxDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMinDate(newValue);
}
- }}
- InputLabelProps={{
- shrink: true
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+ }}
+ />
+
+
+
+
+
+ {/* {
+ setMaxDate(DateUtils.dateValue(newValue));
+ }}
+ id="dateTo"
+ type="date"
+ label="To"
+ defaultValue={searchCriteria.dateTo}
+ /> */}
+
+
+ {/*
+ */}
-
- {/* {
- setMaxDate(DateUtils.dateValue(newValue));
- }}
- id="dateTo"
- type="date"
- label="To"
- defaultValue={searchCriteria.dateTo}
- /> */}
+
+
+
+
+
+
+
+
+
+
-
- {/*
- */}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/Message/Search/SearchForm.js b/src/pages/Message/Search/SearchForm.js
index 9b142af..f53b157 100644
--- a/src/pages/Message/Search/SearchForm.js
+++ b/src/pages/Message/Search/SearchForm.js
@@ -12,6 +12,12 @@ import * as DateUtils from "utils/DateUtils";
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
import {FormattedMessage, useIntl} from "react-intl";
+
+import {DatePicker} from "@mui/x-date-pickers/DatePicker";
+import dayjs from "dayjs";
+import {DemoItem} from "@mui/x-date-pickers/internals/demo";
+import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
+import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
// ==============================|| DASHBOARD - DEFAULT ||============================== //
@@ -20,6 +26,17 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
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(() => {
+ setFromDateValue(minDate);
+ }, [minDate]);
+
+ React.useEffect(() => {
+ setToDateValue(maxDate);
+ }, [maxDate]);
+
const _sx = {
padding: "4 2 4 2",
boxShadow: 1,
@@ -39,15 +56,24 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
const { reset, register, handleSubmit } = useForm()
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 = {
keywork: data.keywork,
- dateFrom: data.dateFrom,
- dateTo: data.dateTo,
+ dateFrom: sentDateFrom,
+ dateTo: sentDateTo,
};
applySearch(temp);
};
function resetForm() {
+ setMinDate(DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)))
+ setMaxDate(DateUtils.dateValue(new Date()))
reset();
}
@@ -86,25 +112,34 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
/>
-
+
- {
- setMinDate(DateUtils.dateValue(newValue));
- }}
- InputLabelProps={{
- shrink: true
- }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ aria-label={intl.formatMessage({id: 'dateFrom'})}
+ label={intl.formatMessage({id: 'dateFrom'})}
+ value={minDate === null ? null : dayjs(minDate)}
+ maxDate={maxDate === null ? null : dayjs(maxDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMinDate(newValue);
+ }
+ }}
+ />
+
+
@@ -112,22 +147,30 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
- {
- setMaxDate(DateUtils.dateValue(newValue));
- }}
- aria-label={intl.formatMessage({id: 'dateTo'})}
- id="dateTo"
- type="date"
- //label="付款日期(到)"
- defaultValue={searchCriteria.dateTo}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ aria-label={intl.formatMessage({id: 'dateTo'})}
+ value={maxDate === null ? null : dayjs(maxDate)}
+ minDate={minDate === null ? null : dayjs(minDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMaxDate(newValue);
+ }
+ }}
+ />
+
+
diff --git a/src/pages/Payment/Search_GLD/SearchForm.js b/src/pages/Payment/Search_GLD/SearchForm.js
index 46f23c3..72d3b9d 100644
--- a/src/pages/Payment/Search_GLD/SearchForm.js
+++ b/src/pages/Payment/Search_GLD/SearchForm.js
@@ -12,27 +12,13 @@ import * as DateUtils from "utils/DateUtils";
import * as ComboData from "utils/ComboData";
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
-import { makeStyles } from '@mui/styles';
+import {DatePicker} from "@mui/x-date-pickers/DatePicker";
+import dayjs from "dayjs";
+import {DemoItem} from "@mui/x-date-pickers/internals/demo";
+import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
+import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
// ==============================|| 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",
- width:"70%"
- },
-}));
-
const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
@@ -53,49 +39,6 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
setToDateValue(maxDate);
}, [maxDate]);
- function FormDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(fromDateValue) == "Invalid Date" ?
- fromDateValue
- :
- DateUtils.dateStr(fromDateValue)}
-
-
-
- );
- }
-
- function ToDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(toDateValue) == "Invalid Date" ?
- toDateValue
- :
- DateUtils.dateStr(toDateValue)}
-
-
-
- );
- }
const onSubmit = (data) => {
let sentDateFrom = "";
let sentDateTo = "";
@@ -156,48 +99,56 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
- {
- if(newValue.target.value!=""){
- setMinDate(newValue.target.value);
- }
- }}
- InputLabelProps={{
- shrink: true
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label="Transaction Date (From)"
+ value={minDate === null ? null : dayjs(minDate)}
+ maxDate={maxDate === null ? null : dayjs(maxDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMinDate(newValue);
+ }
+ }}
+ />
+
+
- {
- if(newValue.target.value!=""){
- setMaxDate(newValue.target.value);
- }
- }}
- id="dateTo"
- type="date"
- label="Transaction Date (To)"
- defaultValue={searchCriteria.dateTo}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label="Transaction Date (To)"
+ value={maxDate === null ? null : dayjs(maxDate)}
+ minDate={minDate === null ? null : dayjs(minDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMaxDate(newValue);
+ }
+ }}
+ />
+
+
diff --git a/src/pages/Payment/Search_Public/SearchForm.js b/src/pages/Payment/Search_Public/SearchForm.js
index 1e4f298..cba8b9a 100644
--- a/src/pages/Payment/Search_Public/SearchForm.js
+++ b/src/pages/Payment/Search_Public/SearchForm.js
@@ -14,25 +14,13 @@ import * as ComboData from "utils/ComboData";
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
import {FormattedMessage, useIntl} from "react-intl";
-import { makeStyles } from '@mui/styles';
-// ==============================|| 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"
- },
- }));
+import {DatePicker} from "@mui/x-date-pickers/DatePicker";
+import dayjs from "dayjs";
+import {DemoItem} from "@mui/x-date-pickers/internals/demo";
+import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
+import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
+// ==============================|| DASHBOARD - DEFAULT ||============================== //
const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
const intl = useIntl();
const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
@@ -51,50 +39,6 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
setToDateValue(maxDate);
}, [maxDate]);
- function FormDateInputComponent({inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(fromDateValue)=="Invalid Date"?
- fromDateValue
- :
- DateUtils.dateStr(fromDateValue)}
-
-
-
- );
- }
-
- function ToDateInputComponent({inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(toDateValue)=="Invalid Date"?
- toDateValue
- :
- DateUtils.dateStr(toDateValue)}
-
-
-
- );
- }
-
const _sx = {
padding: "4 2 4 2",
boxShadow: 1,
@@ -173,49 +117,59 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
- {
- if(newValue.target.value!=""){
- setMinDate(newValue.target.value);
- }
- }}
- InputLabelProps={{
- shrink: true
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label={intl.formatMessage({id: 'payDateFrom'})}
+ // defaultValue={searchCriteria.dateFrom}
+ value={minDate === null ? null : dayjs(minDate)}
+ maxDate={maxDate === null ? null : dayjs(maxDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMinDate(newValue);
+ }
+ }}
+ />
+
+
- {
- if(newValue.target.value!=""){
- setMaxDate(newValue.target.value);
- }
- }}
- id="dateTo"
- type="date"
- label={intl.formatMessage({id: 'payDateTo'})}
- defaultValue={searchCriteria.dateTo}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label={intl.formatMessage({id: 'payDateTo'})}
+ // defaultValue={searchCriteria.dateTo}
+ value={maxDate === null ? null : dayjs(maxDate)}
+ minDate={minDate === null ? null : dayjs(minDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMaxDate(newValue);
+ }
+ }}
+ />
+
+
diff --git a/src/pages/Proof/Search_GLD/SearchForm.js b/src/pages/Proof/Search_GLD/SearchForm.js
index 7f30a90..9d203ba 100644
--- a/src/pages/Proof/Search_GLD/SearchForm.js
+++ b/src/pages/Proof/Search_GLD/SearchForm.js
@@ -14,27 +14,13 @@ import { Typography } from '../../../../node_modules/@mui/material/index';
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
import { useIntl } from "react-intl";
-import { makeStyles } from '@mui/styles';
+import {DatePicker} from "@mui/x-date-pickers/DatePicker";
+import dayjs from "dayjs";
+import {DemoItem} from "@mui/x-date-pickers/internals/demo";
+import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
+import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
// ==============================|| 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",
- width:"70%"
- },
-}));
-
const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, issueComboData
}) => {
@@ -59,50 +45,6 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
setToDateValue(maxDate);
}, [maxDate]);
- function FormDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(fromDateValue) == "Invalid Date" ?
- fromDateValue
- :
- DateUtils.dateStr(fromDateValue)}
-
-
-
- );
- }
-
- function ToDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(toDateValue) == "Invalid Date" ?
- toDateValue
- :
- DateUtils.dateStr(toDateValue)}
-
-
-
- );
- }
-
const intl = useIntl();
const { locale } = intl;
@@ -281,49 +223,57 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
- {
- if(newValue.target.value!=""){
- setMinDate(newValue.target.value);
- }
- }}
- InputLabelProps={{
- shrink: true
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label="Proof Issue Date (From)"
+ value={minDate === null ? null : dayjs(minDate)}
+ maxDate={maxDate === null ? null : dayjs(maxDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMinDate(newValue);
+ }
+ }}
+ />
+
+
-
- {
- if(newValue.target.value!=""){
- setMaxDate(newValue.target.value);
- }
- }}
- id="dateTo"
- type="date"
- label="Proof Issue Date (To)"
- defaultValue={searchCriteria.dateTo}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label="Proof Issue Date (To)"
+ value={maxDate === null ? null : dayjs(maxDate)}
+ minDate={minDate === null ? null : dayjs(minDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMaxDate(newValue);
+ }
+ }}
+ />
+
+
diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js
index 1e25c6e..94bc08f 100644
--- a/src/pages/Proof/Search_Public/SearchForm.js
+++ b/src/pages/Proof/Search_Public/SearchForm.js
@@ -15,25 +15,13 @@ import * as FormatUtils from "utils/FormatUtils";
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
import {FormattedMessage, useIntl} from "react-intl";
-import { makeStyles } from '@mui/styles';
-// ==============================|| 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"
- },
-}));
+import {DatePicker} from "@mui/x-date-pickers/DatePicker";
+import dayjs from "dayjs";
+import {DemoItem} from "@mui/x-date-pickers/internals/demo";
+import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
+import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
+// ==============================|| DASHBOARD - DEFAULT ||============================== //
const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
}) => {
const intl = useIntl();
@@ -58,50 +46,6 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
setToDateValue(maxDate);
}, [maxDate]);
- function FormDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(fromDateValue) == "Invalid Date" ?
- fromDateValue
- :
- DateUtils.dateStr(fromDateValue)}
-
-
-
- );
- }
-
- function ToDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(toDateValue) == "Invalid Date" ?
- toDateValue
- :
- DateUtils.dateStr(toDateValue)}
-
-
-
- );
- }
-
const _sx = {
padding: "4 2 4 2",
boxShadow: 1,
@@ -185,7 +129,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
+ " Vol. " + FormatUtils.zeroPad(volume, 3)
+ ", No. " + FormatUtils.zeroPad(issueNo, 2)
+ ", " + DateUtils.dateFormat(issueDate, "D MMM YYYY (ddd)");
- }
+ }
return (
- {
- if(newValue.target.value!=""){
- setMinDate(newValue.target.value);
- }
- }}
- InputLabelProps={{
- shrink: true
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label={intl.formatMessage({id: 'proofDateFrom'})}
+ value={minDate === null ? null : dayjs(minDate)}
+ maxDate={maxDate === null ? null : dayjs(maxDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMinDate(newValue);
+ }
+ }}
+ />
+
+
- {
- if(newValue.target.value!=""){
- setMaxDate(newValue.target.value);
- }
- }}
- id="dateTo"
- type="date"
- label={intl.formatMessage({id: 'proofDateTo'})}
- defaultValue={searchCriteria.dateTo}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label={intl.formatMessage({id: 'proofDateTo'})}
+ value={maxDate === null ? null : dayjs(maxDate)}
+ minDate={minDate === null ? null : dayjs(minDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMaxDate(newValue);
+ }
+ }}
+ />
+
+
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
index 2543195..db90902 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
@@ -16,27 +16,14 @@ import {
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
import {FormattedMessage, useIntl} from "react-intl";
-import { makeStyles } from '@mui/styles';
-// ==============================|| 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",
- width:"70%"
- },
-}));
+import {DatePicker} from "@mui/x-date-pickers/DatePicker";
+import dayjs from "dayjs";
+import {DemoItem} from "@mui/x-date-pickers/internals/demo";
+import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
+import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
+// ==============================|| DASHBOARD - DEFAULT ||============================== //
const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
const intl = useIntl();
const [type, setType] = React.useState([]);
@@ -59,50 +46,6 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
setToDateValue(maxDate);
}, [maxDate]);
- function FormDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(fromDateValue) == "Invalid Date" ?
- fromDateValue
- :
- DateUtils.dateStr(fromDateValue)}
-
-
-
- );
- }
-
- function ToDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(toDateValue) == "Invalid Date" ?
- toDateValue
- :
- DateUtils.dateStr(toDateValue)}
-
-
-
- );
- }
-
const onSubmit = (data) => {
data.status = status.type;
let typeArray = [];
@@ -166,53 +109,58 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
- {
- if(newValue.target.value!=""){
- setMinDate(newValue.target.value);
- }
- }}
- InputLabelProps={{
- shrink: true
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ aria-label={intl.formatMessage({id: 'submitDateFrom'})}
+ label={intl.formatMessage({id: 'submitDateFrom'})}
+ value={minDate === null ? null : dayjs(minDate)}
+ maxDate={maxDate === null ? null : dayjs(maxDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMinDate(newValue);
+ }
+ }}
+ />
+
+
-
+
- {
- if(newValue.target.value!=""){
- setMaxDate(newValue.target.value);
- }
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label={intl.formatMessage({id: 'submitDateTo'})}
+ value={maxDate === null ? null : dayjs(maxDate)}
+ minDate={minDate === null ? null : dayjs(minDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMaxDate(newValue);
+ }
+ }}
+ />
+
+
{isORGLoggedIn()?
diff --git a/src/pages/PublicNotice/Search_GLD/SearchForm.js b/src/pages/PublicNotice/Search_GLD/SearchForm.js
index 28556bb..fd08bf6 100644
--- a/src/pages/PublicNotice/Search_GLD/SearchForm.js
+++ b/src/pages/PublicNotice/Search_GLD/SearchForm.js
@@ -14,27 +14,13 @@ import * as FormatUtils from "utils/FormatUtils";
import { ThemeProvider } from "@emotion/react";
import { PNSPS_BUTTON_THEME } from "../../../themes/buttonConst";
import { useIntl } from "react-intl";
-import { makeStyles } from '@mui/styles';
+import {DatePicker} from "@mui/x-date-pickers/DatePicker";
+import dayjs from "dayjs";
+import {DemoItem} from "@mui/x-date-pickers/internals/demo";
+import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
+import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
// ==============================|| 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",
- width:"70%"
- },
-}));
-
const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, issueComboData
}) => {
@@ -59,50 +45,6 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
setToDateValue(maxDate);
}, [maxDate]);
- function FormDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(fromDateValue) == "Invalid Date" ?
- fromDateValue
- :
- DateUtils.dateStr(fromDateValue)}
-
-
-
- );
- }
-
- function ToDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(toDateValue) == "Invalid Date" ?
- toDateValue
- :
- DateUtils.dateStr(toDateValue)}
-
-
-
- );
- }
-
const intl = useIntl();
const { locale } = intl;
@@ -216,49 +158,57 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
- {
- if(newValue.target.value!=""){
- setMinDate(newValue.target.value);
- }
- }}
- InputLabelProps={{
- shrink: true
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label={"Submit Date (From)"}
+ value={minDate === null ? null : dayjs(minDate)}
+ maxDate={maxDate === null ? null : dayjs(maxDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMinDate(newValue);
+ }
+ }}
+ />
+
+
- {
- if(newValue.target.value!=""){
- setMaxDate(newValue.target.value);
- }
- }}
- id="dateTo"
- type="date"
- label={"Submit Date (To)"}
- defaultValue={searchCriteria.dateTo}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ // textField: {
+ // helperText: receiptFromErrorMessage,
+ // },
+ }}
+ format="DD/MM/YYYY"
+ label={"Submit Date (To)"}
+ value={maxDate === null ? null : dayjs(maxDate)}
+ minDate={minDate === null ? null : dayjs(minDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ if(newValue!=null){
+ setMaxDate(newValue);
+ }
+ }}
+ />
+
+
diff --git a/src/pages/Recon/SearchForm.js b/src/pages/Recon/SearchForm.js
index 22b0121..241512d 100644
--- a/src/pages/Recon/SearchForm.js
+++ b/src/pages/Recon/SearchForm.js
@@ -15,42 +15,28 @@ import * as ComboData from "utils/ComboData";
import * as DateUtils from "utils/DateUtils";
import Loadable from 'components/Loadable';
const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));
-import { makeStyles } from '@mui/styles';
+import {DatePicker} from "@mui/x-date-pickers/DatePicker";
+import dayjs from "dayjs";
+import {DemoItem} from "@mui/x-date-pickers/internals/demo";
+import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
+import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
// ==============================|| 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",
- width:"70%"
- },
-}));
-
-const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, onLoad }) => {
-
- const [sysTxnMinDate, setSysTxnMinDate] = React.useState(searchCriteria.dateFrom);
- const [sysTxnMaxDate, setsysTxnMaxDate] = React.useState(searchCriteria.dateTo);
- const [txnMinDate, setTxnMinDate] = React.useState(searchCriteria.dateFrom);
- const [txnMaxDate, setTxnMaxDate] = React.useState(searchCriteria.dateTo);
- const [collMinDate, setCollMinDate] = React.useState(searchCriteria.dateFrom);
- const [collMaxDate, setCollMaxDate] = React.useState(searchCriteria.dateTo);
-
- const [sysTxnFromDateValue, setSysTxnFromDateValue] = React.useState("dd / mm / yyyy");
- const [sysTxnToDateValue, setSysTxnToDateValue] = React.useState("dd / mm / yyyy");
- const [txnFromDateValue, setTxnFromDateValue] = React.useState("dd / mm / yyyy");
- const [txnToDateValue, setTxnToDateValue] = React.useState("dd / mm / yyyy");
- const [collFromDateValue, setCollFromDateValue] = React.useState("dd / mm / yyyy");
- const [collToDateValue, setCollToDateValue] = React.useState("dd / mm / yyyy");
+const SearchPublicNoticeForm = ({ applySearch, generateReport, onLoad }) => {
+
+ const [sysTxnMinDate, setSysTxnMinDate] = React.useState(null);
+ const [sysTxnMaxDate, setsysTxnMaxDate] = React.useState(null);
+ const [txnMinDate, setTxnMinDate] = React.useState(null);
+ const [txnMaxDate, setTxnMaxDate] = React.useState(null);
+ const [collMinDate, setCollMinDate] = React.useState(null);
+ const [collMaxDate, setCollMaxDate] = React.useState(null);
+
+ const [sysTxnFromDateValue, setSysTxnFromDateValue] = React.useState(null);
+ const [sysTxnToDateValue, setSysTxnToDateValue] = React.useState(null);
+ const [txnFromDateValue, setTxnFromDateValue] = React.useState(null);
+ const [txnToDateValue, setTxnToDateValue] = React.useState(null);
+ const [collFromDateValue, setCollFromDateValue] = React.useState(null);
+ const [collToDateValue, setCollToDateValue] = React.useState(null);
const [status, setStatus] = React.useState(ComboData.paymentStatus[0]);
const [method, setMethod] = React.useState(ComboData.paymentMethod[0]);
@@ -82,138 +68,6 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
setCollToDateValue(collMaxDate);
}, [collMaxDate]);
- function SysTxnFormDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(sysTxnFromDateValue) == "Invalid Date" ?
- sysTxnFromDateValue
- :
- DateUtils.dateStr(sysTxnFromDateValue)}
-
-
-
- );
- }
-
- function SysTxnToDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(sysTxnToDateValue) == "Invalid Date" ?
- sysTxnToDateValue
- :
- DateUtils.dateStr(sysTxnToDateValue)}
-
-
-
- );
- }
-
- function TxnFormDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(txnFromDateValue) == "Invalid Date" ?
- txnFromDateValue
- :
- DateUtils.dateStr(txnFromDateValue)}
-
-
-
- );
- }
-
- function TxnToDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(txnToDateValue) == "Invalid Date" ?
- txnToDateValue
- :
- DateUtils.dateStr(txnToDateValue)}
-
-
-
- );
- }
-
- function CollFormDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(collFromDateValue) == "Invalid Date" ?
- collFromDateValue
- :
- DateUtils.dateStr(collFromDateValue)}
-
-
-
- );
- }
-
- function CollToDateInputComponent({ inputRef, ...props }) {
- const classes = useStyles();
- return (
- <>
-
- {DateUtils.dateStr(collToDateValue) == "Invalid Date" ?
- collToDateValue
- :
- DateUtils.dateStr(collToDateValue)}
-
-
-
- );
- }
-
const onSubmit = () => {
let sentSysTxnDateFrom = "";
@@ -287,12 +141,12 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
}
const clearHandler = () => () => {
- setSysTxnMinDate(searchCriteria.dateFrom)
- setsysTxnMaxDate(searchCriteria.dateTo)
- setTxnMinDate(searchCriteria.dateFrom)
- setTxnMaxDate(searchCriteria.dateTo)
- setCollMinDate(searchCriteria.dateFrom)
- setCollMaxDate(searchCriteria.dateTo)
+ setSysTxnMinDate(null)
+ setsysTxnMaxDate(null)
+ setTxnMinDate(null)
+ setTxnMaxDate(null)
+ setCollMinDate(null)
+ setCollMaxDate(null)
setSysTxnFromDateValue("")
setSysTxnToDateValue("")
setTxnFromDateValue("")
@@ -382,45 +236,54 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
-
- {
- setSysTxnMinDate(newValue.target.value);
- }}
- InputLabelProps={{
- shrink: true
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ textField: {
+ // helperText: receiptFromErrorMessage,
+ InputLabelProps: { shrink: true }
+ },
+ }}
+ format="DD/MM/YYYY"
+ label="PNSPS Transaction Date (From)"
+ value={sysTxnMinDate === null ? null : dayjs(sysTxnMinDate)}
+ maxDate={sysTxnMaxDate === null ? null : dayjs(sysTxnMaxDate)}
+ onChange={(newValue) => {
+ setSysTxnMinDate(newValue);
+ }}
+ />
+
+
- {
- setsysTxnMaxDate(newValue.target.value);
- }}
- id="sysTxnDateTo"
- type="date"
- label="PNSPS Transaction Date (To)"
- ////defaultValue={searchCriteria.dateTo}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ textField: {
+ // helperText: receiptFromErrorMessage,
+ InputLabelProps: { shrink: true }
+ },
+ }}
+ format="DD/MM/YYYY"
+ label="PNSPS Transaction Date (To)"
+ value={sysTxnMaxDate === null ? null : dayjs(sysTxnMaxDate)}
+ minDate={sysTxnMinDate === null ? null : dayjs(sysTxnMinDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ setsysTxnMaxDate(newValue);
+ }}
+ />
+
+
@@ -430,45 +293,55 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
-
- {
- setTxnMinDate(newValue.target.value);
- }}
- InputLabelProps={{
- shrink: true
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ textField: {
+ // helperText: receiptFromErrorMessage,
+ InputLabelProps: { shrink: true }
+ },
+ }}
+ format="DD/MM/YYYY"
+ label="FI Transaction Date (From)"
+ value={txnMinDate === null ? null : dayjs(txnMinDate)}
+ maxDate={txnMaxDate === null ? null : dayjs(txnMaxDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ setTxnMinDate(newValue);
+ }}
+ />
+
+
- {
- setTxnMaxDate(newValue.target.value);
- }}
- id="txnDateTo"
- type="date"
- label="FI Transaction Date (To)"
- //defaultValue={searchCriteria.dateTo}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ textField: {
+ // helperText: receiptFromErrorMessage,
+ InputLabelProps: { shrink: true }
+ },
+ }}
+ format="DD/MM/YYYY"
+ label="FI Transaction Date (To)"
+ value={txnMaxDate === null ? null : dayjs(txnMaxDate)}
+ minDate={txnMinDate === null ? null : dayjs(txnMinDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ setTxnMaxDate(newValue);
+ }}
+ />
+
+
@@ -478,45 +351,55 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
-
- {
- setCollMinDate(newValue.target.value);
- }}
- InputLabelProps={{
- shrink: true
- }}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ textField: {
+ // helperText: receiptFromErrorMessage,
+ InputLabelProps: { shrink: true }
+ },
+ }}
+ format="DD/MM/YYYY"
+ label="Bank Credit Date (From)"
+ value={collMinDate === null ? null : dayjs(collMinDate)}
+ maxDate={collMaxDate === null ? null : dayjs(collMaxDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ setCollMinDate(newValue);
+ }}
+ />
+
+
- {
- setCollMaxDate(newValue.target.value);
- }}
- id="collDateTo"
- type="date"
- label="Bank Credit Date (To)"
- //defaultValue={searchCriteria.dateTo}
- sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
- />
+
+
+ setReceiptFromError(newError)}
+ slotProps={{
+ field: { readOnly: true, },
+ textField: {
+ // helperText: receiptFromErrorMessage,
+ InputLabelProps: { shrink: true }
+ },
+ }}
+ format="DD/MM/YYYY"
+ label="Bank Credit Date (To)"
+ value={collMaxDate === null ? null : dayjs(collMaxDate)}
+ minDate={collMinDate === null ? null : dayjs(collMinDate)}
+ onChange={(newValue) => {
+ // console.log(newValue)
+ setCollMaxDate(newValue);
+ }}
+ />
+
+
diff --git a/yarn.lock b/yarn.lock
index fce2684..1dcc279 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1480,32 +1480,32 @@
resolved "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz"
integrity sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==
-"@floating-ui/core@^1.4.2":
- version "1.5.0"
- resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.0.tgz"
- integrity sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==
+"@floating-ui/core@^1.0.0":
+ version "1.6.0"
+ resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz"
+ integrity sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==
dependencies:
- "@floating-ui/utils" "^0.1.3"
+ "@floating-ui/utils" "^0.2.1"
-"@floating-ui/dom@^1.5.1":
- version "1.5.3"
- resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.3.tgz"
- integrity sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==
+"@floating-ui/dom@^1.6.1":
+ version "1.6.3"
+ resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz"
+ integrity sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==
dependencies:
- "@floating-ui/core" "^1.4.2"
- "@floating-ui/utils" "^0.1.3"
+ "@floating-ui/core" "^1.0.0"
+ "@floating-ui/utils" "^0.2.0"
-"@floating-ui/react-dom@^2.0.2":
- version "2.0.2"
- resolved "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.2.tgz"
- integrity sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ==
+"@floating-ui/react-dom@^2.0.2", "@floating-ui/react-dom@^2.0.8":
+ version "2.0.8"
+ resolved "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz"
+ integrity sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==
dependencies:
- "@floating-ui/dom" "^1.5.1"
+ "@floating-ui/dom" "^1.6.1"
-"@floating-ui/utils@^0.1.3":
- version "0.1.6"
- resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz"
- integrity sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==
+"@floating-ui/utils@^0.2.0", "@floating-ui/utils@^0.2.1":
+ version "0.2.1"
+ resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz"
+ integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==
"@formatjs/ecma402-abstract@1.18.0":
version "1.18.0"
@@ -2027,7 +2027,7 @@
hey-listen "^1.0.8"
tslib "^2.3.1"
-"@mui/base@^5.0.0-alpha.87", "@mui/base@^5.0.0-beta.20", "@mui/base@5.0.0-beta.20":
+"@mui/base@^5.0.0-alpha.87", "@mui/base@5.0.0-beta.20":
version "5.0.0-beta.20"
resolved "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.20.tgz"
integrity sha512-CS2pUuqxST7ch9VNDCklRYDbJ3rru20Tx7na92QvVVKfu3RL4z/QLuVIc8jYGsdCnauMaeUSlFNLAJNb0yXe6w==
@@ -2040,6 +2040,19 @@
clsx "^2.0.0"
prop-types "^15.8.1"
+"@mui/base@^5.0.0-beta.22":
+ version "5.0.0-beta.40"
+ resolved "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.40.tgz"
+ integrity sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==
+ dependencies:
+ "@babel/runtime" "^7.23.9"
+ "@floating-ui/react-dom" "^2.0.8"
+ "@mui/types" "^7.2.14"
+ "@mui/utils" "^5.15.14"
+ "@popperjs/core" "^2.11.8"
+ clsx "^2.1.0"
+ prop-types "^15.8.1"
+
"@mui/core-downloads-tracker@^5.14.14":
version "5.14.14"
resolved "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.14.14.tgz"
@@ -2145,7 +2158,7 @@
resolved "https://registry.npmjs.org/@mui/types/-/types-7.2.14.tgz"
integrity sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ==
-"@mui/utils@^5.14.13", "@mui/utils@^5.14.14", "@mui/utils@^5.14.3", "@mui/utils@^5.15.14":
+"@mui/utils@^5.14.13", "@mui/utils@^5.14.14", "@mui/utils@^5.14.16", "@mui/utils@^5.14.3", "@mui/utils@^5.15.14":
version "5.15.14"
resolved "https://registry.npmjs.org/@mui/utils/-/utils-5.15.14.tgz"
integrity sha512-0lF/7Hh/ezDv5X7Pry6enMsbYyGKjADzvHyo3Qrc/SSlTsQ1VkbDMbH0m2t3OR5iIVLwMoxwM7yGd+6FCMtTFA==
@@ -2166,15 +2179,15 @@
prop-types "^15.8.1"
reselect "^4.1.8"
-"@mui/x-date-pickers@^6.11.0":
- version "6.16.3"
- resolved "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.16.3.tgz"
- integrity sha512-CBwXrOJ5blqkAdF0d1dWF1RMeCS6ZYDq+53Yf/r+Izqj33+SCw+wAbdrxuIxE2GL3JY5NszEx8JFnCKZIzFZuA==
+"@mui/x-date-pickers@^6.18.0":
+ version "6.19.9"
+ resolved "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.19.9.tgz"
+ integrity sha512-B2m4Fv/fOme5qmV6zuE3QnWQSvj3zKtI2OvikPz5prpiCcIxqpeytkQ7VfrWH3/Aqd5yhG1Yr4IgbqG0ymIXGg==
dependencies:
"@babel/runtime" "^7.23.2"
- "@mui/base" "^5.0.0-beta.20"
- "@mui/utils" "^5.14.14"
- "@types/react-transition-group" "^4.4.7"
+ "@mui/base" "^5.0.0-beta.22"
+ "@mui/utils" "^5.14.16"
+ "@types/react-transition-group" "^4.4.8"
clsx "^2.0.0"
prop-types "^15.8.1"
react-transition-group "^4.4.5"
@@ -2737,7 +2750,7 @@
dependencies:
"@types/react" "*"
-"@types/react-transition-group@^4.2.0", "@types/react-transition-group@^4.4.6", "@types/react-transition-group@^4.4.7":
+"@types/react-transition-group@^4.2.0", "@types/react-transition-group@^4.4.6", "@types/react-transition-group@^4.4.7", "@types/react-transition-group@^4.4.8":
version "4.4.8"
resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.8.tgz"
integrity sha512-QmQ22q+Pb+HQSn04NL3HtrqHwYMf4h3QKArOy5F8U5nEVMaihBs3SR10WiOM1iwPz5jIo8x/u11al+iEGZZrvg==
@@ -4464,10 +4477,10 @@ data-urls@^2.0.0:
whatwg-mimetype "^2.3.0"
whatwg-url "^8.0.0"
-date-fns@^2.25.0, date-fns@^3.0.6:
- version "3.0.6"
- resolved "https://registry.npmjs.org/date-fns/-/date-fns-3.0.6.tgz"
- integrity sha512-W+G99rycpKMMF2/YD064b2lE7jJGUe+EjOES7Q8BIGY8sbNdbgcs9XFTZwvzc9Jx1f3k7LB7gZaZa7f8Agzljg==
+"date-fns@^2.25.0 || ^3.2.0", date-fns@^3.0.6:
+ version "3.6.0"
+ resolved "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz"
+ integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==
dayjs@^1.10.7, dayjs@^1.11.9:
version "1.11.10"