diff --git a/src/pages/AuditLog/AuditLogSearchForm.js b/src/pages/AuditLog/AuditLogSearchForm.js
index 0b65326..722ed7b 100644
--- a/src/pages/AuditLog/AuditLogSearchForm.js
+++ b/src/pages/AuditLog/AuditLogSearchForm.js
@@ -79,6 +79,7 @@ const AuditLogSearchForm = ({ applySearch, searchCriteria, onGridReady}) => {
setOnDownload(true)
HttpUtils.fileDownload({
url: UrlUtils.AUDIT_LOG_EXPORT,
+ params: searchCriteria,
onResponse:()=>{
setOnDownload(false)
},
diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
index dcf81f6..343fea9 100644
--- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
@@ -349,6 +349,39 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
})} */}
+
+ {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.getComboField({
+ label: intl.formatMessage({ id: 'language' }) + ":",
+ valueName: "preferLocale",
+ dataList: ComboData.Locale,
+ getOptionLabel: (option) => option.label ? option.label : "",
+ disabled: (!editMode),
+ form: formik
+ })}
+
+
+
+
@@ -373,6 +406,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
form: formik,
})}
+
-
- {FieldUtils.getTextField({
- label: "Last Login:",
- valueName: "lastLoginDate",
- disabled: true,
- form: formik
- })}
-
-
- {FieldUtils.getComboField({
- label: intl.formatMessage({ id: 'language' }) + ":",
- valueName: "preferLocale",
- dataList: ComboData.Locale,
- getOptionLabel: (option) => option.label ? option.label : "",
- disabled: (!editMode),
- form: formik
- })}
-
-
- {FieldUtils.getPhoneField({
- label: "Fax No.:",
- valueName: {
- code: "fax_countryCode",
- num: "faxNumber"
- },
- disabled: (!editMode),
- form: formik
- })}
-
-
@@ -541,12 +545,12 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
{FieldUtils.getPhoneField({
- label: "Fax No.:",
+ label: "Contact Tel:",
valueName: {
- code: "org_fax_countryCode",
- num: "orgFaxNumber"
+ code: "org_tel_countryCode",
+ num: "orgPhoneNumber"
},
- disabled: true,
+ disabled: (!editMode),
form: formik
})}
@@ -573,12 +577,12 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
{FieldUtils.getPhoneField({
- label: "Contact Tel:",
+ label: "Fax No.:",
valueName: {
- code: "org_tel_countryCode",
- num: "orgPhoneNumber"
+ code: "org_fax_countryCode",
+ num: "orgFaxNumber"
},
- disabled: (!editMode),
+ disabled: true,
form: formik
})}