PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug Fixing Pagination

Browse Source
This commit is contained in:
ajat91.sudrajat 2022-01-05 14:58:06 +07:00
parent 64aab4283b
commit 532277791a
5 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pages/Membership/Membership.js
View File

@ -352,7 +352,7 @@ export const Membership = observer(() => {
bordered bordered
pagination={{ pagination={{
pageSize: store.membership.pageSize, pageSize: store.membership.pageSize,
total: store.membership.totalData, total: store.membership.total_data,
current: store.membership.page + 1, current: store.membership.page + 1,
showSizeChanger: true, showSizeChanger: true,
simple: false, simple: false,
@ -362,6 +362,7 @@ export const Membership = observer(() => {
store.membership.pageSize = page.pageSize; store.membership.pageSize = page.pageSize;
store.membership.page = pageNumber - 1; store.membership.page = pageNumber - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.membership.getData();
await getData(); await getData();
modalLoader.setLoading(false); modalLoader.setLoading(false);
}} }}
@ -528,7 +529,7 @@ export const Membership = observer(() => {
visible={store.membership.visibleModalFilterMembership} visible={store.membership.visibleModalFilterMembership}
title={"Filter"} title={"Filter"}
footer={footerLayoutFilter} footer={footerLayoutFilter}
onCancel={async() => { onCancel={async () => {
// setFilterMembership([]); // setFilterMembership([]);
// setFilterPartner([]); // setFilterPartner([]);
store.membership.filterMembership = null; store.membership.filterMembership = null;

4
src/pages/Payback/Payback.js
View File

@ -486,12 +486,12 @@ export const Payback = observer(() => {
<Row> <Row>
<Col span={24}> <Col span={24}>
<Title level={5} type={"secondary"} strong> <Title level={5} type={"secondary"} strong>
From Sender
</Title> </Title>
<Form layout="vertical" name="filter" form={form}> <Form layout="vertical" name="filter" form={form}>
<Select <Select
mode={"multiple"} mode={"multiple"}
placeholder="Pilih Anggota" placeholder="Pilih Pengirim"
onChange={(val) => { onChange={(val) => {
setFilterMembership(val); setFilterMembership(val);
}} }}

4
src/pages/Payback/PaybackCreated.js
View File

@ -126,8 +126,10 @@ export const PaybackCreated = observer(() => {
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
const data = form.getFieldsValue(); const data = form.getFieldsValue();
//console.log(data); console.log(data);
//store.payback.filterMembership = filterMembership; //store.payback.filterMembership = filterMembership;
// const awal = format(parseISO(data.start_date), "dd-MM-yyyy")
// const akhir = format(parseISO(data.start_date), "dd-MM-yyyy")
store.payback.filterStart = data.start_date; store.payback.filterStart = data.start_date;
store.payback.filterEnd = data.end_date; store.payback.filterEnd = data.end_date;
modalLoader.setLoading(true); modalLoader.setLoading(true);

24
src/store/membership.js
View File

@ -5,7 +5,7 @@ export class Membership {
page = 0; page = 0;
pageSize = 10 pageSize = 10
data = []; data = [];
totalData = 0; total_data = 0;
dataDetail = {}; dataDetail = {};
dataMember=[]; dataMember=[];
@ -25,17 +25,19 @@ export class Membership {
const response = await http.get(`/users?page=${this.page}&pageSize=${this.pageSize}&superior=${this.filterMembership}&type=${this.filterPartner}`); const response = await http.get(`/users?page=${this.page}&pageSize=${this.pageSize}&superior=${this.filterMembership}&type=${this.filterPartner}`);
console.log(this.filterMembership) console.log(this.filterMembership)
// console.log(this.filterPartner) // console.log(this.filterPartner)
console.log(response) //console.log(response)
this.dataMember = response.body.data.map((item, idx) => { this.dataMember = response.body.data ?? []
item.key = idx; // this.dataMember = response.body.data.map((item, idx) => {
item.name = item?.user_detail?.name; // item.key = idx;
item.phone_number = item?.user_detail?.phone_number; // item.name = item?.user_detail?.name;
item.roleId = item?.roles.id; // item.phone_number = item?.user_detail?.phone_number;
item.roleName = item?.roles.name; // item.roleId = item?.roles.id;
return item // item.roleName = item?.roles.name;
}) ?? [] // return item
// }) ?? []
this.totalData = response?.body?.count ?? 0 this.total_data = response?.body?.count ?? 0
//console.log(this.total_data)
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }

56
src/store/payback.js
View File

@ -1,5 +1,5 @@
import {makeAutoObservable} from "mobx"; import { makeAutoObservable } from "mobx";
import {http} from "../utils/http"; import { http } from "../utils/http";
export class Payback { export class Payback {
pageCreated = 0; pageCreated = 0;
@ -15,14 +15,14 @@ export class Payback {
totalDataConfirmation = 0; totalDataConfirmation = 0;
//data=[] //data=[]
//filter //filter
visibleModalFilterPayback = false; visibleModalFilterPayback = false;
filterMembership=null; filterMembership = null;
filterStart=null; filterStart = null;
filterEnd=null; filterEnd = null;
//filter created //filter created
visibleModalFilterCreate=false visibleModalFilterCreate = false;
constructor(ctx) { constructor(ctx) {
this.ctx = ctx; this.ctx = ctx;
makeAutoObservable(this); makeAutoObservable(this);
@ -30,12 +30,14 @@ export class Payback {
async getDataCreated() { async getDataCreated() {
try { try {
const response = await http.get(`/transaction/deposit-return?page=${this.pageCreated}&pageSize=${this.pageSizeCreated}` const response = await http.get(
`/transaction/deposit-return?page=${this.pageCreated}&pageSize=${this.pageSizeCreated}&start=${this.filterStart}&end=${this.filterEnd}`
); );
this.dataCreated = response.body.data.map((item, idx) => { this.dataCreated =
item.key = idx; response.body.data.map((item, idx) => {
return item; item.key = idx;
}) ?? []; return item;
}) ?? [];
this.totalDataCreated = response.body.count ?? 0; this.totalDataCreated = response.body.count ?? 0;
} catch (e) { } catch (e) {
@ -46,13 +48,14 @@ export class Payback {
async getDataConfirmation() { async getDataConfirmation() {
try { try {
const response = await http.get( const response = await http.get(
`/transaction/deposit-return/confirmation?page=${this.pageConfirmation}&pageSize=${this.pageSizeConfirmation}` `/transaction/deposit-return/confirmation?page=${this.pageConfirmation}&pageSize=${this.pageSizeConfirmation}`
); );
console.log(response) console.log(response);
this.dataConfirmation = response.body.data.map((item, idx) => { this.dataConfirmation =
item.key = idx; response.body.data.map((item, idx) => {
return item; item.key = idx;
}) ?? []; return item;
}) ?? [];
this.totalDataConfirmation = response.body.count ?? 0; this.totalDataConfirmation = response.body.count ?? 0;
} catch (e) { } catch (e) {
@ -82,7 +85,9 @@ export class Payback {
async create(data) { async create(data) {
try { try {
const response = await http.post("/transaction/deposit-return").send(data); const response = await http
.post("/transaction/deposit-return")
.send(data);
await this.getDataCreated(); await this.getDataCreated();
return response; return response;
} catch (e) { } catch (e) {
@ -92,13 +97,12 @@ export class Payback {
async confirmPayback(id, data) { async confirmPayback(id, data) {
try { try {
const response = await http.put(`/transaction/deposit-return/confirmation/${id}/${data}`); const response = await http.put(
`/transaction/deposit-return/confirmation/${id}/${data}`
);
// console.log(response) // console.log(response)
// this.data=response.body.data // this.data=response.body.data
await Promise.all([ await Promise.all([this.getDataConfirmation(), this.getDataCreated()]);
this.getDataConfirmation(),
this.getDataCreated()
])
return response; return response;
} catch (e) { } catch (e) {
console.error(e); console.error(e);