From 985118ae10319013704c344e662123b730ce9364 Mon Sep 17 00:00:00 2001
From: Jason <jchuang@2fi-solutions.com.hk>
Date: Thu, 19 Jun 2025 10:46:00 +0800
Subject: [PATCH] fix audit log export

---
 src/pages/AuditLog/AuditLogSearchForm.js      |  1 +
 .../UserInformationCard_Organization.js       | 80 ++++++++++---------
 2 files changed, 43 insertions(+), 38 deletions(-)

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 }) =>
                                 })} */}
                             </Grid>
 
+                            <Grid item xs={12} sm={12} md={12} lg={4}>
+                                {FieldUtils.getPhoneField({
+                                    label: "Fax No.:",
+                                    valueName: {
+                                        code: "fax_countryCode",
+                                        num: "faxNumber"
+                                    },
+                                    disabled: (!editMode),
+                                    form: formik
+                                })}
+                            </Grid>
+
+                            <Grid item lg={4}>
+                                {FieldUtils.getTextField({
+                                    label: "Last Login:",
+                                    valueName: "lastLoginDate",
+                                    disabled: true,
+                                    form: formik
+                                })}
+                            </Grid>
+                            <Grid item xs={12} sm={12} md={12} lg={4}>
+                                {FieldUtils.getComboField({
+                                    label: intl.formatMessage({ id: 'language' }) + ":",
+                                    valueName: "preferLocale",
+                                    dataList: ComboData.Locale,
+                                    getOptionLabel: (option) => option.label ? option.label : "",
+                                    disabled: (!editMode),
+                                    form: formik
+                                })}
+                            </Grid>
+
+
+
                             <Grid item lg={4}>
                                 <Grid container alignItems={"center"}>
                                     <Grid item xs={12} md={3} lg={3} sx={{ display: 'flex', alignItems: 'center' }}>
@@ -373,6 +406,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                                                         form: formik,
                                                     })}
                                                 </Grid>
+                                                
                                                 <Grid item xs={1} md={1} lg={1}>
                                                     <ThemeProvider theme={PNSPS_BUTTON_THEME}>
                                                         <Button
@@ -389,36 +423,6 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                                 </Grid>
                             </Grid>
 
-                            <Grid item lg={4}>
-                                {FieldUtils.getTextField({
-                                    label: "Last Login:",
-                                    valueName: "lastLoginDate",
-                                    disabled: true,
-                                    form: formik
-                                })}
-                            </Grid>
-                            <Grid item xs={12} sm={12} md={12} lg={4}>
-                                {FieldUtils.getComboField({
-                                    label: intl.formatMessage({ id: 'language' }) + ":",
-                                    valueName: "preferLocale",
-                                    dataList: ComboData.Locale,
-                                    getOptionLabel: (option) => option.label ? option.label : "",
-                                    disabled: (!editMode),
-                                    form: formik
-                                })}
-                            </Grid>
-                            <Grid item xs={12} sm={12} md={12} lg={4}>
-                                {FieldUtils.getPhoneField({
-                                    label: "Fax No.:",
-                                    valueName: {
-                                        code: "fax_countryCode",
-                                        num: "faxNumber"
-                                    },
-                                    disabled: (!editMode),
-                                    form: formik
-                                })}
-                            </Grid>
-
                             <Grid item lg={4}>
                                 <Grid container alignItems={"center"}>
                                     <Grid item xs={12} md={3} lg={3} sx={{ display: 'flex', alignItems: 'center' }}>
@@ -541,12 +545,12 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
 
                             <Grid item lg={4}>
                                 {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
                                 })}
                             </Grid>
@@ -573,12 +577,12 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
 
                             <Grid item lg={4}>
                                 {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
                                 })}
                             </Grid>