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

Christian Stimming's report patch.

Browse Source 
* src/scm/report/income-expense-graph.scm,
	income-or-expense-pie.scm: Fixed account choosing, fixed default
	report currency, added currency exchange calculation.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3812 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-03-21 08:05:12 +00:00
parent 75ee724948
commit 629d05e08a
3 changed files with 138 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-03-20 Christian Stimming <stimming@tuhh.de>
* src/scm/report/income-expense-graph.scm,
income-or-expense-pie.scm: Fixed account choosing, fixed default
report currency, added currency exchange calculation.
2001-03-20 Dave Peticolas <dave@krondo.com> 2001-03-20 Dave Peticolas <dave@krondo.com>
* src/gnome/dialog-progress.c * src/gnome/dialog-progress.c

121
src/scm/report/income-expense-graph.scm
View File

@ -8,7 +8,17 @@
(gnc:depend "report-html.scm") (gnc:depend "report-html.scm")
(gnc:depend "date-utilities.scm") (gnc:depend "date-utilities.scm")
(let () (let ((pagename-general (N_ "General"))
(optname-from-date (N_ "From"))
(optname-to-date (N_ "To"))
(optname-accounts (N_ "Accounts"))
(optname-stepsize (N_ "Step Size"))
(optname-report-currency (N_ "Report's currency"))
(pagename-display (N_ "Display Format"))
(optname-plot-width (N_ "Plot Width"))
(optname-plot-height (N_ "Plot Height")))
(define (options-generator) (define (options-generator)
(let* ((options (gnc:new-options)) (let* ((options (gnc:new-options))
@ -19,34 +29,13 @@
(gnc:register-option options new-option)))) (gnc:register-option options new-option))))
(gnc:options-add-date-interval! (gnc:options-add-date-interval!
options "Report Options" options pagename-general
(N_ "From") (N_ "To") optname-from-date optname-to-date "a")
"d")
(add-option (add-option
(gnc:make-account-list-option
(N_ "Report Options") (N_ "Accounts")
"b"
"Select accounts to calculate income on"
(lambda ()
(filter
gnc:account-is-inc-exp?
(gnc:group-get-subaccounts (gnc:get-current-group))))
gnc:account-is-inc-exp?
#t))
(add-option
(gnc:make-currency-option
"Report Options"
"Report Currency"
"c"
"Select the display value for the currency"
(gnc:locale-default-currency)))
(add-option
(gnc:make-multichoice-option (gnc:make-multichoice-option
(N_ "Report Options") (N_ "Step Size") pagename-general optname-stepsize
"e" (N_ "The amount of time between data points") 'MonthDelta "b" (_ "The amount of time between data points") 'MonthDelta
(list #(WeekDelta "Week" "Week") (list #(WeekDelta "Week" "Week")
#(TwoWeekDelta "Two Week" "Two Weeks") #(TwoWeekDelta "Two Week" "Two Weeks")
#(MonthDelta "Month" "Month") #(MonthDelta "Month" "Month")
@ -54,19 +43,42 @@
#(YearDelta "Year" "Year") #(YearDelta "Year" "Year")
))) )))
(add-option (add-option
(gnc:make-number-range-option (gnc:make-account-list-option
(N_ "Display Format") (N_ "Plot Width") pagename-general optname-accounts
"a" (N_ "Width of plot in pixels.") 400 "c"
100 1000 0 1)) (_ "Select accounts to calculate income on")
(lambda ()
(filter
gnc:account-is-inc-exp?
(gnc:group-get-subaccounts (gnc:get-current-group))))
(lambda (accounts)
(list #t
(filter gnc:account-is-inc-exp? accounts)))
#t))
(add-option
(gnc:make-currency-option
pagename-general optname-report-currency
"d"
(_ "Select the display value for the currency")
(gnc:option-value
(gnc:lookup-global-option "International"
"Default Currency"))))
(add-option (add-option
(gnc:make-number-range-option (gnc:make-number-range-option
(N_ "Display Format") (N_ "Plot Height") pagename-display optname-plot-width
"b" (N_ "Height of plot in pixels.") 400 "a" (_ "Width of plot in pixels.") 400
100 1000 0 1))
(add-option
(gnc:make-number-range-option
pagename-display optname-plot-height
"b" (_ "Height of plot in pixels.") 400
100 1000 0 1)) 100 1000 0 1))
(gnc:options-set-default-section options "Report Options") (gnc:options-set-default-section options pagename-general)
options)) options))
@ -85,24 +97,26 @@
(define (op-value section name) (define (op-value section name)
(gnc:option-value (get-op section name))) (gnc:option-value (get-op section name)))
(let* ((report-currency (op-value "Report Options" "Report Currency")) (let* ((to-date-tp (gnc:timepair-end-day-time
(height (op-value "Display Format" "Plot Height")) (vector-ref (op-value pagename-general
(width (op-value "Display Format" "Plot Width")) optname-to-date) 1)))
(accounts (op-value "Report Options" "Accounts"))
(to-date-tp (gnc:timepair-end-day-time
(vector-ref (op-value "Report Options"
"To") 1)))
(from-date-tp (gnc:timepair-start-day-time (from-date-tp (gnc:timepair-start-day-time
(vector-ref (op-value "Report Options" (vector-ref (op-value pagename-general
"From") 1))) optname-from-date) 1)))
(interval (op-value "Report Options" "Step Size")) (interval (op-value pagename-general optname-stepsize))
(accounts (op-value pagename-general optname-accounts))
(report-currency (op-value pagename-general optname-report-currency))
(height (op-value pagename-display optname-plot-height))
(width (op-value pagename-display optname-plot-width))
(document (gnc:make-html-document)) (document (gnc:make-html-document))
(chart (gnc:make-html-barchart)) (chart (gnc:make-html-barchart))
(exchange-alist (gnc:make-exchange-alist (exchange-alist (gnc:make-exchange-alist
report-currency to-date-tp)) report-currency to-date-tp))
(exchange-fn-internal (gnc:make-exchange-function exchange-alist)) (exchange-fn-internal (gnc:make-exchange-function exchange-alist))
(exchange-fn (lambda (foriegn) (exchange-fn (lambda (foreign)
(exchange-fn-internal foriegn report-currency))) (exchange-fn-internal foreign report-currency)))
(dates-list (gnc:dateloop (dates-list (gnc:dateloop
(gnc:timepair-start-day-time from-date-tp) (gnc:timepair-start-day-time from-date-tp)
(gnc:timepair-end-day-time (gnc:timepair-end-day-time
@ -124,9 +138,12 @@
(map profit-collector-fn dates-list)) (map profit-collector-fn dates-list))
(double-list (double-list
(map (lambda (commodity-collector) (map (lambda (commodity-collector)
(- (gnc:numeric-to-double ;;(-
(cadr (commodity-collector 'getpair (gnc:numeric-to-double
report-currency #t))))) (gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
commodity-collector report-currency
exchange-fn-internal))));;)
profit-collector-list)) profit-collector-list))
(date-string-list (date-string-list
(map (lambda (date-list-item) (map (lambda (date-list-item)
@ -134,7 +151,7 @@
(car date-list-item))) (car date-list-item)))
dates-list))) dates-list)))
(gnc:html-barchart-set-title! chart (N_ "Income/Expense Chart")) (gnc:html-barchart-set-title! chart (_ "Income/Expense Chart"))
(gnc:html-barchart-set-subtitle! (gnc:html-barchart-set-subtitle!
chart (sprintf #f chart (sprintf #f
(_ "%s to %s") (_ "%s to %s")

103
src/scm/report/income-or-expense-pie.scm
View File

@ -8,7 +8,16 @@
(gnc:depend "report-html.scm") (gnc:depend "report-html.scm")
(gnc:depend "date-utilities.scm") (gnc:depend "date-utilities.scm")
(let () (let ((pagename-general (N_ "General"))
(optname-from-date (N_ "From"))
(optname-to-date (N_ "To"))
(optname-accounts (N_ "Accounts"))
(optname-report-currency (N_ "Report's currency"))
(pagename-display (N_ "Display Format"))
(optname-slices (N_ "Maximum Slices"))
(optname-plot-width (N_ "Plot Width"))
(optname-plot-height (N_ "Plot Height")))
;; Note the options-generator has a boolean argument, which ;; Note the options-generator has a boolean argument, which
;; is true for income piecharts. We use a lambda to wrap ;; is true for income piecharts. We use a lambda to wrap
@ -20,17 +29,15 @@
(lambda (new-option) (lambda (new-option)
(gnc:register-option options new-option)))) (gnc:register-option options new-option))))
(add-option (gnc:options-add-date-interval!
(gnc:make-number-range-option options pagename-general
(N_ "Report Options") (N_ "Maximum Slices") optname-from-date optname-to-date "a")
"a" (N_ "Maximum number of slices in pie") 7
2 20 0 1))
(add-option (add-option
(gnc:make-account-list-option (gnc:make-account-list-option
(N_ "Report Options") (N_ "Accounts") pagename-general optname-accounts
"b" "b"
(N_ "Select accounts to calculate income on") (_ "Select accounts to calculate income on")
(lambda () (lambda ()
(gnc:filter-accountlist-type (gnc:filter-accountlist-type
(if is-income? '(income) '(expense)) (if is-income? '(income) '(expense))
@ -41,31 +48,36 @@
(if is-income? '(income) '(expense)) (if is-income? '(income) '(expense))
accounts))) accounts)))
#t)) #t))
(add-option (add-option
(gnc:make-currency-option (gnc:make-currency-option
(N_ "Report Options") (N_ "Report Currency") pagename-general optname-report-currency
"c" "c"
(N_ "Select the display value for the currency") (_ "Select the display value for the currency")
(gnc:locale-default-currency))) (gnc:option-value
(gnc:lookup-global-option "International"
(gnc:options-add-date-interval! "Default Currency"))))
options "Report Options"
(N_ "From") (N_ "To")
"d")
(add-option (add-option
(gnc:make-number-range-option (gnc:make-number-range-option
(N_ "Display Format") (N_ "Plot Width") pagename-display optname-slices
"a" (N_ "Width of plot in pixels.") 500 "a" (N_ "Maximum number of slices in pie") 7
2 20 0 1))
(add-option
(gnc:make-number-range-option
pagename-display optname-plot-width
"b" (N_ "Width of plot in pixels.") 500
100 1000 0 1)) 100 1000 0 1))
(add-option (add-option
(gnc:make-number-range-option (gnc:make-number-range-option
(N_ "Display Format") (N_ "Plot Height") pagename-display optname-plot-height
"b" (N_ "Height of plot in pixels.") 250 "c" (N_ "Height of plot in pixels.") 250
100 1000 0 1)) 100 1000 0 1))
(gnc:options-set-default-section options "Report Options")
(gnc:options-set-default-section options pagename-general)
options)) options))
;; Similar arrangement to the options-generator. ;; Similar arrangement to the options-generator.
@ -78,17 +90,19 @@
(define (op-value section name) (define (op-value section name)
(gnc:option-value (get-op section name))) (gnc:option-value (get-op section name)))
(let* ((max-slices (op-value "Report Options" "Maximum Slices")) (let* ((to-date-tp (gnc:timepair-end-day-time
(report-currency (op-value "Report Options" "Report Currency")) (vector-ref (op-value pagename-general
(height (op-value "Display Format" "Plot Height")) optname-to-date) 1)))
(width (op-value "Display Format" "Plot Width"))
(accounts (op-value "Report Options" "Accounts"))
(to-date-tp (gnc:timepair-end-day-time
(vector-ref (op-value "Report Options"
"To") 1)))
(from-date-tp (gnc:timepair-start-day-time (from-date-tp (gnc:timepair-start-day-time
(vector-ref (op-value "Report Options" (vector-ref (op-value pagename-general
"From") 1))) optname-from-date) 1)))
(accounts (op-value pagename-general optname-accounts))
(report-currency (op-value pagename-general optname-report-currency))
(max-slices (op-value pagename-display optname-slices))
(height (op-value pagename-display optname-plot-height))
(width (op-value pagename-display optname-plot-width))
(document (gnc:make-html-document)) (document (gnc:make-html-document))
(chart (gnc:make-html-piechart)) (chart (gnc:make-html-piechart))
(exchange-alist (gnc:make-exchange-alist (exchange-alist (gnc:make-exchange-alist
@ -104,13 +118,21 @@
(profit-collector-list (profit-collector-list
(map profit-collector-fn accounts)) (map profit-collector-fn accounts))
;;; FIXME: better currency handling here ;; Future improvement: Let the user choose which kind of
;; currency combining she want to be done. Right now
;; everything foreign gets converted
;; (gnc:sum-collector-commodity) based on the weighted
;; average of all past transactions.
(double-list (double-list
(map (lambda (commodity-collector) (map (lambda (commodity-collector)
(abs (gnc:numeric-to-double (abs (gnc:numeric-to-double
(cadr (commodity-collector 'getpair (gnc:gnc-monetary-amount
report-currency #t))))) (gnc:sum-collector-commodity
commodity-collector report-currency
exchange-fn-internal)))))
;;(cadr (commodity-collector 'getpair
;; report-currency #t)))))
profit-collector-list)) profit-collector-list))
(combined (zip double-list accounts)) (combined (zip double-list accounts))
(accounts-or-names '()) (accounts-or-names '())
@ -134,11 +156,12 @@
(set! combined (set! combined
(append start (append start
(list (list sum (_ "Other"))))) (list (list sum (_ "Other")))))
(let* ((name (if is-income? "Income Piechart" "Expense Piechart")) (let* ((name (if is-income? (N_ "Income Piechart")
(N_ "Expense Piechart")))
(options (gnc:make-report-options name)) (options (gnc:make-report-options name))
(account-op (gnc:lookup-option options (account-op (gnc:lookup-option options
"Report Options" pagename-general
"Accounts"))) optname-accounts)))
(call-with-values (lambda () (unzip2 finish)) (call-with-values (lambda () (unzip2 finish))
(lambda (ds as) (lambda (ds as)
(gnc:option-set-value account-op as))) (gnc:option-set-value account-op as)))
@ -153,8 +176,8 @@
(gnc:html-piechart-set-title! (gnc:html-piechart-set-title!
chart (if is-income? chart (if is-income?
(N_ "Income by Account") (_ "Income by Account")
(N_ "Expenses by Account"))) (_ "Expenses by Account")))
(gnc:html-piechart-set-subtitle! (gnc:html-piechart-set-subtitle!
chart (sprintf #f chart (sprintf #f