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

refactor compoundBalanceCommand

Browse Source
This commit is contained in:
Simon Michael 2017-07-25 13:04:26 -07:00
parent 115ed3aead
commit f0119ec9c1
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hledger/Hledger/Cli/CompoundBalanceCommand.hs
View File

@ -95,10 +95,8 @@ compoundBalanceCommand CompoundBalanceCommandSpec{..} CliOpts{command_=cmd, repo
PeriodChange -> "(Balance Changes)" PeriodChange -> "(Balance Changes)"
CumulativeChange -> "(Cumulative Ending Balances)" CumulativeChange -> "(Cumulative Ending Balances)"
HistoricalBalance -> "(Historical Ending Balances)" HistoricalBalance -> "(Historical Ending Balances)"
-- set balance type and possibly tree mode in the report options. Some older notes: -- Set balance type in the report options.
-- For --historical/--cumulative, we must use multiBalanceReport (this forces --no-elide). -- Also default to tree mode if --cumulative/--historical are used in single column mode. TODO: why ?
-- These settings format the output in a way that we can convert to a normal balance report
-- using singleBalanceReport, see Balance.hs for more information.
ropts' ropts'
| not (flat_ ropts) && | not (flat_ ropts) &&
interval_ ropts==NoInterval && interval_ ropts==NoInterval &&
@ -115,7 +113,7 @@ compoundBalanceCommand CompoundBalanceCommandSpec{..} CliOpts{command_=cmd, repo
let (subreportstr, total) = foldMap (uncurry (compoundBalanceCommandSingleColumnReport ropts' userq j)) cbcqueries let (subreportstr, total) = foldMap (uncurry (compoundBalanceCommandSingleColumnReport ropts' userq j)) cbcqueries
putStrLn $ title ++ "\n" putStrLn $ title ++ "\n"
mapM_ putStrLn subreportstr mapM_ putStrLn subreportstr
unless (no_total_ ropts' || cmd=="cashflow") . mapM_ putStrLn $ -- TODO temp unless (no_total_ ropts' || cmd=="cashflow") . mapM_ putStrLn $
[ "Total:" [ "Total:"
, "--------------------" , "--------------------"
, padLeftWide 20 $ showamt (getSum total) , padLeftWide 20 $ showamt (getSum total)
@ -142,20 +140,25 @@ compoundBalanceCommand CompoundBalanceCommandSpec{..} CliOpts{command_=cmd, repo
where where
overalltotals = case subreporttotals of overalltotals = case subreporttotals of
[] -> [] [] -> []
ts -> foldl' (zipWith (+)) zeros ts' ts ->
where -- Sum the subtotals in each column.
-- A subreport might be empty and have no subtotals, count those as zeroes (#588). -- A subreport might be empty and have no subtotals, count those as zeros (#588).
-- Varying-length subtotals rows are handled similarly, though that is not expected to happen. -- Short subtotals rows are also implicitly padded with zeros, though that is not expected to happen.
len = maximum $ map length ts let
ts' = [take len $ as ++ repeat nullmixedamt | as <- ts] numcols = maximum $ map length ts
zeros = replicate len nullmixedamt zeros = replicate numcols nullmixedamt
ts' = [take numcols $ as ++ repeat nullmixedamt | as <- ts]
in foldl' (zipWith (+)) zeros ts'
-- add values for the total/average columns if enabled
overalltotals' overalltotals'
| null overalltotals = [] | null overalltotals = []
| otherwise = overalltotals | otherwise =
++ (if row_total_ ropts' then [overalltotal] else []) overalltotals
++ (if average_ ropts' then [overallaverage] else []) ++ (if row_total_ ropts' then [overalltotal] else [])
where ++ (if average_ ropts' then [overallaverage] else [])
overallaverage = overalltotal `divideMixedAmount` fromIntegral (length overalltotals) where
overallaverage =
overalltotal `divideMixedAmount` fromIntegral (length overalltotals) -- depends on non-null overalltotals
putStrLn $ title ++ "\n" putStrLn $ title ++ "\n"
putStr $ renderBalanceReportTable ropts' overalltable' putStr $ renderBalanceReportTable ropts' overalltable'