From fd34221fd414bca222cb8897e6b6a1d6ff82b1a0 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Thu, 18 Jan 2024 18:07:36 +0800
Subject: [PATCH] fix gld user setting

---
 src/layout/MainLayout/Header/index.js          | 14 ++++++++++++--
 src/pages/User/DetailsPage_Individual/index.js |  7 ++++++-
 .../User/DetailsPage_Organization/index.js     | 18 ++++++++++++------
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js
index 83bf88f..5d33f9a 100644
--- a/src/layout/MainLayout/Header/index.js
+++ b/src/layout/MainLayout/Header/index.js
@@ -204,6 +204,14 @@ function Header(props) {
                     </Typography>
                   </Link>
                 </li>
+                <li>
+                  <Link className="manageUser" to={'/orgUser'}>
+                    <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>
+                      {/* <FormattedMessage id="companyOrUserRecord" /> */}
+                      User Profile
+                    </Typography>
+                  </Link>
+                </li>
               </ul>
             </>
             :
@@ -218,7 +226,8 @@ function Header(props) {
                 <li>
                   <Link className="manageUser" to={'/indUser'}>
                     <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>
-                      <FormattedMessage id="companyOrUserRecord" />
+                      {/* <FormattedMessage id="companyOrUserRecord" /> */}
+                      User Profile
                     </Typography>
                   </Link>
                 </li>
@@ -235,7 +244,8 @@ function Header(props) {
                 <li>
                   <Link className="manageUser" to={'/orgUser'}>
                     <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>
-                      <FormattedMessage id="companyOrUserRecord" />
+                      {/* <FormattedMessage id="companyOrUserRecord" /> */}
+                      User Profile
                     </Typography>
                   </Link>
                 </li>
diff --git a/src/pages/User/DetailsPage_Individual/index.js b/src/pages/User/DetailsPage_Individual/index.js
index d4a4482..d04ced3 100644
--- a/src/pages/User/DetailsPage_Individual/index.js
+++ b/src/pages/User/DetailsPage_Individual/index.js
@@ -31,6 +31,7 @@ const UserInformationPubCard = Loadable(React.lazy(() => import('./UserInformati
 import {
     isGLDLoggedIn,
     isINDLoggedIn,
+    isORGLoggedIn
 } from "utils/Utils";
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
@@ -42,7 +43,11 @@ const UserMaintainPage_Individual = () => {
     const [isLoading, setLoding] = React.useState(true);
 
     React.useEffect(() => {
-        loadData();
+        if (isORGLoggedIn()){
+            navigate('/dashboard');
+        }else{
+            loadData();
+        }
     }, []);
 
     const loadData = () => {
diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js
index a0a6418..59306ee 100644
--- a/src/pages/User/DetailsPage_Organization/index.js
+++ b/src/pages/User/DetailsPage_Organization/index.js
@@ -32,6 +32,7 @@ const BackgroundHead = {
 import {
     isGLDLoggedIn,
     isORGLoggedIn,
+    isINDLoggedIn
 } from "utils/Utils";
 import {useIntl} from "react-intl";
 
@@ -72,7 +73,11 @@ const UserMaintainPage_Organization = () => {
 
     useEffect(() => {
         // console.log(userData);
-        loadData();
+        if (isINDLoggedIn()){
+            navigate('/dashboard');
+        }else{
+            loadData();
+        }
     }, []);
     
     useEffect(() => {
@@ -92,6 +97,7 @@ const UserMaintainPage_Organization = () => {
                 onSuccess: function (response) {
                     // console.log(response)
                     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"];
@@ -102,12 +108,14 @@ const UserMaintainPage_Organization = () => {
                         response.data["chCompanyName"] = response.orgDetail.data.chCompanyName;
                         response.data["chCompanyName"] = response.orgDetail.data.chCompanyName;
                     } else {
+                        console.log("1b")
                         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["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateStr(response.data.brExpiryDate) : "";
                     }
+                    console.log("2")
+                    console.log(response.data)
     
                     let createDate = DateUtils.datetimeStr(response.data.created);
                     let modifiedBy = DateUtils.datetimeStr(response.data.modified) + ", " + response.data.modifiedBy;
@@ -117,9 +125,6 @@ const UserMaintainPage_Organization = () => {
     
                     response.data["lastLoginDate"] = response.data.lastLogin ? DateUtils.datetimeStr(response.data.lastLoginDate) : "";
                     
-                    response.data["mobileNumber"] = JSON.parse(response.data["mobileNumber"]);
-                    response.data["faxNo"] = JSON.parse(response.data["faxNo"]);
-
                     response.data["country"] = response.data.addressBus?.country;
                     response.data["district"] = response.data.addressBus?.district;
                     response.data["addressLine1"] = response.data.addressBus?.addressLine1;
@@ -134,7 +139,8 @@ const UserMaintainPage_Organization = () => {
     
                     //response.data["orgId"] = response.data.brExpiryDate?DateUtils.dateStr(response.data.brExpiryDate):"";
     
-    
+                    console.log("3")
+                    console.log(response.data)
                     setUserData(response.data);
                     setOrgData(response.orgList);
                 }