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

show colorized amounts for totals of bs/is/cf (#567)

Browse Source
This commit is contained in:
Justin Le 2017-06-08 10:33:46 -07:00 committed by Simon Michael
parent 995fcbeaf5
commit 54d33ce028
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hledger/Hledger/Cli/BalanceView.hs
View File

@ -100,7 +100,7 @@ multiBalanceviewQueryReport
-> ([Table String String MixedAmount], [[MixedAmount]], Sum MixedAmount) -> ([Table String String MixedAmount], [[MixedAmount]], Sum MixedAmount)
multiBalanceviewQueryReport ropts q0 j t q = ([tabl], [coltotals], Sum tot) multiBalanceviewQueryReport ropts q0 j t q = ([tabl], [coltotals], Sum tot)
where where
singlesection = "Cash" `isPrefixOf` t -- TODO temp singlesection = "Cash" `isPrefixOf` t -- TODO temp
ropts' = ropts { no_total_ = singlesection && no_total_ ropts, empty_ = True } ropts' = ropts { no_total_ = singlesection && no_total_ ropts, empty_ = True }
q' = And [q0, q j] q' = And [q0, q j]
MultiBalanceReport (dates, rows, (coltotals,tot,avg)) = MultiBalanceReport (dates, rows, (coltotals,tot,avg)) =
@ -129,7 +129,7 @@ balanceviewReport BalanceView{..} CliOpts{command_=cmd, reportopts_=ropts, rawop
unless (no_total_ ropts' || cmd=="cashflow") . mapM_ putStrLn $ -- TODO temp unless (no_total_ ropts' || cmd=="cashflow") . mapM_ putStrLn $ -- TODO temp
[ "Total:" [ "Total:"
, "--------------------" , "--------------------"
, padleft 20 $ showMixedAmountWithoutPrice (getSum amt) , padLeftWide 20 $ showamt (getSum amt)
] ]
_ -> do _ -> do
let (tabls, amts, Sum totsum) let (tabls, amts, Sum totsum)
@ -154,6 +154,8 @@ balanceviewReport BalanceView{..} CliOpts{command_=cmd, reportopts_=ropts, rawop
putStrLn title putStrLn title
putStrLn $ renderBalanceReportTable ropts totTabl putStrLn $ renderBalanceReportTable ropts totTabl
where where
showamt | color_ ropts = cshowMixedAmountWithoutPrice
| otherwise = showMixedAmountWithoutPrice
overwriteBalanceType = overwriteBalanceType =
case reverse $ filter (`elem` ["change","cumulative","historical"]) $ map fst raw of case reverse $ filter (`elem` ["change","cumulative","historical"]) $ map fst raw of
"historical":_ -> Just HistoricalBalance "historical":_ -> Just HistoricalBalance