Skip to content

Commit

Permalink
Merge pull request #659 from bigcapitalhq/format-money-table-columns
Browse files Browse the repository at this point in the history 
feat: Tabular number of all money columns
  • Loading branch information
@abouolia
abouolia authored Sep 4, 2024
2 parents c032a5d + fe5cd5a commit 3795322
Show file tree
Hide file tree
Showing 15 changed files with 53 additions and 12 deletions.
4 changes: 3 additions & 1 deletion packages/webapp/src/containers/FinancialStatements/AgingSummary/dynamicColumns.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// @ts-nocheck
import React, { useMemo } from 'react';
import * as R from 'ramda';
import { getColumnWidth } from '@/utils';
import { Align } from '@/constants';
Expand All @@ -25,6 +24,7 @@ const currentAccessor = R.curry((data, column) => {
className: column.id,
width: getColumnWidth(data, accessor, { minWidth: 120 }),
align: Align.Right,
money: true,
};
});

Expand All @@ -38,6 +38,7 @@ const totalAccessor = R.curry((data, column) => {
className: column.key,
width: getColumnWidth(data, accessor, { minWidth: 120 }),
align: Align.Right,
money: true,
};
});

Expand All @@ -51,6 +52,7 @@ const agingPeriodAccessor = R.curry((data, column) => {
className: column.key,
width: getColumnWidth(data, accessor, { minWidth: 120 }),
align: Align.Right,
money: true,
};
});

Expand Down
15 changes: 11 additions & 4 deletions packages/webapp/src/containers/FinancialStatements/BalanceSheet/dynamicColumns.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import * as R from 'ramda';
import { isEmpty } from 'lodash';

import { Align } from '@/constants';
import { CellTextSpan } from '@/components/Datatable/Cells';
import { getColumnWidth } from '@/utils';

const getTableCellValueAccessor = (index) => `cells[${index}].value`;
Expand All @@ -12,12 +11,11 @@ const getReportColWidth = (data, accessor, headerText) => {
return getColumnWidth(
data,
accessor,
{ magicSpacing: 10, minWidth: 100 },
{ magicSpacing: 12, minWidth: 100 },
headerText,
);
};


/**
* Account name column mapper.
*/
Expand Down Expand Up @@ -77,6 +75,7 @@ const dateRangeMapper = R.curry((data, column) => {
key: column.key,
disableSortBy: true,
textOverview: true,
money: true,
align: isDateColumnHasColumns ? Align.Center : Align.Right,
};
return R.compose(
Expand Down Expand Up @@ -104,9 +103,9 @@ const totalMapper = R.curry((data, column) => {
Header: column.label,
accessor,
textOverview: true,
Cell: CellTextSpan,
width,
disableSortBy: true,
money: true,
align: hasChildren ? Align.Center : Align.Right,
};
return R.compose(
Expand All @@ -129,6 +128,7 @@ const percentageOfColumnAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true,
};
});

Expand All @@ -147,6 +147,7 @@ const percentageOfRowAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true,
};
});

Expand All @@ -165,6 +166,7 @@ const previousYearAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true,
};
});

Expand All @@ -183,6 +185,7 @@ const previousYearChangeAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true,
};
});

Expand All @@ -201,6 +204,7 @@ const previousYearPercentageAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true,
};
});

Expand All @@ -219,6 +223,7 @@ const previousPeriodAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true,
};
});

Expand All @@ -237,6 +242,7 @@ const previousPeriodChangeAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true,
};
});

Expand All @@ -255,6 +261,7 @@ const previousPeriodPercentageAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true,
};
});

Expand Down
6 changes: 4 additions & 2 deletions packages/webapp/src/containers/FinancialStatements/CashFlowStatement/dynamicColumns.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@ const dateRangeMapper = (data, index, column) => ({
key: column.key,
accessor: `cells[${index}].value`,
width: getColumnWidth(data, `cells.${index}.value`, {
magicSpacing: 10,
magicSpacing: 12,
minWidth: 100,
}),
className: `date-period ${column.key}`,
disableSortBy: true,
textOverview: true,
align: Align.Right,
money: true
});

