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, })} +