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

[account-summary] tag col headers properly to fix formatting

Browse Source 
With this commit the col headers are now properly formatted. Change
tests because the tag is now th instead of td therefore sxml (looking
for td) can't find them anymore.
This commit is contained in:
Christopher Lam
2019-09-21 20:39:16 +08:00
parent 3a24468155
commit 1a6314e108
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gnucash/report/standard-reports/account-summary.scm
View File

@@ -278,8 +278,7 @@
(gnc:report-starting reportname)
(let* (
(report-title (get-option gnc:pagename-general optname-report-title))
(let* ((report-title (get-option gnc:pagename-general optname-report-title))
(company-name (get-option gnc:pagename-general optname-party-name))
(from-date (and sx?
(gnc:time64-start-day-time
@@ -393,16 +392,20 @@
(rowloop (1+ row))))
(set! cur-col (1+ cur-col)))
(define (make-header str)
(gnc:make-html-table-cell/markup "number-header" str))
(gnc:html-table-add-account-balances hold-table chart-table params)
;; place the column headers
(gnc:html-table-append-row!
build-table
(append
(if show-code? (list (_ "Code")) '())
(if show-type? (list (_ "Type")) '())
(if show-desc? (list (_ "Description")) '())
(list (_ "Account title"))))
(map make-header
(append
(if show-code? (list (_ "Code")) '())
(if show-type? (list (_ "Type")) '())
(if show-desc? (list (_ "Description")) '())
(list (_ "Account title")))))
;; add any fields to be displayed before the account name
(if show-code? (add-col 'account-code))
(if show-type? (add-col 'account-type-string))
@@ -429,7 +432,7 @@
(set! cur-col (+ cur-col hold-table-width))
(when show-notes?
(gnc:html-table-set-cell/tag!
build-table 0 cur-col "text-cell" (_ "Notes"))
build-table 0 cur-col "number-header" (_ "Notes"))
(add-col 'account-notes))
(gnc:html-document-add-object! doc build-table)

8
gnucash/report/standard-reports/test/test-account-summary.scm
View File

@@ -53,10 +53,10 @@
(let* ((options (default-testing-options accsum-uuid))
(sxml (options->sxml accsum-uuid options "accsum")))
(test-equal "accsum col 1"
'("Code" "#608.00" "-#612.00" "#608.00" "-#612.00" "#608.00" "-#612.00")
'("#608.00" "-#612.00" "#608.00" "-#612.00" "#608.00" "-#612.00")
(sxml->table-row-col sxml 1 #f 1))
(test-equal "accsum col 2"
'("Account title" "Root" "Asset" "Bank" "GBP Bank" "Wallet"
'("Root" "Asset" "Bank" "GBP Bank" "Wallet"
"Liabilities" "Income" "Income-GBP" "Expenses" "Equity")
(sxml->table-row-col sxml 1 #f 2))
(test-equal "accsum col 3"
@@ -69,10 +69,10 @@
(let* ((options (default-testing-options fsts-uuid))
(sxml (options->sxml fsts-uuid options "fsts")))
(test-equal "fsts col 1"
'("Code")
'()
(sxml->table-row-col sxml 1 #f 1))
(test-equal "fsts col 2"
'("Account title" "Root" "Asset" "Bank" "GBP Bank" "Wallet"
'("Root" "Asset" "Bank" "GBP Bank" "Wallet"
"Liabilities" "Income" "Income-GBP" "Expenses" "Equity")
(sxml->table-row-col sxml 1 #f 2))
(test-equal "fsts col 3"