alex
/
PNSPS-frontend-MaterialUI
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

org update

master
Alex Cheung 1 year ago
parent
41fe6299bd
commit
ea81f22606
2 changed files with 115 additions and 104 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +55
    -50
      src/pages/Organization/DetailPage/OrganizationCard.js
  2. +60
    -54
      src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js

+ 55
- 50
src/pages/Organization/DetailPage/OrganizationCard.js View File

@@ -40,9 +40,9 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
const [createMode, setCreateMode] = useState(false); const [createMode, setCreateMode] = useState(false);
const [onReady, setOnReady] = useState(false); const [onReady, setOnReady] = useState(false);
const [errorMsg, setErrorMsg] = 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);
const {register, handleSubmit, reset} = useForm() const {register, handleSubmit, reset} = useForm()


React.useEffect(() => { React.useEffect(() => {
@@ -53,7 +53,11 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
//if state data are ready and assign to different field //if state data are ready and assign to different field
// console.log(currentApplicationDetailData) // console.log(currentApplicationDetailData)
if (Object.keys(currentUserData).length > 0) { 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); setOnReady(true);
} }
}, [currentUserData]); }, [currentUserData]);
@@ -105,47 +109,49 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
setErrorMsg(intl.formatMessage({ id: 'pleaseFillInDistrict' })) setErrorMsg(intl.formatMessage({ id: 'pleaseFillInDistrict' }))
} else { } else {
let sentDateFrom = ""; let sentDateFrom = "";
if (fromDateValue != "dd / mm / yyyy") {
if (fromDateValue == null) {
setErrorMsg(intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' }))
}else{
sentDateFrom = DateUtils.dateValue(fromDateValue) 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 }) => {
<DatePicker <DatePicker
id="brExpiryDate" id="brExpiryDate"
name="brExpiryDate" name="brExpiryDate"
onError={Boolean(formik.errors["brExpiryDate"])}
// onError={Boolean(formik.errors["brExpiryDate"])}
slotProps={{ slotProps={{
field: { readOnly: true, }, field: { readOnly: true, },
textField: { textField: {
helperText:formik.errors["brExpiryDate"] ? formik.errors["brExpiryDate"] : ''
helperText:fromDate == null ? intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' }):""
}, },
}} }}
format="DD/MM/YYYY" format="DD/MM/YYYY"
// label={"Submit Date (From)"} // label={"Submit Date (From)"}
value={fromDate === null ? null : dayjs(fromDate)}
minDate={minDate === null ? null : dayjs(minDate)}
value={fromDate == null ? null : dayjs(fromDate)}
minDate={minDate == null ? null : dayjs(minDate)}
disabled={(!editMode && !createMode)} disabled={(!editMode && !createMode)}
onChange={(newValue) => { onChange={(newValue) => {
// 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); setFromDate(newValue);
}else{ }else{
alert("Please select a date after today.")
setErrorMsg("Please select a date after today.")
} }
}} }}
/> />


+ 60
- 54
src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js View File

@@ -38,15 +38,20 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => {
const [isFailPopUp, setIsFailPopUp] = useState(false); const [isFailPopUp, setIsFailPopUp] = useState(false);
const [failText, setFailText] = useState(""); const [failText, setFailText] = useState("");
const [errorMsg, setErrorMsg] = 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(() => { useEffect(() => {
//if state data are ready and assign to different field //if state data are ready and assign to different field
// console.log(currentApplicationDetailData) // console.log(currentApplicationDetailData)
if (Object.keys(currentUserData).length > 0) { 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); setOnReady(true);
} }
}, [currentUserData]); }, [currentUserData]);
@@ -93,49 +98,51 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => {
setErrorMsg(intl.formatMessage({ id: 'pleaseFillInDistrict' })) setErrorMsg(intl.formatMessage({ id: 'pleaseFillInDistrict' }))
} else { } else {
let sentDateFrom = ""; let sentDateFrom = "";
if (fromDateValue != "dd / mm / yyyy") {
if (fromDateValue == null) {
setErrorMsg(intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' }))
}else{
sentDateFrom = DateUtils.dateValue(fromDateValue) 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 }) => {
<DatePicker <DatePicker
id="brExpiryDate" id="brExpiryDate"
name="brExpiryDate" name="brExpiryDate"
onError={Boolean(formik.errors["brExpiryDate"])}
// onError={Boolean(formik.errors["brExpiryDate"])}
slotProps={{ slotProps={{
field: { readOnly: true, }, field: { readOnly: true, },
textField: {
helperText:formik.errors["brExpiryDate"] ? formik.errors["brExpiryDate"] : ''
},
// textField: {
// helperText:formik.errors["brExpiryDate"] ? formik.errors["brExpiryDate"] : ''
// },
}} }}
format="DD/MM/YYYY" format="DD/MM/YYYY"
// label={"Submit Date (From)"} // label={"Submit Date (From)"}
value={fromDate === null ? null : dayjs(fromDate)}
minDate={minDate === null ? null : dayjs(minDate)}
value={fromDate == null ? null : dayjs(fromDate)}
minDate={minDate == null ? null : dayjs(minDate)}
// disabled={(!editMode && !createMode)} // disabled={(!editMode && !createMode)}
onChange={(newValue) => { onChange={(newValue) => {
// 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); setFromDate(newValue);
}else{ }else{
alert("Please select a date after today.")
setErrorMsg("Please select a date after today.")
} }
}} }}
/> />


Write Preview
Loading…
Cancel
Save