fix(FinancialReport): BIG-205 Financial reports missing border final border bottom.

This commit is contained in:
a.bouhuolia
2022-01-02 17:24:35 +02:00
parent aba732724b
commit ecda9296b8
7 changed files with 107 additions and 57 deletions

View File

@@ -1,13 +1,12 @@
import React, { useMemo, useCallback } from 'react'; import React, { useMemo } 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';
import { useCustomersTransactionsColumns } from './components'; import { useCustomersTransactionsColumns } from './components';
import { useCustomersTransactionsContext } from './CustomersTransactionsProvider'; import { useCustomersTransactionsContext } from './CustomersTransactionsProvider';
import { defaultExpanderReducer, getColumnWidth } from 'utils'; import { defaultExpanderReducer } from 'utils';
/** /**
* Customers transactions table. * Customers transactions table.
@@ -16,19 +15,20 @@ export default function CustomersTransactionsTable({
// #ownProps // #ownProps
companyName, companyName,
}) { }) {
// Customers transactions context.
const { const {
customersTransactions: { tableRows }, customersTransactions: { tableRows },
isCustomersTransactionsLoading, isCustomersTransactionsLoading,
query, query,
} = useCustomersTransactionsContext(); } = useCustomersTransactionsContext();
// Customers transactions table columns.
const columns = useCustomersTransactionsColumns(); const columns = useCustomersTransactionsColumns();
const expandedRows = useMemo(() => defaultExpanderReducer(tableRows, 4), [ const expandedRows = useMemo(
tableRows, () => defaultExpanderReducer(tableRows, 4),
]); [tableRows],
);
const rowClassNames = (row) => { const rowClassNames = (row) => {
return [`row-type--${row.original.row_types}`]; return [`row-type--${row.original.row_types}`];

View File

@@ -18,6 +18,7 @@ const columnsMapper = (data, index, column) => ({
magicSpacing: 10, magicSpacing: 10,
}), }),
disableSortBy: true, disableSortBy: true,
textOverview: true,
}); });
/** /**

View File

@@ -1,13 +1,12 @@
import React, { useMemo, useCallback } from 'react'; import React, { useMemo } 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';
import { useVendorsTransactionsColumns } from './components'; import { useVendorsTransactionsColumns } from './components';
import { useVendorsTransactionsContext } from './VendorsTransactionsProvider'; import { useVendorsTransactionsContext } from './VendorsTransactionsProvider';
import { defaultExpanderReducer, getColumnWidth } from 'utils'; import { defaultExpanderReducer } from 'utils';
/** /**
* Vendors transactions table. * Vendors transactions table.
@@ -17,19 +16,20 @@ export default function VendorsTransactionsTable({
// #ownProps // #ownProps
companyName, companyName,
}) { }) {
// Vendor transactions context.
const { const {
vendorsTransactions: { tableRows }, vendorsTransactions: { tableRows },
isVendorsTransactionsLoading, isVendorsTransactionsLoading,
query, query,
} = useVendorsTransactionsContext(); } = useVendorsTransactionsContext();
// Retireve vendor transactions table columns.
const columns = useVendorsTransactionsColumns(); const columns = useVendorsTransactionsColumns();
const expandedRows = useMemo(() => defaultExpanderReducer(tableRows, 5), [ const expandedRows = useMemo(
tableRows, () => defaultExpanderReducer(tableRows, 5),
]); [tableRows],
);
const rowClassNames = (row) => { const rowClassNames = (row) => {
return [`row-type--${row.original.row_types}`]; return [`row-type--${row.original.row_types}`];

View File

@@ -1,25 +1,26 @@
.financial-sheet { .financial-sheet {
&--customers-balance-summary, &--customers-balance-summary,
&--vendors-balance-summary { &--vendors-balance-summary {
.financial-sheet__table { .financial-sheet__table {
.thead, .thead,
.tbody { .tbody {
.tr .td.customer_name ~ .td,
.tr .th.customer_name ~ .th { .tr .td.customer_name~.td,
.tr .th.customer_name~.th {
text-align: right; text-align: right;
} }
} }
.tbody { .tbody {
.tr:not(.no-results) { .tr:not(.no-results) {
&.row-type--CUSTOMER,
&.row-type--VENDOR {
border-top: 1px solid #BBB
}
.td { .td {
border-bottom: 0; border-bottom: 0;
padding-top: 0.4rem; padding-top: 0.4rem;
padding-bottom: 0.4rem; padding-bottom: 0.4rem;
} }
&.row-type--TOTAL { &.row-type--TOTAL {
font-weight: 500; font-weight: 500;
@@ -33,6 +34,7 @@
} }
} }
} }
.financial-statement--balance-summary { .financial-statement--balance-summary {
.financial-header-drawer { .financial-header-drawer {
.bp3-drawer { .bp3-drawer {

View File

@@ -1,13 +1,17 @@
.financial-sheet { .financial-sheet {
&--customer-transactions, &--customer-transactions,
&--vendor-transactions { &--vendor-transactions {
width: 100%; width: 100%;
.financial-sheet__table { .financial-sheet__table {
.tbody, .tbody,
.thead { .thead {
.tr .td, .tr .td,
.tr .th { .tr .th {
&.credit, &.credit,
&.debit, &.debit,
&.running_balance { &.running_balance {
@@ -15,6 +19,7 @@
} }
} }
} }
.tbody { .tbody {
.tr .td { .tr .td {
padding-top: 0.2rem; padding-top: 0.2rem;
@@ -24,39 +29,51 @@
&.customer_name, &.customer_name,
&.vendor_name { &.vendor_name {
> div { >div {
display: flex; display: flex;
} }
span.force-width { span.force-width {
position: relative; position: relative;
} }
} }
} }
.tr:not(.no-results) .td { .tr:not(.no-results) .td {
border-left: 1px solid #ececec; border-left: 1px solid #ececec;
} }
.tr:last-child .td {
border-bottom: 1px solid #e0e0e0;
}
.tr.row-type { .tr.row-type {
&--CUSTOMER, &--CUSTOMER,
&--VENDOR { &--VENDOR {
.td { .td {
&.customer_name, &.customer_name,
&.vendor_name { &.vendor_name {
font-weight: 500; font-weight: 500;
} }
&.name { &.name {
// border-left-color: transparent; // border-left-color: transparent;
} }
} }
&:not(:first-child).is-expanded .td { &:not(:first-child).is-expanded .td {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
} }
} }
&--OPENING_BALANCE, &--OPENING_BALANCE,
// &--TRANSACTION, // &--TRANSACTION,
&--CLOSING_BALANCE { &--CLOSING_BALANCE {
font-weight: 500; font-weight: 500;
} }
&--CUSTOMER, &--CUSTOMER,
&--VENDOR { &--VENDOR {
&.is-expanded { &.is-expanded {
@@ -64,10 +81,12 @@
display: none; display: none;
} }
} }
&:not(:first-child).is-expanded .td { &:not(:first-child).is-expanded .td {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
} }
} }
&--CUSTOMER:last-child, &--CUSTOMER:last-child,
&--VENDOR:last-child { &--VENDOR:last-child {
.td { .td {

View File

@@ -1,75 +1,88 @@
.financial-sheet {
&--general-ledger {
.financial-sheet__table {
.financial-sheet{
&--general-ledger{
.financial-sheet__table{
.tbody, .tbody,
.thead{ .thead {
.tr .td, .tr .td,
.tr .th{ .tr .th {
&.credit, &.credit,
&.debit, &.debit,
&.running_balance, &.running_balance,
&.amount{ &.amount {
text-align: right; text-align: right;
} }
} }
} }
.tbody{
.tr .td{ .tbody {
.tr .td {
padding-top: 0.2rem; padding-top: 0.2rem;
padding-bottom: 0.2rem; padding-bottom: 0.2rem;
border-top-color: transparent; border-top-color: transparent;
border-bottom-color: transparent; border-bottom-color: transparent;
&.date{ &.date {
> div{ >div {
display: flex; display: flex;
} }
span.force-width{
span.force-width {
position: relative; position: relative;
} }
} }
} }
.tr:not(.no-results) .td{
.tr:not(.no-results) .td {
border-left: 1px solid #ececec; border-left: 1px solid #ececec;
} }
.tr{ .tr:last-child .td {
&.is-expanded{ border-bottom: 1px solid #ececec;
}
.td.amount{ .tr {
&.is-expanded {
.cell-inner{ .td.amount {
.cell-inner {
display: none display: none
} }
} }
} }
} }
.tr.row-type{
.tr.row-type {
&--ACCOUNT_ROW{ &--ACCOUNT_ROW {
.td{ .td {
&.date{ &.date {
font-weight: 500; font-weight: 500;
} }
&.name{
&.name {
border-left-color: transparent; border-left-color: transparent;
} }
} }
&:not(:first-child).is-expanded .td{
&:not(:first-child).is-expanded .td {
border-top: 1px solid #DDD; border-top: 1px solid #DDD;
} }
} }
&--OPENING_BALANCE, &--OPENING_BALANCE,
&--CLOSING_BALANCE{ &--CLOSING_BALANCE {
.amount{ .amount {
font-weight: 500; font-weight: 500;
} }
} }
&--CLOSING_BALANCE{
.name{ &--CLOSING_BALANCE {
.name {
font-weight: 500; font-weight: 500;
} }
} }

View File

@@ -3,21 +3,25 @@
width: 100%; width: 100%;
.financial-sheet__table { .financial-sheet__table {
.tbody, .tbody,
.thead { .thead {
.tr .td.transaction_id ~ .td,
.tr .th.transaction_id ~ .th { .tr .td.transaction_id~.td,
.tr .th.transaction_id~.th {
text-align: right; text-align: right;
} }
} }
.tbody { .tbody {
.tr .td { .tr .td {
padding-top: 0.2rem; padding-top: 0.2rem;
padding-bottom: 0.2rem; padding-bottom: 0.2rem;
border-top-color: transparent; border-top-color: transparent;
border-bottom-color: transparent; border-bottom-color: transparent;
&.date { &.date {
> div { >div {
display: flex; display: flex;
} }
@@ -26,10 +30,15 @@
} }
} }
} }
.tr:not(.no-results) .td { .tr:not(.no-results) .td {
border-left: 1px solid #ececec; border-left: 1px solid #ececec;
} }
.tr:last-child .td {
border-bottom: 1px solid #ddd;
}
.tr.row-type { .tr.row-type {
&--ITEM { &--ITEM {
.td { .td {
@@ -37,15 +46,18 @@
border-left-color: transparent; border-left-color: transparent;
} }
} }
&:not(:first-child).is-expanded .td { &:not(:first-child).is-expanded .td {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
} }
} }
&--ITEM, &--ITEM,
&--OPENING_ENTRY, &--OPENING_ENTRY,
&--CLOSING_ENTRY { &--CLOSING_ENTRY {
font-weight: 500; font-weight: 500;
} }
&--ITEM { &--ITEM {
&.is-expanded { &.is-expanded {
.td.value .cell-inner { .td.value .cell-inner {
@@ -58,16 +70,19 @@
} }
} }
} }
.number-format-dropdown { .number-format-dropdown {
.toggles-fields { .toggles-fields {
.bp3-form-group:first-child { .bp3-form-group:first-child {
display: none; display: none;
} }
} }
.form-group--money-format { .form-group--money-format {
display: none; display: none;
} }
} }
.financial-statement--inventory-details { .financial-statement--inventory-details {
.financial-header-drawer { .financial-header-drawer {
.bp3-drawer { .bp3-drawer {