From f8e976e91391c20355c5a338602c0b6ae51c5ba4 Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Mon, 17 Aug 2020 23:07:55 +0800 Subject: [PATCH] [category-barchart] simplify table constructor --- .../reports/standard/category-barchart.scm | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/gnucash/report/reports/standard/category-barchart.scm b/gnucash/report/reports/standard/category-barchart.scm index 50fe2ea76f..de8277a27c 100644 --- a/gnucash/report/reports/standard/category-barchart.scm +++ b/gnucash/report/reports/standard/category-barchart.scm @@ -602,28 +602,21 @@ developing over time")) (when show-table? (let ((table (gnc:make-html-table)) (scu (gnc-commodity-get-fraction report-currency)) - (cols>1? (> (length all-data) 1))) + (cols>1? (pair? (cdr all-data)))) (define (make-cell contents) (gnc:make-html-table-cell/markup "number-cell" contents)) - (define (monetary-round mon) - (gnc:make-gnc-monetary - report-currency - (gnc-numeric-convert - (gnc:gnc-monetary-amount mon) - scu GNC-HOW-RND-ROUND))) - (for-each (lambda (date row) (gnc:html-table-append-row! - table (map make-cell (append (list date) - (map monetary-round row) - (if cols>1? - (list - (monetary-round - (apply gnc:monetary+ row))) - '()))))) + table + (append (list (make-cell date)) + (map make-cell row) + (if cols>1? + (list + (make-cell (apply gnc:monetary+ row))) + '())))) date-string-list (apply zip (map cadr all-data)))