fix(ContactBalanceSummary): BIG-288 percentage of column.

This commit is contained in:
a.bouhuolia
2022-01-12 20:15:00 +02:00
parent dcfe92076b
commit 8f267b98e4
8 changed files with 122 additions and 67 deletions

View File

@@ -52,7 +52,7 @@ export default function CustomersBalanceSummaryGeneralPanelContent() {
<Row> <Row>
<Col xs={5}> <Col xs={5}>
<FastField name={'percentage'} type={'checkbox'}> <FastField name={'percentage_column'} type={'checkbox'}>
{({ field }) => ( {({ field }) => (
<FormGroup labelInfo={<FieldHint />}> <FormGroup labelInfo={<FieldHint />}>
<Checkbox <Checkbox

View File

@@ -1,6 +1,5 @@
import React, { useMemo, useCallback } from 'react'; import React from 'react';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import classNames from 'classnames';
import FinancialSheet from 'components/FinancialSheet'; import FinancialSheet from 'components/FinancialSheet';
import DataTable from 'components/DataTable'; import DataTable from 'components/DataTable';
@@ -15,11 +14,9 @@ export default function CustomersBalanceSummaryTable({
// #ownProps // #ownProps
companyName, companyName,
}) { }) {
const { const {
isCustomersBalanceLoading, isCustomersBalanceLoading,
CustomerBalanceSummary: { tableRows }, CustomerBalanceSummary: { table },
} = useCustomersBalanceSummaryContext(); } = useCustomersBalanceSummaryContext();
const columns = useCustomersSummaryColumns(); const columns = useCustomersSummaryColumns();
@@ -39,7 +36,7 @@ export default function CustomersBalanceSummaryTable({
<DataTable <DataTable
className="bigcapital-datatable--financial-report" className="bigcapital-datatable--financial-report"
columns={columns} columns={columns}
data={tableRows} data={table.data}
rowClassNames={rowClassNames} rowClassNames={rowClassNames}
noInitialFetch={true} noInitialFetch={true}
/> />

View File

@@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import * as R from 'ramda';
import { If } from 'components'; import { If } from 'components';
import FinancialLoadingBar from '../FinancialLoadingBar'; import FinancialLoadingBar from '../FinancialLoadingBar';
@@ -9,29 +10,53 @@ import { useCustomersBalanceSummaryContext } from './CustomersBalanceSummaryProv
* Retrieve customers balance summary columns. * Retrieve customers balance summary columns.
*/ */
export const useCustomersSummaryColumns = () => { export const useCustomersSummaryColumns = () => {
return React.useMemo( const {
() => [ CustomerBalanceSummary: { table },
{ } = useCustomersBalanceSummaryContext();
return React.useMemo(() => {
return dynamicColumns(table.columns || []);
}, [table.columns]);
};
/**
* Account name column accessor.
*/
const accountNameColumnAccessor = () => ({
Header: intl.get('customer_name'), Header: intl.get('customer_name'),
accessor: 'cells[0].value', accessor: 'cells[0].value',
className: 'customer_name', className: 'customer_name',
width: 240, width: 240,
}, });
{
/**
* Total column accessor.
*/
const totalColumnAccessor = () => ({
Header: intl.get('total'), Header: intl.get('total'),
accessor: 'cells[1].value', accessor: 'cells[1].value',
className: 'total', className: 'total',
width: 140, width: 140,
}, });
{
/**
* Percentage column accessor.
*/
const percentageColumnAccessor = () => ({
Header: intl.get('percentage_of_column'), Header: intl.get('percentage_of_column'),
accessor: 'cells[2].value', accessor: 'cells[2].value',
className: 'total', className: 'total',
width: 140, width: 140,
}, });
],
[], const dynamicColumns = (columns) => {
); return R.map(
R.compose(
R.when(R.pathEq(['key'], 'name'), accountNameColumnAccessor),
R.when(R.pathEq(['key'], 'total'), totalColumnAccessor),
R.when(R.pathEq(['key'], 'percentage_of_column'), percentageColumnAccessor),
),
)(columns);
}; };
/** /**

View File

@@ -58,14 +58,14 @@ export default function VendorsBalanceSummaryHeaderGeneralContent() {
<Row> <Row>
<Col xs={5}> <Col xs={5}>
<FastField name={'percentage'} type={'checkbox'}> <FastField name={'percentage_column'} type={'checkbox'}>
{({ field }) => ( {({ field }) => (
<FormGroup labelInfo={<FieldHint />}> <FormGroup labelInfo={<FieldHint />}>
<Checkbox <Checkbox
inline={true} inline={true}
small={true} small={true}
label={<T id={'percentage_of_column'} />} label={<T id={'percentage_of_column'} />}
name={'percentage'} name={'percentage_column'}
{...field} {...field}
/> />
</FormGroup> </FormGroup>

View File

@@ -14,10 +14,8 @@ export default function VendorsBalanceSummaryTable({
//#ownProps //#ownProps
organizationName, organizationName,
}) { }) {
const { const {
VendorBalanceSummary, VendorBalanceSummary: { table },
isVendorsBalanceLoading, isVendorsBalanceLoading,
} = useVendorsBalanceSummaryContext(); } = useVendorsBalanceSummaryContext();
@@ -39,7 +37,7 @@ export default function VendorsBalanceSummaryTable({
<DataTable <DataTable
className={'bigcapital-datatable--financial-report'} className={'bigcapital-datatable--financial-report'}
columns={columns} columns={columns}
data={VendorBalanceSummary?.tableRows} data={table?.data}
rowClassNames={rowClassNames} rowClassNames={rowClassNames}
noInitialFetch={true} noInitialFetch={true}
/> />

View File

@@ -1,8 +1,8 @@
import React, { useMemo } from 'react'; import React from 'react';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import * as R from 'ramda';
import { If } from 'components'; import { If } from 'components';
import { getColumnWidth } from 'utils';
import FinancialLoadingBar from '../FinancialLoadingBar'; import FinancialLoadingBar from '../FinancialLoadingBar';
import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider'; import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider';
@@ -10,28 +10,65 @@ import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider
* Retrieve vendors balance summary columns. * Retrieve vendors balance summary columns.
*/ */
export const useVendorsBalanceColumns = () => { export const useVendorsBalanceColumns = () => {
return useMemo(() => [ const {
{ VendorBalanceSummary: { table },
} = useVendorsBalanceSummaryContext();
return React.useMemo(() => {
return dynamicColumns(table.columns || []);
}, [table.columns]);
};
/**
* Vendor name accessor.
*/
const vendorColumnAccessor = () => ({
Header: intl.get('vendor_name'), Header: intl.get('vendor_name'),
accessor: 'cells[0].value', accessor: 'cells[0].value',
className: 'customer_name', className: 'vendor_name',
width: 240, width: 240,
sticky: 'left', align: 'left',
textOverview: true, textOverview: true,
}, });
{
/**
* Percentage column accessor.
*/
const percentageColumnAccessor = () => ({
Header: intl.get('percentage_of_column'),
accessor: 'cells[2].value',
className: 'total',
width: 140,
align: 'right',
textOverview: true,
});
/**
* Total column accessor.
*/
const totalColumnAccessor = () => ({
Header: intl.get('total'), Header: intl.get('total'),
accessor: 'cells[1].value', accessor: 'cells[1].value',
className: 'total', className: 'total',
width: 140, width: 140,
}, align: 'right',
{ textOverview: true,
Header: intl.get('percentage_of_column'), });
accessor: 'cells[2].value',
// className: 'total', /**
width: 140, * Composes the response columns to table component columns.
}, */
]); const dynamicColumns = (columns) => {
return R.map(
R.compose(
R.when(R.pathEq(['key'], 'name'), vendorColumnAccessor),
R.when(R.pathEq(['key'], 'total'), totalColumnAccessor),
R.when(
R.pathEq(['key'], 'percentage_of_column'),
percentageColumnAccessor,
),
),
)(columns);
}; };
/** /**

View File

@@ -304,12 +304,11 @@ export function useCustomerBalanceSummaryReport(query, props) {
}, },
{ {
select: (res) => ({ select: (res) => ({
columns: res.data.columns,
query: res.data.query, query: res.data.query,
tableRows: res.data.table.rows, table: res.data.table,
}), }),
defaultData: { defaultData: {
tableRows: [], table: {},
query: {}, query: {},
}, },
...props, ...props,
@@ -334,12 +333,11 @@ export function useVendorsBalanceSummaryReport(query, props) {
{ {
select: (res) => ({ select: (res) => ({
columns: res.data.columns,
query: res.data.query, query: res.data.query,
tableRows: res.data.table.data, table: res.data.table,
}), }),
defaultData: { defaultData: {
tableRows: [], table: {},
query: {}, query: {},
}, },
...props, ...props,

View File

@@ -866,7 +866,7 @@
"published_at": "Published at", "published_at": "Published at",
"customers_balance_summary": "Customers Balance Summary", "customers_balance_summary": "Customers Balance Summary",
"vendors_balance_summary": "Vendors Balance Summary", "vendors_balance_summary": "Vendors Balance Summary",
"percentage_of_column": "Percentage", "percentage_of_column": "% of column",
"customers_transactions": "Customers Transactions", "customers_transactions": "Customers Transactions",
"vendors_transactions": "Vendors Transactions", "vendors_transactions": "Vendors Transactions",
"reference_type": "Reference type", "reference_type": "Reference type",