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

Merge branch 'main' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production

Browse Source
This commit is contained in:
Muhammad Fadli 2023-05-04 02:47:20 +07:00
commit fc093e3fb9
3 changed files with 63 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/pages/Membership/DetailUser.js
View File

@ -167,7 +167,8 @@ export const DetailUser = observer(() => {
const handleSubmitExport = async () => { const handleSubmitExport = async () => {
const date = formExport.getFieldsValue(); const date = formExport.getFieldsValue();
const dataDate ={ const dataDate ={
dateStart: moment(date.tanggal_export).format("YYYY-MM-DD") dateStart: moment(date.start_date).format("YYYY-MM-DD"),
dateEnd: moment(date.end_date).format("YYYY-MM-DD")
} }
modalLoader.setLoading(true); modalLoader.setLoading(true);
try { try {
@ -207,7 +208,7 @@ export const DetailUser = observer(() => {
render: (text, record) => { render: (text, record) => {
return ( return (
<Text> <Text>
{format(parseISO(record.transaction_date), "dd MMMM yyyy")} {moment(new Date (record.transaction_date).toISOString().slice(0, -1)).format("dd MMMM yyyy")}
</Text> </Text>
); );
}, },
@ -828,8 +829,8 @@ export const DetailUser = observer(() => {
}} }}
onChange={async (page) => { onChange={async (page) => {
let pageNumber = page.current; let pageNumber = page.current;
store.transaction.pageSize = page.pageSize; store.transaction.pageSizeHistoryTopUp = page.pageSize;
store.transaction.page = pageNumber - 1; store.transaction.pageHistoryTopUp = pageNumber - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await getData(); await getData();
modalLoader.setLoading(false); modalLoader.setLoading(false);
@ -855,15 +856,15 @@ export const DetailUser = observer(() => {
position={"top"} position={"top"}
pagination={{ pagination={{
onChange: async (page, pageSize) => { onChange: async (page, pageSize) => {
store.transaction.pageSize = pageSize; store.transaction.pageSizeHistoryTopUp = pageSize;
store.transaction.page = page - 1; store.transaction.pageHistoryTopUp = page - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await getData(); await getData();
modalLoader.setLoading(false); modalLoader.setLoading(false);
}, },
pageSize: store.transaction.pageSize, pageSize: store.transaction.pageSizeHistoryTopUp,
total: store.transaction.total_data, total: store.transaction.total_dataHistoryTopUp,
current: store.transaction.page + 1, current: store.transaction.pageHistoryTopUp + 1,
style: { marginBottom: "1rem", marginRight: "1rem" }, style: { marginBottom: "1rem", marginRight: "1rem" },
}} }}
dataSource={store.transaction.dataHistoryTopUp} dataSource={store.transaction.dataHistoryTopUp}
@ -899,10 +900,7 @@ export const DetailUser = observer(() => {
<br /> <br />
<small> <small>
Transaction Date :{" "} Transaction Date :{" "}
{format( {moment(new Date (item.transaction_date).toISOString().slice(0, -1)).format("dd-MM-yyyy hh:mm:ss")}
parseISO(item.transaction_date),
"dd-MM-yyyy hh:mm:ss"
)}
</small>{" "} </small>{" "}
<br /> <br />
</p> </p>
@ -1149,8 +1147,15 @@ export const DetailUser = observer(() => {
<Col span={24}> <Col span={24}>
<Form layout="vertical" name="filter" form={formExport}> <Form layout="vertical" name="filter" form={formExport}>
<Form.Item <Form.Item
name="tanggal_export" name="start_date"
label="Tanggal" label="Dari"
rules={[{ required: true, message: "Please input Date!" }]}
>
<DatePicker style={{ width: "100%" }} />
</Form.Item>
<Form.Item
name="end_date"
label="Sampai"
rules={[{ required: true, message: "Please input Date!" }]} rules={[{ required: true, message: "Please input Date!" }]}
> >
<DatePicker style={{ width: "100%" }} /> <DatePicker style={{ width: "100%" }} />

59
src/pages/Profile/Profile.js
View File

@ -273,7 +273,7 @@ export const Profile = observer(() => {
render: (text, record) => { render: (text, record) => {
return ( return (
<Text> <Text>
{format(parseISO(record.transaction_date), "dd MMMM yyyy HH:mm:ss")} {moment(new Date (record.transaction_date).toISOString().slice(0, -1)).format("dd MMMM yyyy HH:mm:ss")}
</Text> </Text>
); );
}, },
@ -389,7 +389,8 @@ export const Profile = observer(() => {
const handleSubmitExport = async () => { const handleSubmitExport = async () => {
const date = formExport.getFieldsValue(); const date = formExport.getFieldsValue();
const dataDate ={ const dataDate ={
dateStart: moment(date.tanggal_export).format("YYYY-MM-DD") dateStart: moment(date.start_date).format("YYYY-MM-DD"),
dateEnd: moment(date.end_date).format("YYYY-MM-DD")
} }
modalLoader.setLoading(true); modalLoader.setLoading(true);
try { try {
@ -600,16 +601,16 @@ export const Profile = observer(() => {
dataSource={store.transaction.dataHistoryTopUpProfile} dataSource={store.transaction.dataHistoryTopUpProfile}
bordered bordered
pagination={{ pagination={{
pageSize: store.transaction.pageSize, pageSize: store.transaction.pageSizeHistoryTopUpProfile,
total: store.transaction.total_dataHistoryTopUpProfile, total: store.transaction.total_dataHistoryTopUpProfile,
current: store.transaction.page + 1, current: store.transaction.pageHistoryTopUpProfile + 1,
showSizeChanger: true, showSizeChanger: true,
simple: false, simple: false,
}} }}
onChange={async (page) => { onChange={async (page) => {
let pageNumber = page.current; let pageNumber = page.current;
store.transaction.pageSize = page.pageSize; store.transaction.pageSizeHistoryTopUpProfile = page.pageSize;
store.transaction.page = pageNumber - 1; store.transaction.pageHistoryTopUpProfile = pageNumber - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.transaction.getDataHistoryTopUpProfile( await store.transaction.getDataHistoryTopUpProfile(
store.authentication.profileData?.id store.authentication.profileData?.id
@ -628,17 +629,17 @@ export const Profile = observer(() => {
onChange: async (page, pageSize) => { onChange: async (page, pageSize) => {
console.log(page, "Page"); console.log(page, "Page");
console.log(pageSize, "Page size"); console.log(pageSize, "Page size");
store.transaction.pageSize = pageSize; store.transaction.pageSizeHistoryTopUpProfile = pageSize;
store.transaction.page = page - 1; store.transaction.pageHistoryTopUpProfile = page - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.transaction.getDataHistoryTopUpProfile( await store.transaction.getDataHistoryTopUpProfile(
store.authentication.profileData?.id store.authentication.profileData?.id
); );
modalLoader.setLoading(false); modalLoader.setLoading(false);
}, },
pageSize: store.transaction.pageSize, pageSize: store.transaction.pageSizeHistoryTopUpProfile,
total: store.transaction.total_dataHistoryTopUpProfile, total: store.transaction.total_dataHistoryTopUpProfile,
current: store.transaction.page + 1, current: store.transaction.pageHistoryTopUpProfile + 1,
style: { marginBottom: "1rem", marginRight: "1rem" }, style: { marginBottom: "1rem", marginRight: "1rem" },
}} }}
style={{ padding: 0 }} style={{ padding: 0 }}
@ -677,10 +678,7 @@ export const Profile = observer(() => {
<br /> <br />
<small> <small>
Transaction Date :{" "} Transaction Date :{" "}
{format( {moment(new Date (item.transaction_date).toISOString().slice(0, -1)).format("dd-MM-yyyy")}
parseISO(item.transaction_date),
"dd-MM-yyyy"
)}
</small>{" "} </small>{" "}
<br /> <br />
</p> </p>
@ -853,16 +851,16 @@ export const Profile = observer(() => {
dataSource={store.transaction.dataHistorybillProfile} dataSource={store.transaction.dataHistorybillProfile}
bordered bordered
pagination={{ pagination={{
pageSize: store.transaction.pageSize, pageSize: store.transaction.pageSizeHistorybillProfile,
total: store.transaction.total_dataHistorybillProfile, total: store.transaction.total_dataHistorybillProfile,
current: store.transaction.page + 1, current: store.transaction.pageHistorybillProfile + 1,
showSizeChanger: true, showSizeChanger: true,
simple: false, simple: false,
}} }}
onChange={async (page) => { onChange={async (page) => {
let pageNumber = page.current; let pageNumber = page.current;
store.transaction.pageSize = page.pageSize; store.transaction.pageSizeHistorybillProfile = page.pageSize;
store.transaction.page = pageNumber - 1; store.transaction.pageHistorybillProfile = pageNumber - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.transaction.getDataHistoryCheckBill(); await store.transaction.getDataHistoryCheckBill();
modalLoader.setLoading(false); modalLoader.setLoading(false);
@ -879,15 +877,15 @@ export const Profile = observer(() => {
onChange: async (page, pageSize) => { onChange: async (page, pageSize) => {
console.log(page, "Page"); console.log(page, "Page");
console.log(pageSize, "Page size"); console.log(pageSize, "Page size");
store.transaction.pageSize = pageSize; store.transaction.pageSizeHistorybillProfile = pageSize;
store.transaction.page = page - 1; store.transaction.pageHistorybillProfile = page - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.transaction.getDataHistoryCheckBill(); await store.transaction.getDataHistoryCheckBill();
modalLoader.setLoading(false); modalLoader.setLoading(false);
}, },
pageSize: store.transaction.pageSize, pageSize: store.transaction.pageSizeHistorybillProfile,
total: store.transaction.total_dataHistorybillProfile, total: store.transaction.total_dataHistorybillProfile,
current: store.transaction.page + 1, current: store.transaction.pageHistorybillProfile + 1,
style: { marginBottom: "1rem", marginRight: "1rem" }, style: { marginBottom: "1rem", marginRight: "1rem" },
}} }}
style={{ padding: 0 }} style={{ padding: 0 }}
@ -926,10 +924,7 @@ export const Profile = observer(() => {
<br /> <br />
<small> <small>
Transaction Date :{" "} Transaction Date :{" "}
{format( { moment(new Date (item.created_at).toISOString().slice(0, -1)).format("MM-DD-YYYY dd-MM-yyyy") }
parseISO(item.transaction_date),
"dd-MM-yyyy"
)}
</small>{" "} </small>{" "}
<br /> <br />
</p> </p>
@ -1038,8 +1033,16 @@ export const Profile = observer(() => {
<Col span={24}> <Col span={24}>
<Form layout="vertical" name="filter" form={formExport}> <Form layout="vertical" name="filter" form={formExport}>
<Form.Item <Form.Item
name="tanggal_export" name="start_date"
label="Tanggal" label="Dari"
rules={[{ required: true, message: "Please input Date!" }]}
>
<DatePicker style={{ width: "100%" }} />
</Form.Item>
<Form.Item
name="end_date"
label="Sampai"
rules={[{ required: true, message: "Please input Date!" }]} rules={[{ required: true, message: "Please input Date!" }]}
> >
<DatePicker style={{ width: "100%" }} /> <DatePicker style={{ width: "100%" }} />

18
src/store/transaction.js
View File

@ -46,9 +46,13 @@ export class Transaction {
dataHistoryTopUp = []; dataHistoryTopUp = [];
total_dataHistoryTopUp = 0; total_dataHistoryTopUp = 0;
pageHistorybillProfile = 0;
pageSizeHistorybillProfile = 10;
dataHistorybillProfile = []; dataHistorybillProfile = [];
total_dataHistorybillProfile = 0; total_dataHistorybillProfile = 0;
pageHistoryTopUpProfile = 0;
pageSizeHistoryTopUpProfile = 10;
dataHistoryTopUpProfile = []; dataHistoryTopUpProfile = [];
total_dataHistoryTopUpProfile = 0; total_dataHistoryTopUpProfile = 0;
@ -141,12 +145,12 @@ export class Transaction {
async getDataHistoryCheckBill() { async getDataHistoryCheckBill() {
try { try {
const response = await http.get(
`/transaction/check-bill-history`
);
// const response = await http.get( // const response = await http.get(
// `/transaction/check-bill-history?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}` // `/transaction/check-bill-history`
// ); // );
const response = await http.get(
`/transaction/check-bill-history?page=${this.pageHistorybillProfile}&pageSize=${this.pageSizeHistorybillProfile}`
);
console.log("bill", response); console.log("bill", response);
this.dataHistorybillProfile = response.body.data ?? []; this.dataHistorybillProfile = response.body.data ?? [];
this.total_dataHistorybillProfile = response?.body?.count ?? 0; this.total_dataHistorybillProfile = response?.body?.count ?? 0;
@ -183,7 +187,7 @@ export class Transaction {
async getDataHistoryTopUp(id) { async getDataHistoryTopUp(id) {
try { try {
const response = await http.get( const response = await http.get(
`/transaction/history-deposit?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}` `/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
); );
console.log(response, 'get data history') console.log(response, 'get data history')
this.dataHistoryTopUp = response.body.data ?? []; this.dataHistoryTopUp = response.body.data ?? [];
@ -196,7 +200,7 @@ export class Transaction {
async getDataHistoryTopUpProfile(id) { async getDataHistoryTopUpProfile(id) {
try { try {
const response = await http.get( const response = await http.get(
`/transaction/history-deposit-profile?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}` `/transaction/history-deposit-profile?page=${this.pageHistoryTopUpProfile}&pageSize=${this.pageSizeHistoryTopUpProfile}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
); );
console.log(response, 'get data history Profile') console.log(response, 'get data history Profile')
this.dataHistoryTopUpProfile = response.body.data ?? []; this.dataHistoryTopUpProfile = response.body.data ?? [];
@ -285,7 +289,7 @@ export class Transaction {
}).then((response) => { }).then((response) => {
var fileDownload = require('react-file-download'); var fileDownload = require('react-file-download');
message.success("Success export"); message.success("Success export");
fileDownload(response.data, `Mutasi Transaki ${data.userDetail.name} ${date.dateStart}.xlsx`); fileDownload(response.data, `Mutasi Transaki ${data.userDetail.name} ${date.dateStart} - ${date.dateEnd}.xlsx`);
return fileDownload; return fileDownload;
}).catch(function (error) { }).catch(function (error) {
message.error("No data to export"); message.error("No data to export");