mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
REFACTOR: simplify functions, reduce arguments
This commit is contained in:
Christopher Lam
parent
a5306d0454
commit
d88d503b38
@ -109,12 +109,6 @@ options specified in the Options panels."))
|
||||
(define SUBTOTAL-ENABLED (list 'account-name 'corresponding-acc-name
|
||||
'account-code 'corresponding-acc-code))
|
||||
|
||||
(define (add-subheading-row data table width subheading-style)
|
||||
(let ((heading-cell (gnc:make-html-table-cell data)))
|
||||
(gnc:html-table-cell-set-colspan! heading-cell width)
|
||||
(gnc:html-table-append-row/markup!
|
||||
table subheading-style
|
||||
(list heading-cell))))
|
||||
|
||||
(define (column-uses? param columns-used)
|
||||
(cdr (assq param columns-used)))
|
||||
@ -138,25 +132,20 @@ options specified in the Options panels."))
|
||||
(xaccAccountGetName account))
|
||||
""))))
|
||||
|
||||
|
||||
|
||||
;; render an account subheading - column-vector determines what is displayed
|
||||
(define (render-account-subheading
|
||||
split table width subheading-style column-vector)
|
||||
(define (render-account-subheading split column-vector)
|
||||
(let ((account (xaccSplitGetAccount split)))
|
||||
(add-subheading-row (gnc:make-html-text
|
||||
(gnc:make-html-text
|
||||
(gnc:html-markup-anchor
|
||||
(gnc:account-anchor-text account)
|
||||
(account-namestring account
|
||||
(column-uses? 'sort-account-code column-vector)
|
||||
#t
|
||||
(column-uses? 'sort-account-full-name column-vector))))
|
||||
table width subheading-style)))
|
||||
(column-uses? 'sort-account-full-name column-vector))))))
|
||||
|
||||
(define (render-corresponding-account-subheading
|
||||
split table width subheading-style column-vector)
|
||||
(define (render-corresponding-account-subheading split column-vector)
|
||||
(let ((account (xaccSplitGetAccount (xaccSplitGetOtherSplit split))))
|
||||
(add-subheading-row (gnc:make-html-text
|
||||
(gnc:make-html-text
|
||||
(gnc:html-markup-anchor
|
||||
(if (null? account)
|
||||
""
|
||||
@ -164,125 +153,69 @@ options specified in the Options panels."))
|
||||
(account-namestring account
|
||||
(column-uses? 'sort-account-code column-vector)
|
||||
#t
|
||||
(column-uses? 'sort-account-full-name column-vector))))
|
||||
table width subheading-style)))
|
||||
(column-uses? 'sort-account-full-name column-vector))))))
|
||||
|
||||
(define (render-week-subheading split table width subheading-style column-vector)
|
||||
(add-subheading-row (gnc:date-get-week-year-string
|
||||
(define (render-week-subheading split column-vector)
|
||||
(gnc:date-get-week-year-string
|
||||
(gnc:timepair->date
|
||||
(gnc-transaction-get-date-posted
|
||||
(xaccSplitGetParent split))))
|
||||
table width subheading-style))
|
||||
(xaccSplitGetParent split)))))
|
||||
|
||||
(define (render-month-subheading split table width subheading-style column-vector)
|
||||
(add-subheading-row (gnc:date-get-month-year-string
|
||||
(define (render-month-subheading split column-vector)
|
||||
(gnc:date-get-month-year-string
|
||||
(gnc:timepair->date
|
||||
(gnc-transaction-get-date-posted
|
||||
(xaccSplitGetParent split))))
|
||||
table width subheading-style))
|
||||
(xaccSplitGetParent split)))))
|
||||
|
||||
(define (render-quarter-subheading split table width subheading-style column-vector)
|
||||
(add-subheading-row (gnc:date-get-quarter-year-string
|
||||
(define (render-quarter-subheading split column-vector)
|
||||
(gnc:date-get-quarter-year-string
|
||||
(gnc:timepair->date
|
||||
(gnc-transaction-get-date-posted
|
||||
(xaccSplitGetParent split))))
|
||||
table width subheading-style))
|
||||
(xaccSplitGetParent split)))))
|
||||
|
||||
(define (render-year-subheading split table width subheading-style column-vector)
|
||||
(add-subheading-row (gnc:date-get-year-string
|
||||
|
||||
(define (render-year-subheading split column-vector)
|
||||
(gnc:date-get-year-string
|
||||
(gnc:timepair->date
|
||||
(gnc-transaction-get-date-posted
|
||||
(xaccSplitGetParent split))))
|
||||
table width subheading-style))
|
||||
|
||||
(define (add-subtotal-row table width subtotal-string subtotal-collector
|
||||
subtotal-style export?)
|
||||
(let ((currency-totals (subtotal-collector 'format gnc:make-gnc-monetary #f)))
|
||||
(gnc:html-table-append-row/markup!
|
||||
table
|
||||
subtotal-style
|
||||
(if export?
|
||||
(append! (cons (gnc:make-html-table-cell/markup "total-label-cell" subtotal-string)
|
||||
(gnc:html-make-empty-cells (- width 2)))
|
||||
(list (gnc:make-html-table-cell/markup
|
||||
"total-number-cell"
|
||||
(car currency-totals))))
|
||||
(list (gnc:make-html-table-cell/size/markup 1 (- width 1) "total-label-cell"
|
||||
subtotal-string)
|
||||
(gnc:make-html-table-cell/markup
|
||||
"total-number-cell"
|
||||
(car currency-totals)))))
|
||||
(for-each (lambda (currency)
|
||||
(gnc:html-table-append-row/markup!
|
||||
table
|
||||
subtotal-style
|
||||
(append!
|
||||
(if export?
|
||||
(gnc:html-make-empty-cells (- width 1))
|
||||
(list (gnc:make-html-table-cell/size 1 (- width 1) #f)))
|
||||
(list (gnc:make-html-table-cell/markup
|
||||
"total-number-cell" currency)))))
|
||||
(cdr currency-totals))))
|
||||
(xaccSplitGetParent split)))))
|
||||
|
||||
(define (total-string str) (string-append (_ "Total For ") str))
|
||||
|
||||
(define (render-account-subtotal
|
||||
table width split total-collector subtotal-style column-vector export?)
|
||||
(add-subtotal-row table width
|
||||
(define (render-account-subtotal split column-vector)
|
||||
(total-string (account-namestring (xaccSplitGetAccount split)
|
||||
(column-uses? 'sort-account-code column-vector)
|
||||
#t
|
||||
(column-uses? 'sort-account-full-name column-vector)))
|
||||
total-collector subtotal-style export?))
|
||||
(column-uses? 'sort-account-full-name column-vector))))
|
||||
|
||||
(define (render-corresponding-account-subtotal
|
||||
table width split total-collector subtotal-style column-vector export?)
|
||||
(add-subtotal-row table width
|
||||
(total-string (account-namestring (xaccSplitGetAccount
|
||||
(xaccSplitGetOtherSplit split))
|
||||
(define (render-corresponding-account-subtotal split column-vector)
|
||||
(total-string (account-namestring (xaccSplitGetAccount (xaccSplitGetOtherSplit split))
|
||||
(column-uses? 'sort-account-code column-vector)
|
||||
#t
|
||||
(column-uses? 'sort-account-full-name column-vector)))
|
||||
total-collector subtotal-style export?))
|
||||
(column-uses? 'sort-account-full-name column-vector))))
|
||||
|
||||
(define (render-week-subtotal
|
||||
table width split total-collector subtotal-style column-vector export?)
|
||||
(define (render-week-subtotal split column-vector)
|
||||
(let ((tm (gnc:timepair->date (gnc-transaction-get-date-posted
|
||||
(xaccSplitGetParent split)))))
|
||||
(add-subtotal-row table width
|
||||
(total-string (gnc:date-get-week-year-string tm))
|
||||
total-collector subtotal-style export?)))
|
||||
(total-string (gnc:date-get-week-year-string tm))))
|
||||
|
||||
(define (render-month-subtotal
|
||||
table width split total-collector subtotal-style column-vector export?)
|
||||
(define (render-month-subtotal split column-vector)
|
||||
(let ((tm (gnc:timepair->date (gnc-transaction-get-date-posted
|
||||
(xaccSplitGetParent split)))))
|
||||
(add-subtotal-row table width
|
||||
(total-string (gnc:date-get-month-year-string tm))
|
||||
total-collector subtotal-style export?)))
|
||||
(total-string (gnc:date-get-month-year-string tm))))
|
||||
|
||||
|
||||
(define (render-quarter-subtotal
|
||||
table width split total-collector subtotal-style column-vector export?)
|
||||
(define (render-quarter-subtotal split column-vector)
|
||||
(let ((tm (gnc:timepair->date (gnc-transaction-get-date-posted
|
||||
(xaccSplitGetParent split)))))
|
||||
(add-subtotal-row table width
|
||||
(total-string (gnc:date-get-quarter-year-string tm))
|
||||
total-collector subtotal-style export?)))
|
||||
(total-string (gnc:date-get-quarter-year-string tm))))
|
||||
|
||||
(define (render-year-subtotal
|
||||
table width split total-collector subtotal-style column-vector export?)
|
||||
(define (render-year-subtotal split column-vector)
|
||||
(let ((tm (gnc:timepair->date (gnc-transaction-get-date-posted
|
||||
(xaccSplitGetParent split)))))
|
||||
(add-subtotal-row table width
|
||||
(total-string (strftime "%Y" tm))
|
||||
total-collector subtotal-style export?)))
|
||||
(total-string (strftime "%Y" tm))))
|
||||
|
||||
(define (render-grand-total
|
||||
table width total-collector export?)
|
||||
(add-subtotal-row table width
|
||||
(_ "Grand Total")
|
||||
total-collector def:grand-total-style export?))
|
||||
(define (render-grand-total)
|
||||
(_ "Grand Total")) ; def:grand-total-style
|
||||
|
||||
|
||||
|
||||
@ -1093,8 +1026,54 @@ Credit Card, and Income accounts."))))))
|
||||
(add-if (column-uses? 'running-balance columns-used)
|
||||
(_ "Balance"))))
|
||||
|
||||
(let ((work-to-do (length splits))
|
||||
(work-done 0))
|
||||
(let* ((work-to-do (length splits))
|
||||
(work-done 0)
|
||||
(table (gnc:make-html-table))
|
||||
(used-columns (build-columns-used))
|
||||
(headings (make-heading-list used-columns))
|
||||
(width (length headings))
|
||||
(account-types-to-reverse
|
||||
(case (opt-val gnc:pagename-display (N_ "Sign Reverses"))
|
||||
((none) '())
|
||||
((income-expense) (list ACCT-TYPE-INCOME ACCT-TYPE-EXPENSE))
|
||||
((credit-accounts) (list ACCT-TYPE-LIABILITY ACCT-TYPE-PAYABLE
|
||||
ACCT-TYPE-EQUITY ACCT-TYPE-CREDIT
|
||||
ACCT-TYPE-INCOME))))
|
||||
(is-multiline? (eq? (opt-val gnc:pagename-display optname-detail-level) 'multi-line))
|
||||
(export? (opt-val gnc:pagename-general optname-table-export)))
|
||||
|
||||
(define (add-subheading data subheading-style)
|
||||
(let ((heading-cell (gnc:make-html-table-cell data)))
|
||||
(gnc:html-table-cell-set-colspan! heading-cell width)
|
||||
(gnc:html-table-append-row/markup!
|
||||
table subheading-style
|
||||
(list heading-cell))))
|
||||
|
||||
(define (add-subtotal-row string collector style)
|
||||
(let ((currency-totals (collector 'format gnc:make-gnc-monetary #f)))
|
||||
(gnc:html-table-append-row/markup!
|
||||
table style
|
||||
(if export?
|
||||
(append! (cons (gnc:make-html-table-cell/markup "total-label-cell" string)
|
||||
(gnc:html-make-empty-cells (- width 2)))
|
||||
(list (gnc:make-html-table-cell/markup
|
||||
"total-number-cell"
|
||||
(car currency-totals))))
|
||||
(list (gnc:make-html-table-cell/size/markup 1 (- width 1) "total-label-cell"
|
||||
string)
|
||||
(gnc:make-html-table-cell/markup
|
||||
"total-number-cell"
|
||||
(car currency-totals)))))
|
||||
(for-each (lambda (currency)
|
||||
(gnc:html-table-append-row/markup!
|
||||
table style
|
||||
(append!
|
||||
(if export?
|
||||
(gnc:html-make-empty-cells (- width 1))
|
||||
(list (gnc:make-html-table-cell/size 1 (- width 1) #f)))
|
||||
(list (gnc:make-html-table-cell/markup
|
||||
"total-number-cell" currency)))))
|
||||
(cdr currency-totals))))
|
||||
|
||||
(define (do-rows-with-subtotals splits
|
||||
table
|
||||
@ -1129,12 +1108,11 @@ Credit Card, and Income accounts."))))))
|
||||
1 width (gnc:make-html-text (gnc:html-markup-hr)))))
|
||||
|
||||
(if (opt-val gnc:pagename-display "Totals")
|
||||
(render-grand-total table width total-collector export?)))
|
||||
(add-subtotal-row (render-grand-total) total-collector def:grand-total-style)))
|
||||
|
||||
(let* ((current (car splits))
|
||||
(rest (cdr splits))
|
||||
(next (if (null? rest) #f
|
||||
(car rest))))
|
||||
(next (if (null? rest) #f (car rest))))
|
||||
|
||||
(define split-value (add-split-row
|
||||
table
|
||||
@ -1185,17 +1163,15 @@ Credit Card, and Income accounts."))))))
|
||||
|
||||
(begin
|
||||
|
||||
(secondary-subtotal-renderer
|
||||
table width current
|
||||
(add-subtotal-row (secondary-subtotal-renderer current used-columns)
|
||||
secondary-subtotal-collector
|
||||
def:secondary-subtotal-style used-columns export?)
|
||||
def:secondary-subtotal-style)
|
||||
|
||||
(secondary-subtotal-collector 'reset #f #f)))
|
||||
|
||||
(primary-subtotal-renderer table width current
|
||||
(add-subtotal-row (primary-subtotal-renderer current used-columns)
|
||||
primary-subtotal-collector
|
||||
def:primary-subtotal-style used-columns
|
||||
export?)
|
||||
def:primary-subtotal-style)
|
||||
|
||||
(primary-subtotal-collector 'reset #f #f)
|
||||
|
||||
@ -1203,14 +1179,12 @@ Credit Card, and Income accounts."))))))
|
||||
|
||||
(begin
|
||||
|
||||
(primary-subheading-renderer
|
||||
next table width def:primary-subtotal-style used-columns)
|
||||
(add-subheading (primary-subheading-renderer next used-columns)
|
||||
def:primary-subtotal-style)
|
||||
|
||||
(if secondary-subtotal-pred
|
||||
(secondary-subheading-renderer
|
||||
next
|
||||
table
|
||||
width def:secondary-subtotal-style used-columns)))))
|
||||
(add-subheading (secondary-subheading-renderer next used-columns)
|
||||
def:secondary-subtotal-style)))))
|
||||
|
||||
(if (and secondary-subtotal-pred
|
||||
(or (not next)
|
||||
@ -1218,17 +1192,15 @@ Credit Card, and Income accounts."))))))
|
||||
(not (equal? (secondary-subtotal-pred current)
|
||||
(secondary-subtotal-pred next))))))
|
||||
|
||||
(begin (secondary-subtotal-renderer
|
||||
table width current
|
||||
(begin (add-subtotal-row (secondary-subtotal-renderer current used-columns)
|
||||
secondary-subtotal-collector
|
||||
def:secondary-subtotal-style used-columns export?)
|
||||
def:secondary-subtotal-style)
|
||||
|
||||
(secondary-subtotal-collector 'reset #f #f)
|
||||
|
||||
(if next
|
||||
(secondary-subheading-renderer
|
||||
next table width
|
||||
def:secondary-subtotal-style used-columns)))))
|
||||
(add-subheading (secondary-subheading-renderer next used-columns)
|
||||
def:secondary-subtotal-style)))))
|
||||
|
||||
(do-rows-with-subtotals rest
|
||||
table
|
||||
@ -1248,29 +1220,15 @@ Credit Card, and Income accounts."))))))
|
||||
secondary-subtotal-collector
|
||||
total-collector))))
|
||||
|
||||
(let* ((table (gnc:make-html-table))
|
||||
(used-columns (build-columns-used))
|
||||
(headings (make-heading-list used-columns))
|
||||
(width (length headings))
|
||||
(account-types-to-reverse
|
||||
(cdr (assq (opt-val gnc:pagename-display (N_ "Sign Reverses"))
|
||||
(list (cons 'none '())
|
||||
(cons 'income-expense (list ACCT-TYPE-INCOME ACCT-TYPE-EXPENSE))
|
||||
(cons 'credit-accounts (list ACCT-TYPE-LIABILITY ACCT-TYPE-PAYABLE
|
||||
ACCT-TYPE-EQUITY ACCT-TYPE-CREDIT
|
||||
ACCT-TYPE-INCOME))))))
|
||||
(is-multiline? (eq? (opt-val gnc:pagename-display optname-detail-level) 'multi-line))
|
||||
(export? (opt-val gnc:pagename-general optname-table-export)))
|
||||
|
||||
(gnc:html-table-set-col-headers! table headings)
|
||||
|
||||
(if primary-subheading-renderer
|
||||
(primary-subheading-renderer
|
||||
(car splits) table width def:primary-subtotal-style used-columns))
|
||||
(add-subheading (primary-subheading-renderer (car splits) used-columns)
|
||||
def:primary-subtotal-style))
|
||||
|
||||
(if secondary-subheading-renderer
|
||||
(secondary-subheading-renderer
|
||||
(car splits) table width def:secondary-subtotal-style used-columns))
|
||||
(add-subheading (secondary-subheading-renderer (car splits) used-columns)
|
||||
def:secondary-subtotal-style))
|
||||
|
||||
(do-rows-with-subtotals splits table used-columns width
|
||||
is-multiline? #t
|
||||
@ -1286,7 +1244,7 @@ Credit Card, and Income accounts."))))))
|
||||
(gnc:make-commodity-collector)
|
||||
(gnc:make-commodity-collector))
|
||||
|
||||
table)))
|
||||
table))
|
||||
|
||||
;; ;;;;;;;;;;;;;;;;;;;;
|
||||
;; Here comes the renderer function for this report.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user