From c95d0c3f469996822adc209ddd4dbe2831ee6860 Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Wed, 12 Jan 2022 15:22:11 +0700 Subject: [PATCH 1/2] Perbaikan Project PPOB --- src/pages/Membership/DetailUser.js | 208 ++++++++++++++++++++++-- src/pages/Membership/Membership.js | 1 + src/pages/Membership/MembershipModal.js | 19 ++- src/pages/Profile/Profile.js | 50 +++++- src/store/authentication.js | 4 +- 5 files changed, 262 insertions(+), 20 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 38f178f..ce7ea45 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -283,8 +283,9 @@ export const DetailUser = observer(() => { Detail User - + {store.authentication.userData.role === "Admin" && ( + { Withdraw Profit + )} - + {store.authentication.userData.role === "Supervisor" && ( + + + + + + + + )} + {store.authentication.userData.role === "Sales" && ( + + + + + + + + )} + @@ -416,7 +566,7 @@ export const DetailUser = observer(() => { : "Inaktif"} - {store.authentication.userData.role === "Sales" && ( + {/* {store.authentication.userData.role === "Sales" && ( Foto Identitas @@ -438,12 +588,11 @@ export const DetailUser = observer(() => { Foto Toko - - {data.map((item) => ( + + {store.authentication.listImage.map((item) => ( { - )} + )} */} {store.authentication.userData.role === "Admin" && ( @@ -478,11 +627,48 @@ export const DetailUser = observer(() => { Foto Toko - {data.map((item) => ( + {store.authentication.listImage.map((item) => ( + ))} + + + + + )} + {store.authentication.userData.role === "Sales" && ( + + + Foto Identitas + + + + + + + + + Foto Toko + + + {store.authentication.listImage.map((item) => ( + { image_store: imageStore, }; await store.membership.update(initialData.id, request); + console.log(data, "edit data"); message.success( initialData.isChangePassword ? "Success Change Member Password" diff --git a/src/pages/Membership/MembershipModal.js b/src/pages/Membership/MembershipModal.js index 4981af4..6288ffc 100644 --- a/src/pages/Membership/MembershipModal.js +++ b/src/pages/Membership/MembershipModal.js @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React, { useState, useEffect } from "react"; import { Form, Input, @@ -36,6 +36,20 @@ export const MembershipModal = ({ const [responseFilenameStore, setResponseFilenameStore] = useState(""); const [loading, setLoading] = useState(false); const [loadingStore, setLoadingStore] = useState(false); + + useEffect(() => { + setFileList([{ + url : `${appConfig.apiUrl}/config/image/${initialData.image_identity}` + }]) + setFileStore([{ + url : `${appConfig.apiUrl}/config/image/${initialData.image_store}` + }]) + setImage(`${appConfig.apiUrl}/config/image/${initialData.image_identity}`) + setImageStore(`${appConfig.apiUrl}/config/image/${initialData.image_store}`) + return () => { + + } + }, [initialData]) const beforeUpload = (file) => { let isLt2M; @@ -156,6 +170,8 @@ export const MembershipModal = ({ form .validateFields() .then((values) => { + values.image_identity = responseFilename + values.image_store = responseFilenameStore onCreate(values,responseFilename,responseFilenameStore); form.resetFields(); setFileStore([]) @@ -272,6 +288,7 @@ export const MembershipModal = ({ onChange={handleChange} beforeUpload={(file) => beforeUpload(file)} customRequest={(args) => uploadHandler(args)} + maxCount={1} onRemove={(file) => { setImage(""); setLoading(false); diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index e5bc13c..fdd510a 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -293,6 +293,46 @@ export const Profile = observer(() => { )} */} {store.authentication.userData.role === "Retail" && ( + // + // + // Foto Identitas + // + // + // + // + // + // + // + // + // Foto Toko + // + // + // {JSON.parse( + // store.authentication.profileData.userDetail + // ?.image_store + // ).map((item) => ( + // + // ))} + // + // + // + // Foto Identitas @@ -315,18 +355,14 @@ export const Profile = observer(() => { Foto Toko - {JSON.parse( - store.authentication.profileData.userDetail - ?.image_store - ).map((item) => ( + {store.authentication.imageProfil.map((item) => ( ))} diff --git a/src/store/authentication.js b/src/store/authentication.js index eb4121e..7b8a264 100644 --- a/src/store/authentication.js +++ b/src/store/authentication.js @@ -10,6 +10,7 @@ export class Authentication { profileData = {}; dataProfit=[]; listImage=[]; + imageProfil=[]; constructor(ctx) { this.ctx = ctx; @@ -58,7 +59,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.listImage = this.dataProfit.userDetail?.image_store ? JSON.parse(this.dataProfit.userDetail?.image_store) : []; this.total_data = response?.body?.count ?? 0; } catch (e) { console.error(e); @@ -70,6 +71,7 @@ export class Authentication { const response = await http.get('/auth/profile'); console.log(response) this.profileData = response.body; + this.imageProfil = this.profileData.userDetail?.image_store ? JSON.parse(this.profileData.userDetail?.image_store) : []; } catch (e) { console.error(e); } From 248f8441157296b351d747264b54f7c3eb2eff95 Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Wed, 12 Jan 2022 17:10:08 +0700 Subject: [PATCH 2/2] Perbaikan PPOB --- src/pages/Membership/DetailUser.js | 4 ++ src/pages/Membership/Membership.js | 10 +++++ src/pages/Membership/MembershipModal.js | 58 +++++++++++++++---------- src/store/authentication.js | 3 ++ 4 files changed, 52 insertions(+), 23 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index ce7ea45..aff0513 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -275,6 +275,10 @@ export const DetailUser = observer(() => { store.authentication.dataProfit.userDetail?.image_identity, "detail" ); + console.log( + store.authentication.listImage, + "detail gambar" + ); return (
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index d04e6e3..d6fd602 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -255,6 +255,16 @@ export const Membership = observer(() => { ]; const onSubmit = async (data, image, imageStore) => { data.superior = true; + console.log(imageStore, "Apa imageStore") + + if(!imageStore){ + imageStore = [] + } + + if (initialData.id) { + data.image_identity = image; + data.image_store = imageStore; + } if (initialData.id) { setConfirmLoading(true); diff --git a/src/pages/Membership/MembershipModal.js b/src/pages/Membership/MembershipModal.js index 6288ffc..6595ee5 100644 --- a/src/pages/Membership/MembershipModal.js +++ b/src/pages/Membership/MembershipModal.js @@ -38,19 +38,27 @@ export const MembershipModal = ({ const [loadingStore, setLoadingStore] = useState(false); useEffect(() => { - setFileList([{ - url : `${appConfig.apiUrl}/config/image/${initialData.image_identity}` - }]) - setFileStore([{ - url : `${appConfig.apiUrl}/config/image/${initialData.image_store}` - }]) - setImage(`${appConfig.apiUrl}/config/image/${initialData.image_identity}`) - setImageStore(`${appConfig.apiUrl}/config/image/${initialData.image_store}`) - return () => { - + if (initialData.id) { + setFileList([ + { + url: `${appConfig.apiUrl}/config/image/${initialData.image_identity}`, + }, + ]); + setFileStore([ + { + url: `${appConfig.apiUrl}/config/image/${initialData.image_store}`, + }, + ]); + setImage( + `${appConfig.apiUrl}/config/image/${initialData.image_identity}` + ); + setImageStore( + `${appConfig.apiUrl}/config/image/${initialData.image_store}` + ); } - }, [initialData]) - + return () => {}; + }, [initialData]); + const beforeUpload = (file) => { let isLt2M; let allowedFile = ["image/jpeg", "image/png"]; @@ -102,12 +110,15 @@ export const MembershipModal = ({ console.log(res, "ini respon 2"); setImageStore(`${appConfig.apiUrl}/config/image/${res.body.filename}`); setResponseFilenameStore([...responseFilenameStore, res.body.filename]); - setFileStore([...fileStore, { - uid: "-1", - name: res.body.filename, - status: "done", - url: `${appConfig.apiUrl}/config/image/${res.body.filename}`, - } ]); + setFileStore([ + ...fileStore, + { + uid: "-1", + name: res.body.filename, + status: "done", + url: `${appConfig.apiUrl}/config/image/${res.body.filename}`, + }, + ]); setLoadingStore(false); }; @@ -170,11 +181,12 @@ export const MembershipModal = ({ form .validateFields() .then((values) => { - values.image_identity = responseFilename - values.image_store = responseFilenameStore - onCreate(values,responseFilename,responseFilenameStore); + console.log(values, "apa valuesanya"); + values.image_identity = responseFilename; + values.image_store = responseFilenameStore; + onCreate(values, responseFilename, responseFilenameStore); form.resetFields(); - setFileStore([]) + setFileStore([]); setImage(""); setFileList([]); setPreviewImage(""); @@ -467,7 +479,7 @@ export const MembershipModal = ({ setFileStore([]); }} > - {fileStore.length >= 3 ? null:uploadButtonStore } + {fileStore.length >= 3 ? null : uploadButtonStore}