From ea81f2260643e8c33a769c384c882b81ae999d71 Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Mon, 29 Apr 2024 11:04:00 +0800 Subject: [PATCH] org update --- .../DetailPage/OrganizationCard.js | 105 ++++++++-------- .../OrganizationCard_loadFromUser.js | 114 +++++++++--------- 2 files changed, 115 insertions(+), 104 deletions(-) diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js index 23e487e..b5f326e 100644 --- a/src/pages/Organization/DetailPage/OrganizationCard.js +++ b/src/pages/Organization/DetailPage/OrganizationCard.js @@ -40,9 +40,9 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { const [createMode, setCreateMode] = useState(false); const [onReady, setOnReady] = useState(false); const [errorMsg, setErrorMsg] = useState(""); - const [minDate] = React.useState(new Date()); - const [fromDate, setFromDate] = React.useState("dd / mm / yyyy"); - const [fromDateValue, setFromDateValue] = React.useState("dd / mm / yyyy"); + const [minDate] = React.useState(new Date().setDate(new Date().getDate() + 1)); + const [fromDate, setFromDate] = React.useState(null); + const [fromDateValue, setFromDateValue] = React.useState(null); const {register, handleSubmit, reset} = useForm() React.useEffect(() => { @@ -53,7 +53,11 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { //if state data are ready and assign to different field // console.log(currentApplicationDetailData) if (Object.keys(currentUserData).length > 0) { - setFromDate(currentUserData.brExpiryDate) + if(DateUtils.dateValue(currentUserData.brExpiryDate)>DateUtils.dateValue(minDate)){ + setFromDate(currentUserData.brExpiryDate); + }else{ + setErrorMsg("Please select a date after today.") + } setOnReady(true); } }, [currentUserData]); @@ -105,47 +109,49 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { setErrorMsg(intl.formatMessage({ id: 'pleaseFillInDistrict' })) } else { let sentDateFrom = ""; - if (fromDateValue != "dd / mm / yyyy") { + if (fromDateValue == null) { + setErrorMsg(intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' })) + }else{ sentDateFrom = DateUtils.dateValue(fromDateValue) + HttpUtils.post({ + url: UrlUtils.POST_ORG_SAVE_PATH, + params: { + id: id > 0 ? id : null, + enCompanyName: values.enCompanyName, + chCompanyName: values.chCompanyName, + orgShortName: values.creditor?values.orgShortName:"", + brNo: values.brNo, + // brExpiryDate: values.brExpiryDate, + brExpiryDate: sentDateFrom, + enCompanyNameTemp: values.enCompanyNameTemp, + chCompanyNameTemp: values.chCompanyNameTemp, + brExpiryDateTemp: values.brExpiryDateTemp, + contactPerson: values.contactPerson, + contactTel: { + countryCode: values.tel_countryCode, + phoneNumber: values.phoneNumber + }, + faxNo: { + countryCode: values.fax_countryCode, + faxNumber: values.faxNumber + }, + addressTemp: { + country: values.country.type, + district: values.district?.type, + addressLine1: values.addressLine1, + addressLine2: values.addressLine2, + addressLine3: values.addressLine3, + }, + creditor: values.creditor, + }, + onSuccess: function () { + notifySaveSuccess() + loadDataFun(); + setEditMode(false); + } + }); } - HttpUtils.post({ - url: UrlUtils.POST_ORG_SAVE_PATH, - params: { - id: id > 0 ? id : null, - enCompanyName: values.enCompanyName, - chCompanyName: values.chCompanyName, - orgShortName: values.creditor?values.orgShortName:"", - brNo: values.brNo, - // brExpiryDate: values.brExpiryDate, - brExpiryDate: sentDateFrom, - enCompanyNameTemp: values.enCompanyNameTemp, - chCompanyNameTemp: values.chCompanyNameTemp, - brExpiryDateTemp: values.brExpiryDateTemp, - contactPerson: values.contactPerson, - contactTel: { - countryCode: values.tel_countryCode, - phoneNumber: values.phoneNumber - }, - faxNo: { - countryCode: values.fax_countryCode, - faxNumber: values.faxNumber - }, - addressTemp: { - country: values.country.type, - district: values.district?.type, - addressLine1: values.addressLine1, - addressLine2: values.addressLine2, - addressLine3: values.addressLine3, - }, - creditor: values.creditor, - }, - onSuccess: function () { - notifySaveSuccess() - loadDataFun(); - setEditMode(false); - } - }); } } } @@ -387,25 +393,24 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { { - // console.log(DateUtils.dateValue(newValue)) - // console.log(DateUtils.dateValue(minDate)) - if(DateUtils.dateValue(newValue)>DateUtils.dateValue(minDate)){ + setErrorMsg("") + if(DateUtils.dateValue(newValue)>DateUtils.dateValue(new Date())){ setFromDate(newValue); }else{ - alert("Please select a date after today.") + setErrorMsg("Please select a date after today.") } }} /> diff --git a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js index 0165d92..c420839 100644 --- a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js +++ b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js @@ -38,15 +38,20 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => { const [isFailPopUp, setIsFailPopUp] = useState(false); const [failText, setFailText] = useState(""); const [errorMsg, setErrorMsg] = useState(""); - const [minDate] = React.useState(new Date()); - const [fromDate, setFromDate] = React.useState("dd / mm / yyyy"); - const [fromDateValue, setFromDateValue] = React.useState("dd / mm / yyyy"); + const [minDate] = React.useState(new Date().setDate(new Date().getDate() + 1)); + const [fromDate, setFromDate] = React.useState(null); + const [fromDateValue, setFromDateValue] = React.useState(null); useEffect(() => { //if state data are ready and assign to different field // console.log(currentApplicationDetailData) if (Object.keys(currentUserData).length > 0) { - setFromDate(currentUserData.brExpiryDate) + if(DateUtils.dateValue(currentUserData.brExpiryDate)>DateUtils.dateValue(minDate)){ + setFromDate(currentUserData.brExpiryDate); + }else{ + setErrorMsg("Please select a date after today.") + } + // setFromDate(currentUserData.brExpiryDate) setOnReady(true); } }, [currentUserData]); @@ -93,49 +98,51 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => { setErrorMsg(intl.formatMessage({ id: 'pleaseFillInDistrict' })) } else { let sentDateFrom = ""; - if (fromDateValue != "dd / mm / yyyy") { + if (fromDateValue == null) { + setErrorMsg(intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' })) + }else{ sentDateFrom = DateUtils.dateValue(fromDateValue) - } - - HttpUtils.post({ - url: UrlUtils.POST_ORG_SAVE_PATH, - params: { - id: null, - primaryUserId: userId, - enCompanyName: values.enCompanyName, - chCompanyName: values.chCompanyName, - brNo: values.brNo, - brExpiryDate: sentDateFrom, - enCompanyNameTemp: values.enCompanyNameTemp, - chCompanyNameTemp: values.chCompanyNameTemp, - brExpiryDateTemp: values.brExpiryDateTemp, - contactPerson: values.contactPerson, - contactTel: { - countryCode: values.tel_countryCode, - phoneNumber: values.phoneNumber - }, - faxNo: { - countryCode: values.fax_countryCode, - faxNumber: values.faxNumber + HttpUtils.post({ + url: UrlUtils.POST_ORG_SAVE_PATH, + params: { + id: null, + primaryUserId: userId, + enCompanyName: values.enCompanyName, + chCompanyName: values.chCompanyName, + brNo: values.brNo, + brExpiryDate: sentDateFrom, + enCompanyNameTemp: values.enCompanyNameTemp, + chCompanyNameTemp: values.chCompanyNameTemp, + brExpiryDateTemp: values.brExpiryDateTemp, + contactPerson: values.contactPerson, + contactTel: { + countryCode: values.tel_countryCode, + phoneNumber: values.phoneNumber + }, + faxNo: { + countryCode: values.fax_countryCode, + faxNumber: values.faxNumber + }, + addressTemp: { + country: values.country.type, + district: values.district?.type, + addressLine1: values.addressLine1, + addressLine2: values.addressLine2, + addressLine3: values.addressLine3, + } }, - addressTemp: { - country: values.country.type, - district: values.district?.type, - addressLine1: values.addressLine1, - addressLine2: values.addressLine2, - addressLine3: values.addressLine3, + onSuccess: function (responseData) { + if (responseData.msg) { + setFailText(responseData.msg); + setIsFailPopUp(true); + return; + } + navigate('/org/' + responseData.id); + notifyCreateSuccess() } - }, - onSuccess: function (responseData) { - if (responseData.msg) { - setFailText(responseData.msg); - setIsFailPopUp(true); - return; - } - navigate('/org/' + responseData.id); - notifyCreateSuccess() - } - }); + }); + } + } } } @@ -231,25 +238,24 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => { { - // console.log(DateUtils.dateValue(newValue)) - // console.log(DateUtils.dateValue(minDate)) - if(DateUtils.dateValue(newValue)>DateUtils.dateValue(minDate)){ + setErrorMsg("") + if(DateUtils.dateValue(newValue)>DateUtils.dateValue(new Date())){ setFromDate(newValue); }else{ - alert("Please select a date after today.") + setErrorMsg("Please select a date after today.") } }} />