From 64b33c2d6be945f6b5cf6b963ce31eebaf507adc Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Tue, 11 Jan 2022 17:57:01 +0700 Subject: [PATCH] Perbaikan Project PPOB --- src/pages/Membership/DetailUser.js | 142 ++++++++++++++++------------- src/pages/Membership/Membership.js | 1 - src/pages/Profile/Profile.js | 52 ++++++++++- src/store/authentication.js | 4 +- 4 files changed, 129 insertions(+), 70 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index c85f3c0..38f178f 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -43,7 +43,6 @@ export const DetailUser = observer(() => { modalLoader.setLoading(false); })(); - return () => { store.membership.dataDetail = {}; store.transaction.dataHistoryTopUp = []; @@ -266,9 +265,16 @@ export const DetailUser = observer(() => { justifyContent: "center", } : null; - console.log(JSON.parse(store.authentication.dataProfit.userDetail?.image_store)," ini dia") - const data = JSON.parse(store.authentication.dataProfit.userDetail?.image_store) - console.log(data,"ini data") + // console.log( + // JSON.parse(store.authentication.dataProfit.userDetail?.image_store), + // " ini dia" + // ); + const data = store.authentication.listImage; + console.log(data, "ini data"); + console.log( + store.authentication.dataProfit.userDetail?.image_identity, + "detail" + ); return (
@@ -308,19 +314,25 @@ export const DetailUser = observer(() => { id: store.membership.dataDetail.id, name: store.membership.dataDetail.userDetail.name, username: store.membership.dataDetail.username, - identity_number: store.membership.dataDetail.userDetail.identity_number, - image_identity: store.membership.dataDetail?.userDetail.image_identity, - image_store: store.membership.dataDetail?.userDetail.image_store, + identity_number: + store.membership.dataDetail.userDetail.identity_number, + image_identity: + store.membership.dataDetail?.userDetail.image_identity, + image_store: + store.membership.dataDetail?.userDetail.image_store, phone_number: store.membership.dataDetail.userDetail.phone_number, roleId: store.membership.dataDetail.roles.id, isChangePassword: false, - }); - console.log(store.membership.dataDetail.userDetail.identity_number) - console.log(store.membership.dataDetail.userDetail.id) - console.log(store.membership.dataDetail.userDetail.image_identity) - console.log(store.membership.dataDetail.username) + console.log( + store.membership.dataDetail.userDetail.identity_number + ); + console.log(store.membership.dataDetail.userDetail.id); + console.log( + store.membership.dataDetail.userDetail.image_identity + ); + console.log(store.membership.dataDetail.username); setVisibleModal(true); }} > @@ -409,9 +421,46 @@ export const DetailUser = observer(() => { Foto Identitas + - Foto Toko + + + + + Foto Toko + + + {data.map((item) => ( + + ))} + + + + + )} + {store.authentication.userData.role === "Admin" && ( + + + Foto Identitas + + { /> - - - - - {data.map((item)=>{ - - })} - - - - - - )} - {store.authentication.userData.role === "Admin" && ( - - - Foto Identitas - - + Foto Toko - - - - - - - - + + {data.map((item) => ( + + ))} + )} + {store.authentication.userData.role === "Supervisor" && ( @@ -491,7 +507,7 @@ export const DetailUser = observer(() => { src={ store.authentication.dataProfit.userDetail ?.image_identity - ? `${appConfig.apiUrl}/config/image/${store.authentication.profileData.userDetail?.image_identity}` + ? `${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_identity}` : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" } style={{ width: "10vw" }} @@ -639,7 +655,7 @@ export const DetailUser = observer(() => { itemLayout="horizontal" position={"top"} pagination={{ - onChange: async (page,pageSize) => { + onChange: async (page, pageSize) => { store.transaction.pageSize = pageSize; store.transaction.page = page - 1; modalLoader.setLoading(true); diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index 99f4899..2b69f45 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -359,7 +359,6 @@ export const Membership = observer(() => { ? store.membership.dataMember : store.membership.data } - bordered pagination={{ pageSize: store.membership.pageSize, total: diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 3e91a33..e5bc13c 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -256,7 +256,7 @@ export const Profile = observer(() => { {store.authentication.profileData.superior?.username} - {store.authentication.userData.role === "Retail" && ( + {/* {store.authentication.userData.role === "Retail" && ( Foto Identitas @@ -291,6 +291,48 @@ export const Profile = observer(() => { + )} */} + {store.authentication.userData.role === "Retail" && ( + + + Foto Identitas + + + + + + + + + Foto Toko + + + {JSON.parse( + store.authentication.profileData.userDetail + ?.image_store + ).map((item) => ( + + ))} + + + + )} {/* {store.authentication.userData.role === "Supervisor" && ( @@ -402,16 +444,16 @@ export const Profile = observer(() => { dataSource={store.transaction.dataHistoryTransaction} pagination={{ onChange: async (page, pageSize) => { - console.log(page,'Page') - console.log(pageSize,'Page size') + console.log(page, "Page"); + console.log(pageSize, "Page size"); store.transaction.pageSizeHistoryTransaction = pageSize; - store.transaction.pageHistoryTransaction = page -1; + store.transaction.pageHistoryTransaction = page - 1; modalLoader.setLoading(true); await store.transaction.getDataHistoryTransaction(); modalLoader.setLoading(false); }, pageSize: store.transaction.pageSizeHistoryTransaction, - total:store.transaction.total_dataHistoryTransaction, + total: store.transaction.total_dataHistoryTransaction, current: store.transaction.pageHistoryTransaction + 1, style: { marginBottom: "1rem", marginRight: "1rem" }, }} diff --git a/src/store/authentication.js b/src/store/authentication.js index f6eee2e..eb4121e 100644 --- a/src/store/authentication.js +++ b/src/store/authentication.js @@ -8,7 +8,8 @@ export class Authentication { isLoginLoading = false; ctx; profileData = {}; - dataProfit=[] + dataProfit=[]; + listImage=[]; constructor(ctx) { this.ctx = ctx; @@ -57,6 +58,7 @@ export class Authentication { const response = await http.get(`/auth/profile/${id}`); console.log(response) this.dataProfit = response.body ?? []; + this.listImage = this.dataProfit.userDetail ? JSON.parse(this.dataProfit.userDetail?.image_store) : []; this.total_data = response?.body?.count ?? 0; } catch (e) { console.error(e);