diff --git a/src/pages/AuditLog/AuditLogSearchForm.js b/src/pages/AuditLog/AuditLogSearchForm.js index 9eff05e..50c7005 100644 --- a/src/pages/AuditLog/AuditLogSearchForm.js +++ b/src/pages/AuditLog/AuditLogSearchForm.js @@ -34,6 +34,8 @@ const AuditLogSearchForm = ({ applySearch, searchCriteria}) => { const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom); const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo); const [onDownload, setOnDownload] = React.useState(false); + + const marginBottom = 2.5; const { reset, register, handleSubmit } = useForm() const onSubmit = (data) => { @@ -93,43 +95,50 @@ const AuditLogSearchForm = ({ applySearch, searchCriteria}) => { - - { - setMinDate(DateUtils.dateStr(newValue)); - }} - InputLabelProps={{ - shrink: true - }} - /> - + + + + { + setMinDate(DateUtils.dateStr(newValue)); + }} + InputLabelProps={{ + shrink: true + }} + /> + - - { - console.log(newValue) - setMaxDate(DateUtils.dateStr(newValue)); - }} - id="modifiedTo" - type="date" - label="Modified To" - defaultValue={searchCriteria.modifiedTo} - /> - + + To + + + { + console.log(newValue) + setMaxDate(DateUtils.dateStr(newValue)); + }} + id="modifiedTo" + type="date" + label="Modified To" + defaultValue={searchCriteria.modifiedTo} + /> + + + {/*last row*/} diff --git a/src/pages/Payment/Search_GLD/SearchForm.js b/src/pages/Payment/Search_GLD/SearchForm.js index 05eaf97..07ecc2d 100644 --- a/src/pages/Payment/Search_GLD/SearchForm.js +++ b/src/pages/Payment/Search_GLD/SearchForm.js @@ -22,6 +22,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { const [status, setStatus] = React.useState(ComboData.paymentStatus[0]); const { reset, register, handleSubmit } = useForm() + const marginBottom = 2.5; const onSubmit = (data) => { const temp = { @@ -46,7 +47,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { >
- + {/*row 1*/} @@ -56,94 +57,100 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { {/*row 2*/} - - - - - - { - setMinDate(DateUtils.dateStr(newValue)); - }} - InputLabelProps={{ - shrink: true - }} - /> - - - - { - setMaxDate(DateUtils.dateStr(newValue)); - }} - id="dateTo" - type="date" - label="Trans. Date To" - defaultValue={searchCriteria.dateTo} - /> - - - - - - - - options} - options={ComboData.paymentStatus} - value={status} - getOptionLabel={(option) => option.label} - inputValue={status?.label ? status?.label : ""} - onChange={(event, newValue) => { - if (newValue !== null) { - setStatus(newValue); - } - }} - renderInput={(params) => ( - - )} - InputLabelProps={{ - shrink: true - }} - /> - + + + + + + + + { + setMinDate(DateUtils.dateStr(newValue)); + }} + InputLabelProps={{ + shrink: true + }} + /> + + + To + + + { + setMaxDate(DateUtils.dateStr(newValue)); + }} + id="dateTo" + type="date" + label="Trans. Date To" + defaultValue={searchCriteria.dateTo} + /> + + + + + + + + + + options} + options={ComboData.paymentStatus} + value={status} + getOptionLabel={(option) => option.label} + inputValue={status?.label ? status?.label : ""} + onChange={(event, newValue) => { + if (newValue !== null) { + setStatus(newValue); + } + }} + renderInput={(params) => ( + + )} + InputLabelProps={{ + shrink: true + }} + /> + diff --git a/src/pages/Proof/Search_GLD/SearchForm.js b/src/pages/Proof/Search_GLD/SearchForm.js index f70070e..d3e9814 100644 --- a/src/pages/Proof/Search_GLD/SearchForm.js +++ b/src/pages/Proof/Search_GLD/SearchForm.js @@ -30,7 +30,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom); const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo); - + const marginBottom = 2.5; const { reset, register, handleSubmit } = useForm() const onSubmit = (data) => { @@ -177,40 +177,46 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss /> - - { - setMinDate(DateUtils.dateStr(newValue)); - }} - InputLabelProps={{ - shrink: true - }} - /> - - - - { - setMaxDate(DateUtils.dateStr(newValue)); - }} - id="dateTo" - type="date" - label="Proof Date(To)" - defaultValue={searchCriteria.dateTo} - /> + + + + { + setMinDate(DateUtils.dateStr(newValue)); + }} + InputLabelProps={{ + shrink: true + }} + /> + + + To + + + { + setMaxDate(DateUtils.dateStr(newValue)); + }} + id="dateTo" + type="date" + label="Proof Date(To)" + defaultValue={searchCriteria.dateTo} + /> + +