From aafd8ae6241efe573050b7faaef6a2f4f0457c12 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Thu, 31 Aug 2023 13:16:25 +0800
Subject: [PATCH] fix bug

---
 .../OrganizationCard_loadFromUser.js          |  2 +-
 src/pages/pnspsNotifyTest/index.js            |  2 +-
 .../UserInformationCard_Organization.js       | 27 +++++++++++++++----
 .../pnspsUserDetailPage_Organization/index.js |  2 +-
 .../UserTable_Organization.js                 |  2 ++
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js b/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js
index 119b705..2fac9e8 100644
--- a/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js
+++ b/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js
@@ -102,7 +102,7 @@ const OrganizationCard_loadFromUser = ({userData, id}) => {
                     Information
                 </Typography>
 
-                <form id="_form" onSubmit={handleSubmit(onSubmitForm)}>
+                <form onSubmit={handleSubmit(onSubmitForm)}>
 
                 <Grid container spacing={1}>
                       {/*bottom top*/}
diff --git a/src/pages/pnspsNotifyTest/index.js b/src/pages/pnspsNotifyTest/index.js
index aea1a92..b2e3d33 100644
--- a/src/pages/pnspsNotifyTest/index.js
+++ b/src/pages/pnspsNotifyTest/index.js
@@ -3,7 +3,7 @@ import { useState } from 'react';
 import axios from 'axios';
 
 const TestMailPage = () => {
-  const [host, setHost] = useState('http://localhost:8090/api/test');
+  const [host, setHost] = useState(apiPath+'/test');
   const [mail, setMail] = useState('');
 
   const hostChange = (event) => {
diff --git a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
index ad56319..a36d9a1 100644
--- a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
@@ -26,6 +26,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
 
     const [district, setDistrict] = useState(null);
     const [country, setCountry] = useState(ComboData.country[0]);
+    const [orgId, setOrgId] = useState("");
 
     const from = useForm({defaultValues: userData});
     const {register,reset, handleSubmit} = from;
@@ -80,6 +81,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
 
         setDistrict(userData.district);
         setCountry(userData.country);
+        setOrgId(userData.emailVerifyHash);
         
         setCurrentUserData(userData);
     }, [userData]);
@@ -117,6 +119,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                 contactPerson: _data.contactPerson,
                 enCompanyName: _data.enCompanyName,
                 chCompanyName: _data.chCompanyName,
+                emailVerifyHash: orgId,
                 brNo: _data.brNo,
                 brExpiryDate: formik.values.brExpiryDate,
 
@@ -358,12 +361,26 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                                 </Grid>
 
                                 <Grid item xs={7} s={7} md={7} lg={6} >
-                                    <TextField     
-                                        {...register("identification")}
-                                        id='identification'
+                                    {/* <TextField     
+                                        {...register("orgId")}
+                                        id='orgId'
                                         disabled={!editMode}
-                                    />
-                                     {/* <Button lg={2} variant="contained" onClick={downloadFile} >View File</Button> */}
+                                    /> */}
+                                      <Autocomplete
+                                        fullWidth
+                                            disablePortal
+                                            disabled={!editMode}
+                                            id="emailVerifyHash"
+                                            value={orgId}
+                                            options={["A Company", "B Company", "C Company"]}
+                                            {...register("emailVerifyHash")}
+                                            onChange={(event, newValue) => {
+                                                setOrgId(newValue);
+                                            }}
+                                            
+                                            sx={{"& .MuiInputBase-root": { height: "41px" },"#emailVerifyHash":{padding: "0px 0px 0px 0px"}, "& .MuiAutocomplete-endAdornment": { top: "auto" },}}
+                                            renderInput={(params) => <TextField {...params} placeholder="Organization"/>}
+                                        />
                                 </Grid>
                             </Grid>
                         </Grid>
diff --git a/src/pages/pnspsUserDetailPage_Organization/index.js b/src/pages/pnspsUserDetailPage_Organization/index.js
index b3041e0..01b7c25 100644
--- a/src/pages/pnspsUserDetailPage_Organization/index.js
+++ b/src/pages/pnspsUserDetailPage_Organization/index.js
@@ -33,7 +33,7 @@ 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"]);
-                setUserData(response.data)
+                setUserData(response.data);
             }
         });
     };
diff --git a/src/pages/pnspsUserSearchPage_Organization/UserTable_Organization.js b/src/pages/pnspsUserSearchPage_Organization/UserTable_Organization.js
index e002e26..ee92ff0 100644
--- a/src/pages/pnspsUserSearchPage_Organization/UserTable_Organization.js
+++ b/src/pages/pnspsUserSearchPage_Organization/UserTable_Organization.js
@@ -9,6 +9,8 @@ import {useEffect} from "react";
 import {useNavigate} from "react-router-dom";
 import HighlightOff from '@mui/icons-material/HighlightOff';
 import CheckCircleOutline from '@mui/icons-material/CheckCircleOutline';
+import * as DateUtils from '../../utils/DateUtils';
+
 // ==============================|| EVENT TABLE ||============================== //
 
 export default function UserTable_Organization({recordList}) {