/**
Expand All @@ -50,11 +51,12 @@ const totalMapper = (data, index, column) => ({
textOverview: true,
Cell: CellTextSpan,
width: getColumnWidth(data, `cells[${index}].value`, {
magicSpacing: 10,
magicSpacing: 12,
minWidth: 100,
}),
disableSortBy: true,
align: Align.Right,
money: true
});

/**
Expand Down
9 changes: 6 additions & 3 deletions packages/webapp/src/containers/FinancialStatements/CustomersTransactions/components.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ export const useCustomersTransactionsColumns = () => {
textOverview: true,
width: getColumnWidth(tableRows, 'cells[5].value', {
minWidth: 100,
magicSpacing: 10,
magicSpacing: 12,
}),
align: Align.Right,
money: true,
},
{
Header: intl.get('debit'),
Expand All @@ -72,9 +73,10 @@ export const useCustomersTransactionsColumns = () => {
textOverview: true,
width: getColumnWidth(tableRows, 'cells[6].value', {
minWidth: 100,
magicSpacing: 10,
magicSpacing: 12,
}),
align: Align.Right,
money: true,
},
{
Header: intl.get('running_balance'),
Expand All @@ -83,9 +85,10 @@ export const useCustomersTransactionsColumns = () => {
textOverview: true,
width: getColumnWidth(tableRows, 'cells[7].value', {
minWidth: 120,
magicSpacing: 10,
magicSpacing: 12,
}),
align: Align.Right,
money: true,
},
],
[tableRows],
Expand Down
1 change: 1 addition & 0 deletions packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/utils.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const numericColumn = R.curry((data, index, column) => ({
}),
disableSortBy: true,
align: Align.Right,
money: true,
}));

const columnsMapper = R.curry((data, index, column) => ({
Expand Down
1 change: 1 addition & 0 deletions packages/webapp/src/containers/FinancialStatements/InventoryValuation/dynamicColumns.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const numericColumnAccessor = R.curry((data, column) => {
return {
...column,
align: Align.Right,
money: true,
width,
};
});
Expand Down
14 changes: 12 additions & 2 deletions packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/dynamicColumns.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import * as R from 'ramda';
import { isEmpty } from 'lodash';

import { Align } from '@/constants';
import { CellTextSpan } from '@/components/Datatable/Cells';
import { getColumnWidth } from '@/utils';

const getTableCellValueAccessor = (index) => `cells[${index}].value`;
Expand Down Expand Up @@ -34,6 +33,7 @@ const percentageOfIncomeAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true
};
});

Expand All @@ -52,6 +52,7 @@ const percentageOfExpenseAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true
};
});

Expand All @@ -70,6 +71,7 @@ const percentageOfColumnAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true
};
});

Expand All @@ -88,6 +90,7 @@ const percentageOfRowAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true
};
});

Expand All @@ -106,6 +109,7 @@ const previousYearAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true
};
});

Expand All @@ -124,6 +128,7 @@ const previousYearChangeAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true
};
});

Expand All @@ -142,6 +147,7 @@ const previousYearPercentageAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true
};
});

Expand All @@ -160,6 +166,7 @@ const previousPeriodAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true
};
});

Expand All @@ -178,6 +185,7 @@ const previousPeriodChangeAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true
};
});

Expand All @@ -196,6 +204,7 @@ const previousPeriodPercentageAccessor = R.curry((data, column) => {
align: Align.Right,
disableSortBy: true,
textOverview: true,
money: true
};
});

Expand Down Expand Up @@ -274,10 +283,10 @@ const totalColumn = R.curry((data, column) => {
Header: column.label,
accessor,
textOverview: true,
Cell: CellTextSpan,
width,
disableSortBy: true,
align: hasChildren ? Align.Center : Align.Right,
money: true
};
});

Expand Down Expand Up @@ -338,6 +347,7 @@ const dateRangeColumn = R.curry((data, column) => {
disableSortBy: true,
textOverview: true,
align: isDateColumnHasColumns ? Align.Center : Align.Right,
money: true
};
return R.compose(
R.when(
Expand Down
1 change: 1 addition & 0 deletions packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dynamicColumns.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const numericColumnAccessor = R.curry((data, column) => {
...column,
align: Align.Right,
width,
money: true
};
});

Expand Down
1 change: 1 addition & 0 deletions packages/webapp/src/containers/FinancialStatements/SalesByItems/dynamicColumns.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const numericColumnAccessor = R.curry((data, column) => {
...column,
align: Align.Right,
width,
money: true
};
});

Expand Down
2 changes: 2 additions & 0 deletions packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/components.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const percentageColumnAccessor = () => ({
width: 140,
textOverview: true,
align: Align.Right,
money: true
});

/**
Expand All @@ -61,6 +62,7 @@ const totalColumnAccessor = () => ({
width: 140,
textOverview: true,
align: Align.Right,
money: true
});

/**
Expand Down
7 changes: 7 additions & 0 deletions packages/webapp/src/containers/FinancialStatements/VendorsTransactions/components.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
useVendorsTransactionsCsvExport,
useVendorsTransactionsXlsxExport,
} from '@/hooks/query';
import { Align } from '@/constants';

/**
* Retrieve vendors transactions columns.
Expand Down Expand Up @@ -63,6 +64,8 @@ export const useVendorsTransactionsColumns = () => {
minWidth: 100,
magicSpacing: 10,
}),
money: true,
align: Align.Right,
},
{
Header: intl.get('debit'),
Expand All @@ -73,6 +76,8 @@ export const useVendorsTransactionsColumns = () => {
minWidth: 100,
magicSpacing: 10,
}),
money: true,
align: Align.Right,
},
{
Header: intl.get('running_balance'),
Expand All @@ -83,6 +88,8 @@ export const useVendorsTransactionsColumns = () => {
minWidth: 120,
magicSpacing: 10,
}),
money: true,
align: Align.Right,
},
],
[table],
Expand Down
1 change: 1 addition & 0 deletions packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ export function useVendorsCreditNoteTableColumns() {
clickable: true,
textOverview: true,
disableSortBy: true,
money: true,
className: clsx(CLASSES.FONT_BOLD),
},
{
Expand Down
Loading

0 comments on commit 3795322

Please sign in to comment.