From 34ba93d7b87ada7abe46c9d5d50a0960207298b8 Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Mon, 25 Sep 2023 13:00:37 +0800 Subject: [PATCH] add reload function --- .../ApplicationDetailCard.js | 58 +++++++++++++++---- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js b/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js index 1024572..f8709b0 100644 --- a/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js +++ b/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js @@ -39,7 +39,7 @@ import DownloadIcon from '@mui/icons-material/Download'; const ApplicationDetailCard = ( { applicationDetailData, setStatus, - setReload, + // setReload, isEditMode, setUpdateApplicationObject, setiIsSave, @@ -52,6 +52,8 @@ const ApplicationDetailCard = ( const [verified, setVerified] = useState(null); const [fileDetail, setfileDetail] = useState({}); const [onReady, setOnReady] = useState(false); + const [reload, setReload] = useState(false); + // const navigate = useNavigate() // const params = useParams(); @@ -72,20 +74,18 @@ const ApplicationDetailCard = ( }; const { register, - getValues + getValues, + // setValue } = useForm() useEffect(() => { //if user data from parent are not null // console.log(applicationDetailData) if (Object.keys(applicationDetailData).length > 0) { - setCurrentApplicationDetailData(applicationDetailData.data); - setCompanyName(applicationDetailData.companyName); - setVerified(applicationDetailData.userData.verifiedBy ? true : false) - setfileDetail(applicationDetailData.fileDetail); + loadApplicationDetail() } }, [applicationDetailData]); - + useEffect(() => { //if state data are ready and assign to different field // console.log(currentApplicationDetailData) @@ -94,6 +94,14 @@ const ApplicationDetailCard = ( } }, [currentApplicationDetailData]); + const loadApplicationDetail = () => { + setCurrentApplicationDetailData(applicationDetailData.data); + setCompanyName(applicationDetailData.companyName); + setVerified(applicationDetailData.userData.verifiedBy ? true : false) + setfileDetail(applicationDetailData.fileDetail); + setReload(false) + } + const onDownloadClick = () => () => { HttpUtils.fileDownload({ fileId: fileDetail.id, @@ -102,6 +110,12 @@ const ApplicationDetailCard = ( }); }; + useEffect(() => { + if (Object.keys(applicationDetailData).length > 0) { + loadApplicationDetail() + } + }, [reload]); + const reloadHandle = () => () => { setReload(true) setEditMode(false) @@ -183,9 +197,8 @@ const ApplicationDetailCard = ( : -
+ null } - } @@ -393,6 +406,18 @@ const ApplicationDetailCard = ( background: "#f8f8f8", }, }} + onChange={(event) => { + const value = event.target.value; + console.log(event) + if (value.match(/[^0-9]/)) { + return event.preventDefault(); + } + console.log("321") + // setValue(value); + }} + inputProps={{ + maxLength: 3, + }} /> @@ -409,6 +434,9 @@ const ApplicationDetailCard = ( background: "#f8f8f8", }, }} + inputProps={{ + maxLength: 11, + }} /> @@ -469,6 +497,9 @@ const ApplicationDetailCard = ( background: "#f8f8f8", }, }} + inputProps={{ + maxLength: 3, + }} /> @@ -485,6 +516,9 @@ const ApplicationDetailCard = ( background: "#f8f8f8", }, }} + inputProps={{ + maxLength: 8, + }} /> @@ -507,7 +541,7 @@ const ApplicationDetailCard = ( {fileDetail.filename} @@ -549,8 +583,8 @@ const ApplicationDetailCard = (