From 48d07a46429da7bbdd28971c38e726dee686250b Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 30 Aug 2023 09:52:46 +0800 Subject: [PATCH] ind user --- .../OrganizationCard_loadFromUser.js | 64 +--------------- .../UserInformationCard_Individual.js | 75 ++++--------------- .../pnspsUserDetailPage_Individual/index.js | 8 +- src/utils/ApiPathConst.js | 2 +- 4 files changed, 22 insertions(+), 127 deletions(-) diff --git a/src/pages/OrganizationDetailPage/OrganizationCard_loadFromUser.js b/src/pages/OrganizationDetailPage/OrganizationCard_loadFromUser.js index 217f303..090d822 100644 --- a/src/pages/OrganizationDetailPage/OrganizationCard_loadFromUser.js +++ b/src/pages/OrganizationDetailPage/OrganizationCard_loadFromUser.js @@ -186,66 +186,6 @@ const OrganizationCard = ({userData, id}) => { - - - - Temp Name (Eng): - - - - - - - - - - - - Temp Name (Ch): - - - - - - - - - - - - Temp Expiry Date: - - - - - - - - - - - { - fax No: + Fax No: { - Adress : + Address : diff --git a/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js b/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js index 18f739a..fe35a9b 100644 --- a/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js +++ b/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js @@ -18,7 +18,7 @@ import * as UrlUtils from "../../utils/ApiPathConst"; // ==============================|| DASHBOARD - DEFAULT ||============================== // -const UserInformationCard_Individual = ({userData, loadDataFun}) => { +const UserInformationCard_Individual = ({userData,userFile, loadDataFun}) => { const [currentUserData, setCurrentUserData] = useState(userData); const [editMode, setEditMode] = useState(false); @@ -57,38 +57,6 @@ const UserInformationCard_Individual = ({userData, loadDataFun}) => { function onSubmitForm(_formData) { - console.log(_formData); - - // axios.post(UrlUtils.POST_PUBLIC_USER+"/"+userData.id,{ - // prefix: "1", - // enName: "Chan", - // chName: "Chan", - // idDocType: "Chan", - // contactTel: { - // countryCode:"Chan", - // phoneNumber: "Chan" - // }, - // identification: "Chan", - // faxNo:{ - // countryCode: "Chan", - // faxNumber: "Chan" - // }, - // emailAddress:"Chan", - // address:{ - // country:"Chan", - // addressLine1: "Chan", - // addressLine2: "Chan", - // addressLine3: "Chan", - // }, - // }).then( - // (response)=>{ - // if(response.status == 200) - // loadDataFun(); - // } - // ).catch(error => { - // console.log(error); - // }); - HttpUtils.post({ url: UrlUtils.POST_IND_USER+"/"+userData.id, params: { @@ -123,6 +91,15 @@ const UserInformationCard_Individual = ({userData, loadDataFun}) => { setEditMode(true); }; + const onVerifiedClick = () => { + HttpUtils.get({ + url: UrlUtils.GET_IND_USER_VERIFY+"/"+id, + onSuccess: function(){ + loadDataFun(); + } + }); + }; + const doLock = () => { HttpUtils.get({ url: UrlUtils.GET_USER_LOCK+"/"+userData.id, @@ -141,39 +118,14 @@ const UserInformationCard_Individual = ({userData, loadDataFun}) => { }); }; - - // const uploadFile = (event)=>{ - // HttpUtils.fileUpload( - // { - // refType:"identification", - // refId: currentUserData.id, - // file: event.target.files[0], - // onSuccess: (response)=>{ - // console.log(response); - // setOpen(true); - // } - // } - // ); - // }; - const downloadFile = ()=>{ HttpUtils.fileDownload({ - fileId: 1, - skey: "W6biVNvk50YVC2T6", - filename: "idCardSample.jpg" + fileId: userFile.fileId, + skey: userFile.skey, + filename: userFile.filename }); }; - {/* */} - return ( { textTransform: 'capitalize', alignItems: 'end' }} + onClick={onVerifiedClick} > Verified diff --git a/src/pages/pnspsUserDetailPage_Individual/index.js b/src/pages/pnspsUserDetailPage_Individual/index.js index 923ea70..ccf4567 100644 --- a/src/pages/pnspsUserDetailPage_Individual/index.js +++ b/src/pages/pnspsUserDetailPage_Individual/index.js @@ -4,7 +4,6 @@ import {useEffect, useState} from "react"; import * as React from "react"; //import axios from "axios"; import * as HttpUtils from "../../utils/HttpUtils"; -import {apiPath} from "../../auth/utils"; import {useParams} from "react-router-dom"; import UserInformationCard from "./UserInformationCard_Individual"; import LoadingComponent from "../extra-pages/LoadingComponent"; @@ -16,6 +15,7 @@ import * as UrlUtils from "../../utils/ApiPathConst"; const UserMaintainPage_Individual = () => { const params = useParams(); const [userData, setUserData] = useState({}) + const [userFile, setUserFile] = useState({}) const [isLoading, setLoding] = useState(true); @@ -27,9 +27,10 @@ const UserMaintainPage_Individual = () => { const loadData = ()=>{ setLoding(true); HttpUtils.get({ - url: `${apiPath}${UrlUtils.GET_USER_PATH}/${params.id}`, + url: `${UrlUtils.GET_IND_USER_PATH}/${params.id}`, onSuccess: function(response){ - setUserData(response.data) + setUserData(response.data); + setUserFile(response.userFile) } }); }; @@ -53,6 +54,7 @@ const UserMaintainPage_Individual = () => { diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js index 9cdaca6..cab39b6 100644 --- a/src/utils/ApiPathConst.js +++ b/src/utils/ApiPathConst.js @@ -15,7 +15,7 @@ export const GET_USER_LOCK = apiPath+'/user/lock'; export const GET_USER_UNLOCK = apiPath+'/user/unlock'; export const GET_IND_USER_PATH = apiPath+'/user/ind'; -export const GET_IND_USER_VERiFY = apiPath+'/user/ind/verify'; +export const GET_IND_USER_VERIFY = apiPath+'/user/ind/verify'; export const POST_IND_USER = apiPath+'/user/ind'; export const GET_ORG_USER_PATH = apiPath+'/user/org';