diff --git a/src/pages/OrganizationDetailPage/OrganizationCard.js b/src/pages/OrganizationDetailPage/OrganizationCard.js index 77bbdf7..c49f85b 100644 --- a/src/pages/OrganizationDetailPage/OrganizationCard.js +++ b/src/pages/OrganizationDetailPage/OrganizationCard.js @@ -12,15 +12,28 @@ import * as HttpUtils from '../../utils/HttpUtils'; import * as UrlUtils from "../../utils/ApiPathConst"; import * as FieldUtils from "../../utils/FieldUtils"; import * as ComboData from "../../utils/ComboData"; +const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent'))); +import Loadable from 'components/Loadable'; +import { lazy } from 'react'; // ==============================|| DASHBOARD - DEFAULT ||============================== // const OrganizationCard = ({ userData, loadDataFun, id }) => { - const [currentUserData, setCurrentUserData] = useState(userData); + const [currentUserData, setCurrentUserData] = useState({}); const [editMode, setEditMode] = useState(false); const [createMode, setCreateMode] = useState(false); + const [onReady, setOnReady] = useState(false); + + useEffect(() => { + //if state data are ready and assign to different field + // console.log(currentApplicationDetailData) + if (Object.keys(currentUserData).length > 0) { + setOnReady(true); + } + }, [currentUserData]); + const formik = useFormik({ enableReinitialize: true, @@ -78,18 +91,21 @@ const OrganizationCard = ({ userData, loadDataFun, id }) => { }); useEffect(() => { - setCreateMode(id <= 0); - setEditMode(id <= 0); - setCurrentUserData(userData); - }, [userData]); - - useEffect(() => { - if(userData.creditor === undefined||userData.creditor === null){ - userData.creditor = false + if (Object.keys(userData).length > 0) { + setCreateMode(id <= 0); + setEditMode(id <= 0); + setCurrentUserData(userData); } - setCurrentUserData(userData); - }, []); + }, [userData]); + // useEffect(() => { + // if (Object.keys(userData).length > 0) { + // if(userData.creditor === undefined||userData.creditor === null){ + // userData.creditor = false + // } + // setCurrentUserData(userData); + // } + // }, []); const onEditClick = () => { setEditMode(true); @@ -177,124 +193,126 @@ const OrganizationCard = ({ userData, loadDataFun, id }) => { {/*top*/} - - - - + {!onReady? + + : + + + + {FieldUtils.getTextField({ + label: FieldUtils.notNullFieldLabel("BR No.:"), + valueName: "brNo", + disabled: (!editMode && !createMode), + form: formik + })} + + + + } + label="is Creditor" + name="creditor" + onChange={formik.handleChange} + disabled={!editMode && !createMode} + /> + + + + + + {FieldUtils.getTextField({ + label: FieldUtils.notNullFieldLabel("Name (Eng):"), + valueName: "enCompanyName", + disabled: (!editMode && !createMode), + form: formik + })} + + + {FieldUtils.getTextField({ - label: FieldUtils.notNullFieldLabel("BR No.:"), - valueName: "brNo", + label: "Name (Ch):", + valueName: "chCompanyName", disabled: (!editMode && !createMode), form: formik })} - - - - } - label="is Creditor" - name="creditor" - onChange={formik.handleChange} - disabled={!editMode && !createMode} - /> - + - + + {FieldUtils.getDateField({ + label: FieldUtils.notNullFieldLabel("Expiry Date:"), + valueName: "brExpiryDate", + disabled: (!editMode && !createMode), + form: formik + })} + - + {FieldUtils.getTextField({ - label: FieldUtils.notNullFieldLabel("Name (Eng):"), - valueName: "enCompanyName", + label: FieldUtils.notNullFieldLabel("Contact Person:"), + valueName: "contactPerson", disabled: (!editMode && !createMode), form: formik })} - - - - {FieldUtils.getTextField({ - label: "Name (Ch):", - valueName: "chCompanyName", - disabled: (!editMode && !createMode), - form: formik - })} - - - - {FieldUtils.getDateField({ - label: FieldUtils.notNullFieldLabel("Expiry Date:"), - valueName: "brExpiryDate", - disabled: (!editMode && !createMode), - form: formik - })} - - - - {FieldUtils.getTextField({ - label: FieldUtils.notNullFieldLabel("Contact Person:"), - valueName: "contactPerson", - disabled: (!editMode && !createMode), - form: formik - })} - + + + + {FieldUtils.getPhoneField({ + label: FieldUtils.notNullFieldLabel("Contact Tel:"), + valueName: { + code: "tel_countryCode", + num: "phoneNumber" + }, + disabled: (!editMode && !createMode), + form: formik + })} + + + + {FieldUtils.getPhoneField({ + label: "Fax No:", + valueName: { + code: "fax_countryCode", + num: "faxNumber" + }, + disabled: (!editMode && !createMode), + form: formik + })} + - - {FieldUtils.getPhoneField({ - label: FieldUtils.notNullFieldLabel("Contact Tel:"), - valueName: { - code: "tel_countryCode", - num: "phoneNumber" - }, - disabled: (!editMode && !createMode), - form: formik - })} - + + {FieldUtils.getComboField({ + label: FieldUtils.notNullFieldLabel("Country:"), + valueName: "country", + disabled: (!editMode && !createMode), + dataList: ComboData.country, + form: formik + })} + - - {FieldUtils.getPhoneField({ - label: "Fax No:", - valueName: { - code: "fax_countryCode", - num: "faxNumber" - }, - disabled: (!editMode && !createMode), - form: formik - })} - + + {FieldUtils.getComboField({ + label: FieldUtils.notNullFieldLabel("District:"), + valueName: "district", + disabled: (!editMode && !createMode), + dataList: ComboData.district, + form: formik + })} + - - {FieldUtils.getComboField({ - label: FieldUtils.notNullFieldLabel("Country:"), - valueName: "country", - disabled: (!editMode && !createMode), - dataList: ComboData.country, - form: formik - })} - - - {FieldUtils.getComboField({ - label: FieldUtils.notNullFieldLabel("District:"), - valueName: "district", - disabled: (!editMode && !createMode), - dataList: ComboData.district, - form: formik - })} - + + {FieldUtils.getAddressField({ + label: FieldUtils.notNullFieldLabel("Address:"), + valueName: ["addressLine1", "addressLine2", "addressLine3"], + disabled: (!editMode && !createMode), + form: formik + })} + + - - {FieldUtils.getAddressField({ - label: FieldUtils.notNullFieldLabel("Address:"), - valueName: ["addressLine1", "addressLine2", "addressLine3"], - disabled: (!editMode && !createMode), - form: formik - })} - - - - - + } ); diff --git a/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js b/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js index 68a05b6..078fcee 100644 --- a/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js +++ b/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js @@ -12,6 +12,9 @@ import * as FieldUtils from "../../utils/FieldUtils"; import * as ComboData from "../../utils/ComboData"; import { useNavigate } from "react-router-dom"; import { useFormik } from 'formik'; +const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent'))); +import Loadable from 'components/Loadable'; +import { lazy } from 'react'; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -19,8 +22,16 @@ import { useFormik } from 'formik'; const OrganizationCard_loadFromUser = ({ userData, userId }) => { const [currentUserData, setCurrentUserData] = useState(userData); - const navigate = useNavigate(); + const [onReady, setOnReady] = useState(false); + + useEffect(() => { + //if state data are ready and assign to different field + // console.log(currentApplicationDetailData) + if (Object.keys(currentUserData).length > 0) { + setOnReady(true); + } + }, [currentUserData]); const formik = useFormik({ enableReinitialize: true, @@ -76,7 +87,9 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => { }); useEffect(() => { - setCurrentUserData(userData); + if (Object.keys(userData).length > 0) { + setCurrentUserData(userData); + } }, [userData]); return ( @@ -96,7 +109,9 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => {
- + {!onReady? + + : {/*top*/} @@ -209,6 +224,7 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => { })} + }
diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js index f34b86a..b0d3895 100644 --- a/src/pages/authentication/auth-forms/CustomFormWizard.js +++ b/src/pages/authentication/auth-forms/CustomFormWizard.js @@ -364,8 +364,10 @@ const CustomFormWizard = (props) => { function handleIdNo(idNo,selectedIdDocType,checkDigit) { var pattern = /^[A-Z][0-9]*$/; var space = /\s/; - if (!idNo.match(pattern)&&selectedIdDocType=="HKID" - &&!checkDigit=="") { + if (!idNo.match(pattern)) { + return false; + }else if + (selectedIdDocType=="HKID"&&checkDigit==""){ return false; } else if (idNo.match(space)) { diff --git a/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js b/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js index 3087526..f46e30e 100644 --- a/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js +++ b/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js @@ -12,7 +12,9 @@ import * as FieldUtils from "../../utils/FieldUtils"; import * as HttpUtils from '../../utils/HttpUtils'; import * as UrlUtils from "../../utils/ApiPathConst"; import * as ComboData from "../../utils/ComboData"; - +const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent'))); +import Loadable from 'components/Loadable'; +import { lazy } from 'react'; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -21,7 +23,16 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => { const [currentUserData, setCurrentUserData] = useState(formData); const [editMode, setEditMode] = useState(false); const [locked, setLocked] = useState(false); + const [onReady, setOnReady] = useState(false); + useEffect(() => { + //if state data are ready and assign to different field + // console.log(currentApplicationDetailData) + if (Object.keys(currentUserData).length > 0) { + setOnReady(true); + } + }, [currentUserData]); + const formik = useFormik({ enableReinitialize: true, initialValues: currentUserData, @@ -78,7 +89,9 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => { useEffect(() => { - setCurrentUserData(formData); + if (Object.keys(formData).length > 0) { + setCurrentUserData(formData); + } }, [formData]); useEffect(() => { @@ -121,379 +134,382 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => { border={false} content={false} > + {!onReady? + + : +
+ + {/*top button*/} + + + + {editMode ? + <> + + + - - - {/*top button*/} - - - - {editMode ? - <> - - - - - - - - - : - <> - - - - - } + + + + + : + <> + + + + + } + - - {/*end top button*/} - - - - - {FieldUtils.getTextField({ - label: "Username:", - valueName: "username", - disabled: true, - form: formik - })} - + {/*end top button*/} - - {FieldUtils.getTextField({ - label: "English Name:", - valueName: "enName", - disabled: (!editMode), - form: formik - })} - + - - {FieldUtils.getTextField({ - label: "Created Date:", - valueName: "createDate", - disabled: true, - form: formik - })} - - - {FieldUtils.getTextField({ - label: "Prefix:", - valueName: "prefix", - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Username:", + valueName: "username", + disabled: true, + form: formik + })} + - - {FieldUtils.getTextField({ - label: "Chinese Name:", - valueName: "chName", - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "English Name:", + valueName: "enName", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getTextField({ - label: "Last Updated:", - valueName: "modifieDate", - disabled: true, - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Created Date:", + valueName: "createDate", + disabled: true, + form: formik + })} + + + {FieldUtils.getTextField({ + label: "Prefix:", + valueName: "prefix", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getComboField({ - label: "ID Type:", - valueName: "idDocType", - disabled: (!editMode), - dataList: ComboData.idDocType, - filterOptions: (options) => options, - getOptionLabel: (item) => item ? typeof item === 'string' ? item : (item["type"] ? item["type"] + "-" + item["label"] : "") : "", - onInputChange: (event, newValue, setInputValue) => { - if (newValue == null) { - setInputValue(""); - } - let _val = newValue.split("-"); - if (_val[0]) { - setInputValue(_val[0]); - } - }, - onChange: (event, newValue) => { - if (newValue == null) { - formik.setFieldValue("idDocType", ""); - return; - } - formik.setFieldValue("idDocType", newValue.type); - }, - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Chinese Name:", + valueName: "chName", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getPhoneField({ - label: "Contact Tel:", - valueName: { - code: "tel_countryCode", - num: "phoneNumber" - }, - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Last Updated:", + valueName: "modifieDate", + disabled: true, + form: formik + })} + - - - - Verified: - + + {FieldUtils.getComboField({ + label: "ID Type:", + valueName: "idDocType", + disabled: (!editMode), + dataList: ComboData.idDocType, + filterOptions: (options) => options, + getOptionLabel: (item) => item ? typeof item === 'string' ? item : (item["type"] ? item["type"] + "-" + item["label"] : "") : "", + onInputChange: (event, newValue, setInputValue) => { + if (newValue == null) { + setInputValue(""); + } + let _val = newValue.split("-"); + if (_val[0]) { + setInputValue(_val[0]); + } + }, + onChange: (event, newValue) => { + if (newValue == null) { + formik.setFieldValue("idDocType", ""); + return; + } + formik.setFieldValue("idDocType", newValue.type); + }, + form: formik + })} + + + {FieldUtils.getPhoneField({ + label: "Contact Tel:", + valueName: { + code: "tel_countryCode", + num: "phoneNumber" + }, + disabled: (!editMode), + form: formik + })} + - { - currentUserData.verifiedBy || editMode ? - - {FieldUtils.initField({ - valueName: "verifiedStatus", - disabled: true, - form: formik, - })} - - : - <> - + + + + Verified: + + + + { + currentUserData.verifiedBy || editMode ? + {FieldUtils.initField({ valueName: "verifiedStatus", disabled: true, form: formik, })} - - - - - } - - - - - - - - ID No.: - - - - - {formik.values.idDocType == "HKID" ? + : <> - + {FieldUtils.initField({ - valueName: "identification", - disabled: (!editMode), + valueName: "verifiedStatus", + disabled: true, form: formik, - placeholder: "證件號碼", - inputProps: { - maxLength: 7, - onKeyDown: (e) => { - if (e.key === 'Enter') { - e.preventDefault(); - } - }, - } })} - - + + + + + } + + + + + + + + ID No.: + + + + + {formik.values.idDocType == "HKID" ? + <> + + {FieldUtils.initField({ + valueName: "identification", + disabled: (!editMode), + form: formik, + placeholder: "證件號碼", + inputProps: { + maxLength: 7, + onKeyDown: (e) => { + if (e.key === 'Enter') { + e.preventDefault(); + } + }, + } + })} + + + + {FieldUtils.initField({ + valueName: "checkDigit", + disabled: (!editMode), + form: formik + })} + + : + {FieldUtils.initField({ - valueName: "checkDigit", + valueName: "identification", disabled: (!editMode), form: formik })} - : - - {FieldUtils.initField({ - valueName: "identification", - disabled: (!editMode), - form: formik - })} - - } + } + - - - {FieldUtils.getPhoneField({ - label: "Fax No.:", - valueName: { - code: "fax_countryCode", - num: "faxNumber" - }, - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getPhoneField({ + label: "Fax No.:", + valueName: { + code: "fax_countryCode", + num: "faxNumber" + }, + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getTextField({ - label: "Last Login:", - valueName: "lastLoginDate", - disabled: true, - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Last Login:", + valueName: "lastLoginDate", + disabled: true, + form: formik + })} + - - {FieldUtils.getComboField({ - label: "Country:", - valueName: "country", - dataList: ComboData.country, - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getComboField({ + label: "Country:", + valueName: "country", + dataList: ComboData.country, + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getTextField({ - label: "Email:", - valueName: "emailAddress", - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Email:", + valueName: "emailAddress", + disabled: (!editMode), + form: formik + })} + - - - - Status: - + + + + Status: + - { - editMode ? - - {FieldUtils.initField({ - valueName: "status", - disabled: true, - form: formik, - })} - - : - <> - + { + editMode ? + {FieldUtils.initField({ valueName: "status", disabled: true, form: formik, })} - {locked ? - - - - : - - + : + <> + + {FieldUtils.initField({ + valueName: "status", + disabled: true, + form: formik, + })} - } - - } + {locked ? + + + + : + + + + } + + } + - - - {FieldUtils.getAddressField({ - label: "Address:", - valueName: ["addressLine1", "addressLine2", "addressLine3"], - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getAddressField({ + label: "Address:", + valueName: ["addressLine1", "addressLine2", "addressLine3"], + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getComboField({ - label: "District:", - valueName: "district", - dataList: ComboData.district, - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getComboField({ + label: "District:", + valueName: "district", + dataList: ComboData.district, + disabled: (!editMode), + form: formik + })} + - + - + + } ); }; diff --git a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js index 08086ab..3958686 100644 --- a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js +++ b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js @@ -13,7 +13,9 @@ import * as ComboData from "../../utils/ComboData"; import { useFormik } from 'formik'; import * as yup from 'yup'; - +const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent'))); +import Loadable from 'components/Loadable'; +import { lazy } from 'react'; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -26,6 +28,15 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => const [confirmText, setConfirmText] = React.useState(""); const [confirmAction, setConfirmAction] = React.useState(); const [editMode, setEditMode] = React.useState(false); + const [onReady, setOnReady] = React.useState(false); + + React.useEffect(() => { + //if state data are ready and assign to different field + // console.log(currentApplicationDetailData) + if (Object.keys(currentUserData).length > 0) { + setOnReady(true); + } + }, [currentUserData]); const formik = useFormik({ enableReinitialize: true, @@ -84,7 +95,9 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => React.useEffect(() => { - setCurrentUserData(userData); + if (Object.keys(userData).length > 0) { + setCurrentUserData(userData); + } }, [userData]); const onEditClick = () => { @@ -154,390 +167,392 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => content={false} > + {!onReady? + + : +
+ + {/*top button*/} + + + + {editMode ? + <> + + + + + + + + + : + <> + + + + + + } - - - {/*top button*/} - - - - {editMode ? - <> - - - - - - - - - : - <> - - - - - - } - - - - - {/*end top button*/} -
- - - {FieldUtils.getTextField({ - label: "Username:", - valueName: "username", - disabled: true, - form: formik - })} - - - {FieldUtils.getTextField({ - label: "Name:", - valueName: "contactPerson", - disabled: (!editMode), - form: formik - })} - - - - {FieldUtils.getTextField({ - label: "Created Date:", - valueName: "createDate", - disabled: true, - form: formik - })} + + {/*end top button*/} +
+ + + {FieldUtils.getTextField({ + label: "Username:", + valueName: "username", + disabled: true, + form: formik + })} + - - {FieldUtils.getTextField({ - label: "Email:", - valueName: "emailBus", - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Name:", + valueName: "contactPerson", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getPhoneField({ - label: "Contact Tel:", - valueName: { - code: "tel_countryCode", - num: "phoneNumber" - }, - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Created Date:", + valueName: "createDate", + disabled: true, + form: formik + })} + - - {FieldUtils.getTextField({ - label: "Last Updated:", - valueName: "modifieDate", - disabled: true, - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Email:", + valueName: "emailBus", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getComboField({ - label: "Organization:", - valueName: "orgId", - disabled: (!editMode), - dataList: orgData, - filterOptions: (options, state) => { - if (!state || !state.inputValue) return options; - let searchStr = state.inputValue.toLowerCase().toLowerCase().trim(); - const displayOptions = options.filter((option) => { - let brNo = option.brNo.toLowerCase().trim(); - let enCompanyName = option.enCompanyName ? option.enCompanyName.toLowerCase().trim() : ""; - let chCompanyName = option.chCompanyName ? option.chCompanyName.toLowerCase().trim() : ""; - return brNo.includes(searchStr) || enCompanyName.includes(searchStr) || chCompanyName.includes(searchStr); + + {FieldUtils.getPhoneField({ + label: "Contact Tel:", + valueName: { + code: "tel_countryCode", + num: "phoneNumber" }, - ); - return displayOptions; - }, - getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? item["brNo"] + "-" + item["enCompanyName"] : "") : "", - isOptionEqualToValue: (option, newValue, setValue, setInputValue) => { - if (option.id == newValue) { - setValue(option); - setInputValue(option["brNo"] + "-" + option["enCompanyName"]); - return true; - } - return option == newValue; - }, - onInputChange: (event, newValue, setInputValue) => { - if (newValue != null) { - setInputValue(newValue); - } - }, - onChange: (event, newValue) => { - if (newValue == null) { - formik.setFieldValue("orgId", ""); - return; - } - formik.setFieldValue("orgId", newValue.id); - }, - form: formik - })} - - - - - - Verified: - - - { - currentUserData.verifiedBy || editMode ? - - {FieldUtils.initField({ - valueName: "verifiedStatus", - disabled: true, - form: formik, - })} - - : - <> - - {FieldUtils.initField({ - valueName: "verifiedStatus", - disabled: true, - form: formik, - })} - - - - - - } + disabled: (!editMode), + form: formik + })} + + + {FieldUtils.getTextField({ + label: "Last Updated:", + valueName: "modifieDate", + disabled: true, + form: formik + })} - - - {FieldUtils.getTextField({ - label: "Last Login:", - valueName: "lastLoginDate", - disabled: true, - form: formik - })} - + + {FieldUtils.getComboField({ + label: "Organization:", + valueName: "orgId", + disabled: (!editMode), + dataList: orgData, + filterOptions: (options, state) => { + if (!state || !state.inputValue) return options; + let searchStr = state.inputValue.toLowerCase().toLowerCase().trim(); + const displayOptions = options.filter((option) => { + let brNo = option.brNo.toLowerCase().trim(); + let enCompanyName = option.enCompanyName ? option.enCompanyName.toLowerCase().trim() : ""; + let chCompanyName = option.chCompanyName ? option.chCompanyName.toLowerCase().trim() : ""; + return brNo.includes(searchStr) || enCompanyName.includes(searchStr) || chCompanyName.includes(searchStr); + }, + ); + return displayOptions; + }, + getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? item["brNo"] + "-" + item["enCompanyName"] : "") : "", + isOptionEqualToValue: (option, newValue, setValue, setInputValue) => { + if (option.id == newValue) { + setValue(option); + setInputValue(option["brNo"] + "-" + option["enCompanyName"]); + return true; + } + return option == newValue; + }, + onInputChange: (event, newValue, setInputValue) => { + if (newValue != null) { + setInputValue(newValue); + } + }, + onChange: (event, newValue) => { + if (newValue == null) { + formik.setFieldValue("orgId", ""); + return; + } + formik.setFieldValue("orgId", newValue.id); + }, + form: formik + })} + - + + + + Verified: + - - - - Status: - - { - editMode ? - - {FieldUtils.initField({ - valueName: "status", - disabled: true, - form: formik, - })} - - : - <> - - + { + currentUserData.verifiedBy || editMode ? + {FieldUtils.initField({ - valueName: "status", + valueName: "verifiedStatus", disabled: true, form: formik, })} - - {formik.values.locked ? - - + : + <> + + {FieldUtils.initField({ + valueName: "verifiedStatus", + disabled: true, + form: formik, + })} - : - } + + } - - } + + + + {FieldUtils.getTextField({ + label: "Last Login:", + valueName: "lastLoginDate", + disabled: true, + form: formik + })} + + + + + + + Status: + + { + editMode ? + + {FieldUtils.initField({ + valueName: "status", + disabled: true, + form: formik, + })} + + : + <> + + + {FieldUtils.initField({ + valueName: "status", + disabled: true, + form: formik, + })} + + + {formik.values.locked ? + + + + : + + + + } + + + } - - - -
-
- - - - - - Organization - - - - - - {FieldUtils.getTextField({ - label: "Org.Name (English):", - valueName: "enCompanyName", - disabled: (!editMode), - form: formik - })} - +
+
+ + + + + + + Organization + + + + + + + - - {FieldUtils.getTextField({ - label: "Org.Name (Chinese):", - valueName: "chCompanyName", - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Org.Name (English):", + valueName: "enCompanyName", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getTextField({ - label: "BR No.:", - valueName: "brNo", - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Org.Name (Chinese):", + valueName: "chCompanyName", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getComboField({ - label: "Country:", - valueName: "country", - dataList: ComboData.country, - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "BR No.:", + valueName: "brNo", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getPhoneField({ - label: "Fax No.:", - valueName: { - code: "fax_countryCode", - num: "faxNumber" - }, - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getComboField({ + label: "Country:", + valueName: "country", + dataList: ComboData.country, + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getDateField({ - label: "BR Expiry Date.:", - valueName: "brExpiryDate", - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getPhoneField({ + label: "Fax No.:", + valueName: { + code: "fax_countryCode", + num: "faxNumber" + }, + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getAddressField({ - label: "Address:", - valueName: ["addressLine1", "addressLine2", "addressLine3"], - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getDateField({ + label: "BR Expiry Date.:", + valueName: "brExpiryDate", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getComboField({ - label: "District:", - valueName: "district", - dataList: ComboData.district, - disabled: (!editMode), - form: formik - })} - - -
- + + {FieldUtils.getAddressField({ + label: "Address:", + valueName: ["addressLine1", "addressLine2", "addressLine3"], + disabled: (!editMode), + form: formik + })} + + + {FieldUtils.getComboField({ + label: "District:", + valueName: "district", + dataList: ComboData.district, + disabled: (!editMode), + form: formik + })} + + +
+ + }
setIsWarningPopUp(false)} > Warning