From 2f349561feacceb45c519223ecfcc917f286e511 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Mon, 4 Mar 2024 10:27:53 +0800
Subject: [PATCH] add min proof Deadline

---
 src/pages/DemandNote/Search/SearchForm.js               | 2 +-
 src/pages/Proof/Create_FromApp/ProofForm.js             | 7 +++++++
 src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/DemandNote/Search/SearchForm.js b/src/pages/DemandNote/Search/SearchForm.js
index 6dbf6db..17b7c6e 100644
--- a/src/pages/DemandNote/Search/SearchForm.js
+++ b/src/pages/DemandNote/Search/SearchForm.js
@@ -156,7 +156,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                         }}
                                         renderInput={(params) => (
                                             <TextField {...params}
-                                                label="Organisation"
+                                                label="BR No./Organisation"
                                                 InputLabelProps={{
                                                     shrink: true
                                                 }}
diff --git a/src/pages/Proof/Create_FromApp/ProofForm.js b/src/pages/Proof/Create_FromApp/ProofForm.js
index 2df0c4d..3dd7336 100644
--- a/src/pages/Proof/Create_FromApp/ProofForm.js
+++ b/src/pages/Proof/Create_FromApp/ProofForm.js
@@ -37,6 +37,9 @@ const FormPanel = ({ formData }) => {
 
     const [saving, setSaving] = React.useState(false);
 
+    const [proofPaymentDeadlineMin, setProofPaymentDeadlineMin] = React.useState({});
+    const [reviseDeadlineMin, setReviseDeadlineMin] = React.useState({});
+
     const navigate = useNavigate()
 
     React.useEffect(() => {
@@ -46,6 +49,8 @@ const FormPanel = ({ formData }) => {
                 setColumnPrice(ComboData.proofPrice[1])
                 formData['length'] = 18;
             }
+            setProofPaymentDeadlineMin(formData.proofPaymentDeadline);
+            setReviseDeadlineMin(formData.reviseDeadline);
         }
     }, [formData]);
 
@@ -206,6 +211,7 @@ const FormPanel = ({ formData }) => {
                                 onChange={formik.handleChange}
                                 name="reviseDeadline"
                                 value={formik.values["reviseDeadline"]}
+                                InputProps={{ inputProps: { min: DateUtils.datetimeStr(reviseDeadlineMin) } }}
                                 variant="outlined"
                                 sx={
                                     {
@@ -232,6 +238,7 @@ const FormPanel = ({ formData }) => {
                                 onChange={formik.handleChange}
                                 name="proofPaymentDeadline"
                                 value={formik.values["proofPaymentDeadline"]}
+                                InputProps={{ inputProps: { min: DateUtils.datetimeStr(proofPaymentDeadlineMin) } }}
                                 variant="outlined"
                                 sx={
                                     {
diff --git a/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js b/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js
index c4e4b02..ba17d6e 100644
--- a/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js
+++ b/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js
@@ -119,6 +119,7 @@ const GazetteDetailCard = (
                                     // size="large"
                                     variant="contained"
                                     onClick={groupDetailClick()}
+                                    disabled={applicationDetailData.data.status!="submitted"&&applicationDetailData.data.status!="reviewed"}
                                     sx={{
                                         textTransform: 'capitalize',
                                         alignItems: 'end'