slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: balcmds: fix empty html columns fix (#1933)

Browse Source
This commit is contained in:
Simon Michael 2022-09-14 17:25:18 -10:00
parent 0c179c7e28
commit fc858d1159
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hledger/Hledger/Cli/Commands/Balance.hs
View File

@ -577,10 +577,10 @@ multiBalanceReportHtmlHeadRow ropts (acct:cells) =
let let
defstyle = style_ "" defstyle = style_ ""
(amts,tot,avg) (amts,tot,avg)
| row_total_ ropts && average_ ropts = (ini2, sndlst2, lst2) | row_total_ ropts && average_ ropts = (ini2, sndlst2, lst2)
| row_total_ ropts = (ini1, lst1, []) | row_total_ ropts = (ini1, lst1, [])
| average_ ropts = (ini1, [], lst1) | average_ ropts = (ini1, [], lst1)
| otherwise = (amts, [], []) | otherwise = (cells, [], [])
where where
n = length cells n = length cells
(ini1,lst1) = splitAt (n-1) cells (ini1,lst1) = splitAt (n-1) cells
@ -601,10 +601,10 @@ multiBalanceReportHtmlBodyRow ropts (label:cells) =
let let
defstyle = style_ "text-align:right" defstyle = style_ "text-align:right"
(amts,tot,avg) (amts,tot,avg)
| row_total_ ropts && average_ ropts = (ini2, sndlst2, lst2) | row_total_ ropts && average_ ropts = (ini2, sndlst2, lst2)
| row_total_ ropts = (ini1, lst1, []) | row_total_ ropts = (ini1, lst1, [])
| average_ ropts = (ini1, [], lst1) | average_ ropts = (ini1, [], lst1)
| otherwise = (amts, [], []) | otherwise = (cells, [], [])
where where
n = length cells n = length cells
(ini1,lst1) = splitAt (n-1) cells (ini1,lst1) = splitAt (n-1) cells
@ -630,10 +630,10 @@ multiBalanceReportHtmlFootRow ropts (acct:cells) =
let let
defstyle = style_ "text-align:right" defstyle = style_ "text-align:right"
(amts,tot,avg) (amts,tot,avg)
| row_total_ ropts && average_ ropts = (ini2, sndlst2, lst2) | row_total_ ropts && average_ ropts = (ini2, sndlst2, lst2)
| row_total_ ropts = (ini1, lst1, []) | row_total_ ropts = (ini1, lst1, [])
| average_ ropts = (ini1, [], lst1) | average_ ropts = (ini1, [], lst1)
| otherwise = (amts, [], []) | otherwise = (cells, [], [])
where where
n = length cells n = length cells
(ini1,lst1) = splitAt (n-1) cells (ini1,lst1) = splitAt (n-1) cells

10
hledger/test/balance/balance.test
View File

@ -195,7 +195,13 @@ account b
$ hledger -f - balance -NE --declared not:a $ hledger -f - balance -NE --declared not:a
0 b 0 b
# 13. An empty totals column does not break HTML output (#1933). # 13. An empty periodic report in HTML output does not break.
< <
$ hledger -f- bal -YT -O html $ hledger -f- bal -M -O html
> // > //
# 14. An empty totals column in HTML output does not break (#1933).
<
$ hledger -f- bal -MT -O html
> //