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

Fix wrapping problems in budget cells (account labels and negative values)

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18232 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Phil Longstaff
2009-08-02 16:51:53 +00:00
parent 2e09bf1126
commit 1fc2b2067e
6 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/report/report-system/html-acct-table.scm
View File

@@ -1291,7 +1291,7 @@
label
indented-depth
account-colspan ;; label-colspan
#f ;; label-markup
"anchor-cell" ;; label-markup
amount
(+ account-cols (- 0 1)
(- logical-cols display-depth)

30
src/report/standard-reports/budget.scm
View File

@@ -208,6 +208,10 @@
(define (negative-numeric-p x)
(if (gnc-numeric-p x) (gnc-numeric-negative-p x) #f))
(define (number-cell-tag x)
(if (negative-numeric-p x) "number-cell-neg" "number-cell"))
(define (total-number-cell-tag x)
(if (negative-numeric-p x) "total-number-cell-neg" "total-number-cell"))
;; Adds a line to tbe budget report.
;;
@@ -276,14 +280,14 @@
(if show-actual?
(begin
(gnc:html-table-set-cell/tag!
html-table rownum current-col (if (negative-numeric-p act-numeric-val) "number-cell-neg" "number-cell") act-val)
html-table rownum current-col (number-cell-tag act-numeric-val) act-val)
(set! current-col (+ current-col 1))
)
)
(if show-diff?
(begin
(gnc:html-table-set-cell/tag!
html-table rownum current-col (if (negative-numeric-p dif-numeric-val) "number-cell-neg" "number-cell") dif-val)
html-table rownum current-col (number-cell-tag dif-numeric-val) dif-val)
(set! current-col (+ current-col 1))
)
)
@@ -306,20 +310,19 @@
(if show-actual?
(begin
(gnc:html-table-set-cell/tag!
html-table rownum current-col (if (negative-numeric-p act-total) "total-number-cell" "total-number-cell-neg")
html-table rownum current-col (total-number-cell-tag act-total)
(gnc:make-gnc-monetary comm act-total))
(set! current-col (+ current-col 1))
)
)
(if show-diff?
(let* ((diff-val
(gnc:make-gnc-monetary comm
(gnc-numeric-sub bgt-total
act-total GNC-DENOM-AUTO
(+ GNC-DENOM-LCD GNC-RND-NEVER)))))
(+ GNC-DENOM-LCD GNC-RND-NEVER))))
(gnc:html-table-set-cell/tag!
html-table rownum current-col (if (negative-numeric-p diff-val) "total-number-cell-neg" "total-number-cell")
(if bgt-total-unset? "." diff-val)
html-table rownum current-col (total-number-cell-tag diff-val)
(if bgt-total-unset? "." (gnc:make-gnc-monetary comm diff-val))
)
(set! current-col (+ current-col 1))
)
@@ -353,6 +356,16 @@
(set! period (+ period 1))
)
)
(if show-totalcol?
(let* (
(tc #f))
(gnc:html-table-set-cell/tag!
html-table 0 (+ current-col num-periods) "centered-label-cell"
"Total")
(set! tc (gnc:html-table-get-cell html-table 0 (+ current-col num-periods)))
(gnc:html-table-cell-set-colspan! tc (if show-diff? 3 2))
)
)
;; make the column headers
(set! period 0)
@@ -385,9 +398,6 @@
)
(if show-totalcol?
(begin
(gnc:html-table-set-cell/tag!
html-table 0 (if show-diff? (+ current-col 1) current-col) "centered-label-cell"
"Total")
(if show-budget?
(begin
(gnc:html-table-set-cell/tag!

18
src/report/stylesheets/stylesheet-css.scm
View File

@@ -201,15 +201,23 @@
'attribute (list "cellspacing" spacing)
'attribute (list "cellpadding" padding))
(gnc:html-document-set-style!
ssdoc "anchor-cell"
'tag "td"
'attribute (list "class" "anchor-cell")
'attribute (list "nowrap"))
(gnc:html-document-set-style!
ssdoc "number-cell"
'tag "td"
'attribute (list "class" "number-cell"))
'attribute (list "class" "number-cell")
'attribute (list "nowrap"))
(gnc:html-document-set-style!
ssdoc "number-cell-neg"
'tag "td"
'attribute (list "class" "number-cell-neg"))
'attribute (list "class" "number-cell-neg")
'attribute (list "nowrap"))
(gnc:html-document-set-style!
ssdoc "number-header"
@@ -224,12 +232,14 @@
(gnc:html-document-set-style!
ssdoc "total-number-cell"
'tag "td"
'attribute (list "class" "total-number-cell"))
'attribute (list "class" "total-number-cell")
'attribute (list "nowrap"))
(gnc:html-document-set-style!
ssdoc "total-number-cell-neg"
'tag "td"
'attribute (list "class" "total-number-cell-neg"))
'attribute (list "class" "total-number-cell-neg")
'attribute (list "nowrap"))
(gnc:html-document-set-style!
ssdoc "total-label-cell"

6
src/report/stylesheets/stylesheet-easy.scm
View File

@@ -231,6 +231,12 @@
;;;;
;;;;
(gnc:html-document-set-style!
ssdoc "anchor-cell"
'tag "td"
'attribute (list "align" "left")
'attribute (list "nowrap"))
(gnc:html-document-set-style!
ssdoc "number-cell"
'tag "td"

6
src/report/stylesheets/stylesheet-fancy.scm
View File

@@ -225,6 +225,12 @@
;;;;
;;;;
;;;;
(gnc:html-document-set-style!
ssdoc "anchor-cell"
'tag "td"
'attribute (list "align" "left")
'attribute (list "nowrap"))
(gnc:html-document-set-style!
ssdoc "number-cell"
'tag "td"

6
src/report/stylesheets/stylesheet-plain.scm
View File

@@ -102,6 +102,12 @@
'attribute (list "cellspacing" spacing)
'attribute (list "cellpadding" padding))
(gnc:html-document-set-style!
ssdoc "anchor-cell"
'tag "td"
'attribute (list "align" "left")
'attribute (list "nowrap"))
(gnc:html-document-set-style!
ssdoc "number-cell"
'tag "td"