From 4dca798a3a5a7614c1ee7c61e99dbff91743498b Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 17 Jun 2024 14:02:57 +0800 Subject: [PATCH] disable 15:00 Scheduled, add send mail Button --- .../DetailPage/OrganizationCard.js | 97 ++++++++++++------- src/utils/ApiPathConst.js | 1 + 2 files changed, 61 insertions(+), 37 deletions(-) diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js index 47c28bf..cfc8414 100644 --- a/src/pages/Organization/DetailPage/OrganizationCard.js +++ b/src/pages/Organization/DetailPage/OrganizationCard.js @@ -24,11 +24,11 @@ import { PNSPS_BUTTON_THEME } from "themes/buttonConst"; import { ThemeProvider } from "@emotion/react"; import { isGrantedAny } from "auth/utils"; -import {DatePicker} from "@mui/x-date-pickers/DatePicker"; +import { DatePicker } from "@mui/x-date-pickers/DatePicker"; import dayjs from "dayjs"; -import {DemoItem} from "@mui/x-date-pickers/internals/demo"; -import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider"; -import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs"; +import { DemoItem } from "@mui/x-date-pickers/internals/demo"; +import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider"; +import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; // ==============================|| DASHBOARD - DEFAULT ||============================== // const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { const intl = useIntl(); @@ -44,7 +44,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { const [fromDate, setFromDate] = React.useState(null); const [currentFromDate, setCurrentFromDate] = React.useState(null); const [fromDateValue, setFromDateValue] = React.useState(null); - const {register, handleSubmit, reset} = useForm() + const { register, handleSubmit, reset } = useForm() React.useEffect(() => { setFromDateValue(fromDate); @@ -55,13 +55,13 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { // console.log(currentApplicationDetailData) if (Object.keys(currentUserData).length > 0) { console.log(currentUserData) - if(DateUtils.dateValue(currentUserData.brExpiryDate)>DateUtils.dateValue(minDate)){ + if (DateUtils.dateValue(currentUserData.brExpiryDate) > DateUtils.dateValue(minDate)) { setFromDate(currentUserData.brExpiryDate); - }else{ + } else { setCurrentFromDate(currentUserData.brExpiryDate); // setErrorMsg("Please select a date after today.") } - + setOnReady(true); } }, [currentUserData]); @@ -115,7 +115,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { let sentDateFrom = ""; if (fromDateValue == null) { setErrorMsg(intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' })) - }else{ + } else { sentDateFrom = DateUtils.dateValue(fromDateValue) HttpUtils.post({ url: UrlUtils.POST_ORG_SAVE_PATH, @@ -123,7 +123,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { id: id > 0 ? id : null, enCompanyName: values.enCompanyName, chCompanyName: values.chCompanyName, - orgShortName: values.orgShortName==="N/A"?"":values.orgShortName, + orgShortName: values.orgShortName === "N/A" ? "" : values.orgShortName, brNo: values.brNo, // brExpiryDate: values.brExpiryDate, brExpiryDate: sentDateFrom, @@ -188,9 +188,9 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { const onSubmit = (data) => { let sentOrgShortName = ""; - if(data.orgShortName!=null && data.orgShortName!="" && data.orgShortName!="N/A"){ - sentOrgShortName = data.orgShortName - if (sentOrgShortName.length <=24){ + if (data.orgShortName != null && data.orgShortName != "" && data.orgShortName != "N/A") { + sentOrgShortName = data.orgShortName + if (sentOrgShortName.length <= 24) { const temp = { orgShortName: sentOrgShortName, }; @@ -230,6 +230,16 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { }); } + const sendDn_terminationOfCredit = () => { + setNonCreditorConfirmPopUp(false); + HttpUtils.get({ + url: UrlUtils.GET_SEND_TERMINATION_OF_CREDIT + "/" + id, + onSuccess: () => { + loadDataFun(); + } + }); + } + return ( { : - - - - - + <> + + + + + + + + + + + } } @@ -396,18 +419,18 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {FieldUtils.notNullFieldLabel("Expiry Date:")} - {(!editMode && !createMode)? + {(!editMode && !createMode) ? : + /> : - + { onChange={(newValue) => { // console.log(newValue) // setErrorMsg("") - if(DateUtils.dateValue(newValue)>DateUtils.dateValue(new Date())){ + if (DateUtils.dateValue(newValue) > DateUtils.dateValue(new Date())) { setFromDate(newValue); - }else{ + } else { // setErrorMsg("Please select a date after today.") } }} @@ -438,19 +461,19 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { } { - fromDate==null? - (!editMode && !createMode)? + fromDate == null ? + (!editMode && !createMode) ? Please select a date after today. - : + : {intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' })} - : + : null - - } + + } @@ -566,7 +589,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {...register("orgShortName")} id='orgShortName' label="Organisation Short Name" - defaultValue={currentUserData.orgShortName!="N/A"?currentUserData.orgShortName:""} + defaultValue={currentUserData.orgShortName != "N/A" ? currentUserData.orgShortName : ""} InputLabelProps={{ shrink: true }} diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js index 79fb31a..5fb5032 100644 --- a/src/utils/ApiPathConst.js +++ b/src/utils/ApiPathConst.js @@ -42,6 +42,7 @@ export const GET_ORG_COMBO = apiPath+'/org/combo'; export const GET_ORG_CHECK_CREDITOR = apiPath+'/org/check-creditor'; export const GET_ORG_MARK_AS_CREDITOR = apiPath+'/org/mark-as-creditor'; export const GET_ORG_MARK_AS_NON_CREDITOR = apiPath+'/org/mark-as-non-creditor'; +export const GET_SEND_TERMINATION_OF_CREDIT = apiPath+'/org/sendDn_terminationOfCredit'; export const GET_ORG_EXPORT = apiPath+'/org/export'; //public