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

[category-barchart] simplify all-data generator

Browse Source
This commit is contained in:
Christopher Lam
2019-11-13 22:54:54 +08:00
parent 36367ed190
commit 0a3653e56d
1 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
gnucash/report/reports/standard/category-barchart.scm
View File

@@ -470,38 +470,28 @@ developing over time"))
(set! work-to-do (count-accounts 1 topl-accounts))
;; Sort the account list according to the account code field.
(set! all-data (sort
(filter (lambda (l)
(not (zero?
(gnc:gnc-monetary-amount
(apply gnc:monetary+ (cadr l))))))
(traverse-accounts 1 topl-accounts))
(cond
((eq? sort-method 'acct-code)
(lambda (a b)
(string<? (xaccAccountGetCode (car a))
(xaccAccountGetCode (car b)))))
((eq? sort-method 'alphabetical)
(lambda (a b)
(string<? ((if show-fullname?
gnc-account-get-full-name
xaccAccountGetName) (car a))
((if show-fullname?
gnc-account-get-full-name
xaccAccountGetName) (car b)))))
(else
(lambda (a b)
(> (gnc:gnc-monetary-amount (apply gnc:monetary+ (cadr a)))
(gnc:gnc-monetary-amount (apply gnc:monetary+ (cadr b)))))))))
;; Or rather sort by total amount?
;;(< (apply + (cadr a))
;; (apply + (cadr b))))))
;; Other sort criteria: max. amount, standard deviation of amount,
;; min. amount; ascending, descending. FIXME: Add user options to
;; choose sorting.
;;(gnc:warn "all-data" all-data)
(set! all-data
(sort
(filter (lambda (l)
(not (zero? (gnc:gnc-monetary-amount
(apply gnc:monetary+ (cadr l))))))
(traverse-accounts 1 topl-accounts))
(case sort-method
((alphabetical)
(lambda (a b)
(if show-fullname?
(string<? (gnc-account-get-full-name (car a))
(gnc-account-get-full-name (car b)))
(string<? (xaccAccountGetName (car a))
(xaccAccountGetName (car b))))))
((acct-code)
(lambda (a b)
(string<? (xaccAccountGetCode (car a))
(xaccAccountGetCode (car b)))))
((amount)
(lambda (a b)
(> (gnc:gnc-monetary-amount (apply gnc:monetary+ (cadr a)))
(gnc:gnc-monetary-amount (apply gnc:monetary+ (cadr b)))))))))
;; Proceed if the data is non-zeros
(if