Browse Source

add min proof Deadline

master
Anna Ho 1 year ago
parent
commit
2f349561fe
3 changed files with 9 additions and 1 deletions
  1. +1
    -1
      src/pages/DemandNote/Search/SearchForm.js
  2. +7
    -0
      src/pages/Proof/Create_FromApp/ProofForm.js
  3. +1
    -0
      src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js

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

@@ -156,7 +156,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Organisation"
label="BR No./Organisation"
InputLabelProps={{ InputLabelProps={{
shrink: true shrink: true
}} }}


+ 7
- 0
src/pages/Proof/Create_FromApp/ProofForm.js View File

@@ -37,6 +37,9 @@ const FormPanel = ({ formData }) => {


const [saving, setSaving] = React.useState(false); const [saving, setSaving] = React.useState(false);


const [proofPaymentDeadlineMin, setProofPaymentDeadlineMin] = React.useState({});
const [reviseDeadlineMin, setReviseDeadlineMin] = React.useState({});

const navigate = useNavigate() const navigate = useNavigate()


React.useEffect(() => { React.useEffect(() => {
@@ -46,6 +49,8 @@ const FormPanel = ({ formData }) => {
setColumnPrice(ComboData.proofPrice[1]) setColumnPrice(ComboData.proofPrice[1])
formData['length'] = 18; formData['length'] = 18;
} }
setProofPaymentDeadlineMin(formData.proofPaymentDeadline);
setReviseDeadlineMin(formData.reviseDeadline);
} }
}, [formData]); }, [formData]);


@@ -206,6 +211,7 @@ const FormPanel = ({ formData }) => {
onChange={formik.handleChange} onChange={formik.handleChange}
name="reviseDeadline" name="reviseDeadline"
value={formik.values["reviseDeadline"]} value={formik.values["reviseDeadline"]}
InputProps={{ inputProps: { min: DateUtils.datetimeStr(reviseDeadlineMin) } }}
variant="outlined" variant="outlined"
sx={ sx={
{ {
@@ -232,6 +238,7 @@ const FormPanel = ({ formData }) => {
onChange={formik.handleChange} onChange={formik.handleChange}
name="proofPaymentDeadline" name="proofPaymentDeadline"
value={formik.values["proofPaymentDeadline"]} value={formik.values["proofPaymentDeadline"]}
InputProps={{ inputProps: { min: DateUtils.datetimeStr(proofPaymentDeadlineMin) } }}
variant="outlined" variant="outlined"
sx={ sx={
{ {


+ 1
- 0
src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js View File

@@ -119,6 +119,7 @@ const GazetteDetailCard = (
// size="large" // size="large"
variant="contained" variant="contained"
onClick={groupDetailClick()} onClick={groupDetailClick()}
disabled={applicationDetailData.data.status!="submitted"&&applicationDetailData.data.status!="reviewed"}
sx={{ sx={{
textTransform: 'capitalize', textTransform: 'capitalize',
alignItems: 'end' alignItems: 'end'


Loading…
Cancel
Save