IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: simplify do-rows-with-subtotals

Browse Source
This commit is contained in:
Christopher Lam 2017-11-28 14:40:02 +08:00
parent 7257675218
commit 1ce2f3f6d8
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnucash/report/standard-reports/transaction.scm
View File

@ -1283,11 +1283,16 @@ tags within description, notes or memo. ")
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (do-rows-with-subtotals splits
odd-row?
primary-subtotal-collectors
secondary-subtotal-collectors
total-collectors)
(define primary-subtotal-collectors
(map (lambda (x) (gnc:make-commodity-collector)) calculated-cells))
(define secondary-subtotal-collectors
(map (lambda (x) (gnc:make-commodity-collector)) calculated-cells))
(define total-collectors
(map (lambda (x) (gnc:make-commodity-collector)) calculated-cells))
(define (do-rows-with-subtotals splits odd-row?)
(gnc:report-percent-done (* 100 (/ work-done work-to-do)))
@ -1386,26 +1391,19 @@ tags within description, notes or memo. ")
(add-subheading (render-summary next secondary-renderer-key #t)
def:secondary-subtotal-style)))))
(do-rows-with-subtotals rest
(not odd-row?)
primary-subtotal-collectors
secondary-subtotal-collectors
total-collectors))))
(do-rows-with-subtotals rest (not odd-row?)))))
(gnc:html-table-set-col-headers! table (concatenate (list headings-left-columns headings-right-columns)))
(if primary-renderer-key
(add-subheading (render-summary (car splits) primary-renderer-key #t)
def:primary-subtotal-style))
(if secondary-renderer-key
(add-subheading (render-summary (car splits) secondary-renderer-key #t)
def:secondary-subtotal-style))
(do-rows-with-subtotals splits #t
(map (lambda (x) (gnc:make-commodity-collector)) calculated-cells)
(map (lambda (x) (gnc:make-commodity-collector)) calculated-cells)
(map (lambda (x) (gnc:make-commodity-collector)) calculated-cells))
(do-rows-with-subtotals splits #t)
table))