fix: re-structure the system tables reports.

This commit is contained in:
a.bouhuolia
2022-02-16 18:44:10 +02:00
parent e6fcbfeea6
commit 79144ad4a5
15 changed files with 43 additions and 33 deletions

View File

@@ -2,7 +2,7 @@ import React from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import { TableStyle } from 'common';
import { useAPAgingSummaryContext } from './APAgingSummaryProvider';
@@ -45,7 +45,7 @@ export default function APAgingSummaryTable({
);
}
const APAgingSummaryDataTable = styled(DataTable)`
const APAgingSummaryDataTable = styled(ReportDataTable)`
.table {
.tbody .tr {
.td {

View File

@@ -2,7 +2,7 @@ import React from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import { TableStyle } from 'common';
import { useARAgingSummaryContext } from './ARAgingSummaryProvider';
@@ -26,7 +26,6 @@ export default function ReceivableAgingSummaryTable({
return (
<FinancialSheet
companyName={organizationName}
name={'receivable-aging-summary'}
sheetType={intl.get('receivable_aging_summary')}
asDate={new Date()}
loading={isARAgingLoading}
@@ -43,7 +42,7 @@ export default function ReceivableAgingSummaryTable({
);
}
const ARAgingSummaryDataTable = styled(DataTable)`
const ARAgingSummaryDataTable = styled(ReportDataTable)`
.table {
.tbody .tr {
.td {

View File

@@ -2,7 +2,7 @@ import React from 'react';
import styled from 'styled-components';
import intl from 'react-intl-universal';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import { useBalanceSheetContext } from './BalanceSheetProvider';
@@ -56,7 +56,7 @@ export default function BalanceSheetTable({
);
}
const BalanceSheetDataTable = styled(DataTable)`
const BalanceSheetDataTable = styled(ReportDataTable)`
.table {
.tbody .tr {
.td {
@@ -81,7 +81,7 @@ const BalanceSheetDataTable = styled(DataTable)`
}
&.row_type--TOTAL.row-id--ASSETS,
&.row_type--TOTAL.row-id--LIABILITY_EQUITY {
.td{
.td {
border-bottom: 3px double #000;
}
}

View File

@@ -2,7 +2,7 @@ import React from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import { useCustomersBalanceSummaryContext } from './CustomersBalanceSummaryProvider';
import { useCustomersSummaryColumns } from './components';
@@ -41,7 +41,7 @@ export default function CustomersBalanceSummaryTable({
);
}
const CustomerBalanceDataTable = styled(DataTable)`
const CustomerBalanceDataTable = styled(ReportDataTable)`
.table {
.tbody {
.tr:not(.no-results) {

View File

@@ -4,7 +4,7 @@ import styled from 'styled-components';
import { defaultExpanderReducer, tableRowTypesToClassnames } from 'utils';
import { FinancialSheet, DataTable } from 'components';
import { FinancialSheet, ReportDataTable } from 'components';
import TableVirtualizedListRows from 'components/Datatable/TableVirtualizedRows';
import TableFastCell from 'components/Datatable/TableFastCell';
@@ -66,7 +66,7 @@ export default function GeneralLedgerTable({ companyName }) {
);
}
const GeneralLedgerDataTable = styled(DataTable)`
const GeneralLedgerDataTable = styled(ReportDataTable)`
.tbody {
.tr .td {
padding-top: 0.2rem;
@@ -91,13 +91,12 @@ const GeneralLedgerDataTable = styled(DataTable)`
&.date {
font-weight: 500;
.cell-inner{
.cell-inner {
white-space: nowrap;
position: relative;
}
}
}
&:not(:first-child).is-expanded .td {
border-top: 1px solid #ddd;
}
@@ -109,7 +108,6 @@ const GeneralLedgerDataTable = styled(DataTable)`
font-weight: 500;
}
}
&--CLOSING_BALANCE {
.name {
font-weight: 500;

View File

@@ -2,12 +2,11 @@ import React, { useMemo } from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import { useInventoryItemDetailsColumns } from './components';
import { useInventoryItemDetailsContext } from './InventoryItemDetailsProvider';
import { defaultExpanderReducer, tableRowTypesToClassnames } from 'utils';
import { TableStyle } from 'common';
/**
@@ -54,7 +53,7 @@ export function InventoryItemDetailsTable({
);
}
const InventoryItemDetailsDataTable = styled(DataTable)`
const InventoryItemDetailsDataTable = styled(ReportDataTable)`
.table {
.tbody {
.tr .td {

View File

@@ -2,7 +2,7 @@ import React from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import { useInventoryValuationContext } from './InventoryValuationProvider';
import { useInventoryValuationTableColumns } from './components';
@@ -54,7 +54,7 @@ const InventoryValuationSheet = styled(FinancialSheet)`
min-width: 850px;
`;
const InventoryValuationDataTable = styled(DataTable)`
const InventoryValuationDataTable = styled(ReportDataTable)`
.table {
.tbody {
.tr .td {

View File

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import TableVirtualizedListRows from 'components/Datatable/TableVirtualizedRows';
import TableFastCell from 'components/Datatable/TableFastCell';
@@ -60,7 +60,7 @@ export function JournalTable({ companyName }) {
);
}
const JournalDataTable = styled(DataTable)`
const JournalDataTable = styled(ReportDataTable)`
.table {
.tbody {
.tr:not(.no-results) .td {

View File

@@ -2,7 +2,11 @@ import React from 'react';
import styled from 'styled-components';
import { TableStyle } from 'common';
import { DataTable, FinancialSheet, FormattedMessage as T } from 'components';
import {
ReportDataTable,
FinancialSheet,
FormattedMessage as T,
} from 'components';
import { tableRowTypesToClassnames, defaultExpanderReducer } from 'utils';
import { useProfitLossSheetColumns } from './hooks';
@@ -49,7 +53,7 @@ export default function ProfitLossSheetTable({
);
}
const ProfitLossDataTable = styled(DataTable)`
const ProfitLossDataTable = styled(ReportDataTable)`
.table {
.tbody .tr {
.td {

View File

@@ -2,7 +2,7 @@ import React from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import { usePurchaseByItemsContext } from './PurchasesByItemsProvider';
import { usePurchasesByItemsTableColumns } from './components';
@@ -50,7 +50,7 @@ const PurchasesByItemsSheet = styled(FinancialSheet)`
min-width: 850px;
`;
const PurchasesByItemsDataTable = styled(DataTable)`
const PurchasesByItemsDataTable = styled(ReportDataTable)`
.table {
.tbody {
.tr .td {

View File

@@ -2,7 +2,7 @@ import React from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import { useSalesByItemsContext } from './SalesByItemProvider';
import { useSalesByItemsTableColumns } from './components';
@@ -52,7 +52,7 @@ const SalesByItemsSheet = styled(FinancialSheet)`
min-width: 850px;
`;
const SalesByItemsDataTable = styled(DataTable)`
const SalesByItemsDataTable = styled(ReportDataTable)`
.table {
.tbody {
.tr .td {

View File

@@ -2,7 +2,7 @@ import React from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import { useTrialBalanceSheetContext } from './TrialBalanceProvider';
import { useTrialBalanceTableColumns } from './components';
@@ -47,7 +47,7 @@ export default function TrialBalanceSheetTable({ companyName }) {
);
}
const TrialBalanceDataTable = styled(DataTable)`
const TrialBalanceDataTable = styled(ReportDataTable)`
.table {
.tbody {
.tr .td {

View File

@@ -2,7 +2,7 @@ import React from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import { useVendorsBalanceColumns } from './components';
import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider';
@@ -43,7 +43,7 @@ export default function VendorsBalanceSummaryTable({
const VendorBalanceFinancialSheet = styled(FinancialSheet)``;
const VendorBalanceDataTable = styled(DataTable)`
const VendorBalanceDataTable = styled(ReportDataTable)`
.table {
.tbody {
.tr:not(.no-results) {