diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js index 2fff6e7..dcf81f6 100644 --- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js +++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js @@ -81,6 +81,10 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => countryCode: values.tel_countryCode, phoneNumber: values.phoneNumber }, + faxNo: { + countryCode: values.fax_countryCode, + faxNumber: values.faxNumber + }, identification: values.identification, emailBus: values.emailBus, contactPerson: values.contactPerson, @@ -403,7 +407,17 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => form: formik })} - + + {FieldUtils.getPhoneField({ + label: "Fax No.:", + valueName: { + code: "fax_countryCode", + num: "faxNumber" + }, + disabled: (!editMode), + form: formik + })} + @@ -529,8 +543,8 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => {FieldUtils.getPhoneField({ label: "Fax No.:", valueName: { - code: "fax_countryCode", - num: "faxNumber" + code: "org_fax_countryCode", + num: "orgFaxNumber" }, disabled: true, form: formik @@ -556,6 +570,19 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => form: formik })} + + + {FieldUtils.getPhoneField({ + label: "Contact Tel:", + valueName: { + code: "org_tel_countryCode", + num: "orgPhoneNumber" + }, + disabled: (!editMode), + form: formik + })} + + {FieldUtils.getAddressField({ label: "Address:", diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js index fe59789..50156b1 100644 --- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js +++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js @@ -68,6 +68,10 @@ const UserInformationCard_Organization_Pub = ({ userData, loadDataFun,}) => { countryCode: values.tel_countryCode, phoneNumber: values.phoneNumber }, + faxNo: { + countryCode: values.fax_countryCode, + faxNumber: values.faxNumber + }, preferLocale: values.preferLocale.type }, onSuccess: function () { @@ -196,6 +200,18 @@ const UserInformationCard_Organization_Pub = ({ userData, loadDataFun,}) => { })} + + {FieldUtils.getPhoneField({ + label: intl.formatMessage({id: 'contactFaxNumber'}) + ":", + valueName: { + code: "fax_countryCode", + num: "faxNumber" + }, + disabled: (!editMode), + form: formik + })} + + {FieldUtils.getTextField({ label: intl.formatMessage({id: 'primaryUser'}) + ":", diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js index 41a5d78..a8af9c5 100644 --- a/src/pages/User/DetailsPage_Organization/index.js +++ b/src/pages/User/DetailsPage_Organization/index.js @@ -115,9 +115,12 @@ const UserMaintainPage_Organization = () => { if (response.data.orgId != null) { // console.log("1a") response.data["addressBus"] = response.orgDetail.data["addressTemp"]; - response.data["contactTel"] = response.orgDetail.data["contactTel"]; - response.data["faxNo"] = response.orgDetail.data["faxNo"]; - + response.data["orgContactTel"] = response.orgDetail.data["contactTel"]; + response.data["orgFaxNo"] = response.orgDetail.data["faxNo"]; + + response.data["contactTel"] = JSON.parse(response.data["contactTel"]); + response.data["faxNo"] = JSON.parse(response.data["faxNo"]); + response.data["brExpiryDate"] = response.orgDetail.data.brExpiryDate ? DateUtils.dateValue(response.orgDetail.data.brExpiryDate) : ""; response.data["brNo"] = response.orgDetail.data.brNo; response.data["enCompanyName"] = response.orgDetail.data.enCompanyName; @@ -128,6 +131,10 @@ const UserMaintainPage_Organization = () => { response.data["addressBus"] = JSON.parse(response.data["addressBus"]); response.data["contactTel"] = JSON.parse(response.data["contactTel"]); response.data["faxNo"] = JSON.parse(response.data["faxNo"]); + + response.data["orgContactTel"] = response.data["contactTel"]; + response.data["orgFaxNo"] = response.data["faxNo"]; + response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateValue(response.data.brExpiryDate) : ""; } // console.log("2") @@ -148,9 +155,14 @@ const UserMaintainPage_Organization = () => { response.data["phoneNumber"] = response.data.contactTel?.phoneNumber; response.data["tel_countryCode"] = response.data.contactTel?.countryCode; + response.data["orgPhoneNumber"] = response.data.orgContactTel?.phoneNumber; + response.data["org_tel_countryCode"] = response.data.orgContactTel?.countryCode; + response.data["faxNumber"] = response.data.faxNo?.faxNumber; response.data["fax_countryCode"] = response.data.faxNo?.countryCode; + response.data["orgFaxNumber"] = response.data.orgFaxNo?.faxNumber; + response.data["org_fax_countryCode"] = response.data.orgFaxNo?.countryCode; // response.data["status"] = response.data?.locked?"locked":response.data?.status; response.data["preferLocale"] = getObjectByType(ComboData.Locale, "type", response.data?.preferLocale); @@ -170,6 +182,7 @@ const UserMaintainPage_Organization = () => { onSuccess: function (response) { // console.log(response) response.data["contactTel"] = JSON.parse(response.data["contactTel"]); + response.data["faxNo"] = JSON.parse(response.data["faxNo"]); response.data["primaryUser"] = response.data.primaryUser?isPrimaryLocale:notPrimaryLocale; response.data["phoneNumber"] = response.data.contactTel?.phoneNumber; diff --git a/src/pages/dashboard/GLD/index.js b/src/pages/dashboard/GLD/index.js index 01fa246..b72df3d 100644 --- a/src/pages/dashboard/GLD/index.js +++ b/src/pages/dashboard/GLD/index.js @@ -6,11 +6,18 @@ import { Typography, Stack } from '@mui/material'; +import * as React from "react"; + import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' // ==============================|| DASHBOARD - DEFAULT ||============================== // const DashboardDefault = () => { const userData = JSON.parse(localStorage.getItem("userData")); + + React.useEffect(() => { + localStorage.setItem('searchCriteria',"") + }, []) + const BackgroundHead = { backgroundImage: `url(${titleBackgroundImg})`, width: '100%', diff --git a/src/pages/dashboard/Public/index.js b/src/pages/dashboard/Public/index.js index 2d9a292..1c1f201 100644 --- a/src/pages/dashboard/Public/index.js +++ b/src/pages/dashboard/Public/index.js @@ -53,6 +53,7 @@ const DashboardDefault = () => { React.useEffect(() => { loadMessageData() loadNoticeData() + localStorage.setItem('searchCriteria',"") }, []); const getWelcomeMsg=()=>{