From 71742c34807f498d35ea4f6a7612c070e6d90820 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Sun, 25 Feb 2024 17:40:33 +0200 Subject: [PATCH] fix: Optimize the print style some financial reports --- .../views/modules/financial-sheet.pug | 3 ++- .../AgingSummary/AgingSummaryTable.ts | 2 +- .../AgingSummary/_constants.ts | 11 ++++++++++- .../CustomerBalanceSummaryTableInjectable.ts | 7 +++---- .../CustomerBalanceSummaryTableRows.ts | 4 ++-- .../CustomerBalanceSummary/constants.ts | 10 +++++++++- .../GeneralLedger/constants.ts | 18 +++++++++++++++++- .../TrialBalanceSheet/_constants.ts | 2 +- .../VendorBalanceSummaryTableRows.ts | 4 ++-- .../VendorBalanceSummary/constants.ts | 10 +++++++++- 10 files changed, 56 insertions(+), 15 deletions(-) diff --git a/packages/server/resources/views/modules/financial-sheet.pug b/packages/server/resources/views/modules/financial-sheet.pug index f4c59ec3a..9292c61de 100644 --- a/packages/server/resources/views/modules/financial-sheet.pug +++ b/packages/server/resources/views/modules/financial-sheet.pug @@ -21,4 +21,5 @@ block content each row in table.rows tr(class=row.classNames) each cell in row.cells - td(class='cell--' + cell.key)!= cell.value \ No newline at end of file + td(class='cell--' + cell.key) + span!= cell.value \ No newline at end of file diff --git a/packages/server/src/services/FinancialStatements/AgingSummary/AgingSummaryTable.ts b/packages/server/src/services/FinancialStatements/AgingSummary/AgingSummaryTable.ts index 3b74c76ac..0b6c61cbd 100644 --- a/packages/server/src/services/FinancialStatements/AgingSummary/AgingSummaryTable.ts +++ b/packages/server/src/services/FinancialStatements/AgingSummary/AgingSummaryTable.ts @@ -56,7 +56,7 @@ export default abstract class AgingSummaryTable extends R.compose( node: IAgingSummaryContact | IAgingSummaryTotal ): ITableColumnAccessor[] => { return node.aging.map((aging, index) => ({ - key: 'aging', + key: 'aging_period', accessor: `aging[${index}].total.formattedAmount`, })); }; diff --git a/packages/server/src/services/FinancialStatements/AgingSummary/_constants.ts b/packages/server/src/services/FinancialStatements/AgingSummary/_constants.ts index 4f68704cb..fd818e160 100644 --- a/packages/server/src/services/FinancialStatements/AgingSummary/_constants.ts +++ b/packages/server/src/services/FinancialStatements/AgingSummary/_constants.ts @@ -5,8 +5,17 @@ export enum AgingSummaryRowType { export const HtmlTableCss = ` table tr.row-type--total td{ - font-weight: 500; + font-weight: 600; border-top: 1px solid #bbb; border-bottom: 3px double #333; } + +table .column--current, +table .column--aging_period, +table .column--total, +table .cell--current, +table .cell--aging_period, +table .cell--total { + text-align: right; +} `; diff --git a/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableInjectable.ts b/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableInjectable.ts index edf4e5ea1..ec5a9c021 100644 --- a/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableInjectable.ts +++ b/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableInjectable.ts @@ -25,19 +25,18 @@ export class CustomerBalanceSummaryTableInjectable { tenantId: number, filter: ICustomerBalanceSummaryQuery ): Promise { - const i18n = this.tenancy.i18n(tenantId); const { data, query, meta } = await this.customerBalanceSummaryService.customerBalanceSummary( tenantId, filter ); - const tableRows = new CustomerBalanceSummaryTable(data, filter, i18n); + const table = new CustomerBalanceSummaryTable(data, filter, i18n); return { table: { - columns: tableRows.tableColumns(), - rows: tableRows.tableRows(), + columns: table.tableColumns(), + rows: table.tableRows(), }, query, meta, diff --git a/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableRows.ts b/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableRows.ts index e6cdc6415..e4ed687a4 100644 --- a/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableRows.ts +++ b/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableRows.ts @@ -52,7 +52,7 @@ export class CustomerBalanceSummaryTable { */ private getCustomerColumnsAccessor = (): IColumnMapperMeta[] => { const columns = [ - { key: 'customerName', accessor: 'customerName' }, + { key: 'name', accessor: 'customerName' }, { key: 'total', accessor: 'total.formattedAmount' }, ]; return R.compose( @@ -85,7 +85,7 @@ export class CustomerBalanceSummaryTable { */ private getTotalColumnsAccessor = (): IColumnMapperMeta[] => { const columns = [ - { key: 'total', value: this.i18n.__('Total') }, + { key: 'name', value: this.i18n.__('Total') }, { key: 'total', accessor: 'total.formattedAmount' }, ]; return R.compose( diff --git a/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/constants.ts b/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/constants.ts index 50c3aac24..513a3dcdb 100644 --- a/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/constants.ts +++ b/packages/server/src/services/FinancialStatements/CustomerBalanceSummary/constants.ts @@ -3,4 +3,12 @@ table tr.row-type--total td { font-weight: 600; border-top: 1px solid #bbb; border-bottom: 3px double #333; -}`; +} +table .column--name { + width: 65%; +} +table .column--total, +table .cell--total { + text-align: right; +} +`; diff --git a/packages/server/src/services/FinancialStatements/GeneralLedger/constants.ts b/packages/server/src/services/FinancialStatements/GeneralLedger/constants.ts index 26b5ceb8c..9e79a81da 100644 --- a/packages/server/src/services/FinancialStatements/GeneralLedger/constants.ts +++ b/packages/server/src/services/FinancialStatements/GeneralLedger/constants.ts @@ -10,4 +10,20 @@ table tr.row-type--closing-balance td{ table tr.row-type--closing-balance td { border-bottom: 1px solid #ececec; } -`; + +table .column--debit, +table .column--credit, +table .column--amount, +table .column--running_balance, +table .cell--debit, +table .cell--credit, +table .cell--amount, +table .cell--running_balance{ + text-align: right; +} +table tr.row-type--account .cell--date span, +table tr.row-type--opening-balance .cell--account_name span, +table tr.row-type--closing-balance .cell--account_name span{ + white-space: nowrap; +} +`; \ No newline at end of file diff --git a/packages/server/src/services/FinancialStatements/TrialBalanceSheet/_constants.ts b/packages/server/src/services/FinancialStatements/TrialBalanceSheet/_constants.ts index 80951d81e..7a52e631b 100644 --- a/packages/server/src/services/FinancialStatements/TrialBalanceSheet/_constants.ts +++ b/packages/server/src/services/FinancialStatements/TrialBalanceSheet/_constants.ts @@ -6,7 +6,7 @@ export enum IROW_TYPE { export const HtmlTableCustomCss = ` table tr.row-type--total td{ border-top: 1px solid #bbb; - font-weight: 500; + font-weight: 600; border-bottom: 3px double #000; } diff --git a/packages/server/src/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryTableRows.ts b/packages/server/src/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryTableRows.ts index 2095ea087..56fdbf924 100644 --- a/packages/server/src/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryTableRows.ts +++ b/packages/server/src/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryTableRows.ts @@ -54,7 +54,7 @@ export class VendorBalanceSummaryTable { */ private getVendorColumnsAccessor = (): IColumnMapperMeta[] => { const columns = [ - { key: 'vendorName', accessor: 'vendorName' }, + { key: 'name', accessor: 'vendorName' }, { key: 'total', accessor: 'total.formattedAmount' }, ]; return R.compose( @@ -87,7 +87,7 @@ export class VendorBalanceSummaryTable { */ private getTotalColumnsAccessor = (): IColumnMapperMeta[] => { const columns = [ - { key: 'total', value: this.i18n.__('Total') }, + { key: 'name', value: this.i18n.__('Total') }, { key: 'total', accessor: 'total.formattedAmount' }, ]; return R.compose( diff --git a/packages/server/src/services/FinancialStatements/VendorBalanceSummary/constants.ts b/packages/server/src/services/FinancialStatements/VendorBalanceSummary/constants.ts index 50c3aac24..513a3dcdb 100644 --- a/packages/server/src/services/FinancialStatements/VendorBalanceSummary/constants.ts +++ b/packages/server/src/services/FinancialStatements/VendorBalanceSummary/constants.ts @@ -3,4 +3,12 @@ table tr.row-type--total td { font-weight: 600; border-top: 1px solid #bbb; border-bottom: 3px double #333; -}`; +} +table .column--name { + width: 65%; +} +table .column--total, +table .cell--total { + text-align: right; +} +`;