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

budget: more consistent display of percentage

Browse Source
This commit is contained in:
Simon Michael 2018-04-23 08:18:51 -07:00
parent 41665d07b0
commit 8759f12b63
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hledger-lib/Hledger/Reports/BudgetReport.hs
View File

@ -258,17 +258,19 @@ budgetReportAsText ropts budgetr =
++ ++
tableAsText ropts showcell (budgetReportAsTable ropts budgetr) tableAsText ropts showcell (budgetReportAsTable ropts budgetr)
where where
-- XXX lay out actual, percentage and/or goal in the single table cell for now, should probably use separate cells
showcell :: (Maybe Change, Maybe BudgetGoal) -> String showcell :: (Maybe Change, Maybe BudgetGoal) -> String
showcell (mactual, mbudget) = actualstr ++ " " ++ budgetstr showcell (mactual, mbudget) = actualstr ++ " " ++ budgetstr
where where
actualwidth = 7 actualwidth = 7
percentwidth = 4 percentwidth = 4
budgetwidth = 5 budgetwidth = 5
actualstr = printf ("%"++show actualwidth++"s") (maybe "0" showamt mactual) actual = fromMaybe 0 mactual
budgetstr = case (mactual, mbudget) of actualstr = printf ("%"++show actualwidth++"s") (showamt actual)
(_, Nothing) -> replicate (percentwidth + 7 + budgetwidth) ' ' budgetstr = case mbudget of
(mactual, Just budget) -> Nothing -> replicate (percentwidth + 7 + budgetwidth) ' '
case percentage mactual budget of Just budget ->
case percentage actual budget of
Just pct -> Just pct ->
printf ("[%"++show percentwidth++"s%% of %"++show budgetwidth++"s]") printf ("[%"++show percentwidth++"s%% of %"++show budgetwidth++"s]")
(show $ roundTo 0 pct) (showbudgetamt budget) (show $ roundTo 0 pct) (showbudgetamt budget)
@ -276,18 +278,19 @@ budgetReportAsText ropts budgetr =
printf ("["++replicate (percentwidth+5) ' '++"%"++show budgetwidth++"s]") printf ("["++replicate (percentwidth+5) ' '++"%"++show budgetwidth++"s]")
(showbudgetamt budget) (showbudgetamt budget)
percentage :: Maybe Change -> BudgetGoal -> Maybe Percentage -- | Calculate the percentage of actual change to budget goal to show, if any.
percentage Nothing _ = Nothing -- Both amounts are converted to cost, if possible, before comparing.
percentage (Just actual) budget = -- A percentage will not be shown if:
-- percentage of budget consumed is always computed in the cost basis -- - actual or goal are not the same, single, commodity
-- - the goal is zero
percentage :: Change -> BudgetGoal -> Maybe Percentage
percentage actual budget =
case (toCost actual, toCost budget) of case (toCost actual, toCost budget) of
(Mixed [a1], Mixed [a2]) (Mixed [a], Mixed [b]) | (acommodity a == acommodity b || isZeroAmount a) && not (isZeroAmount b)
| isReallyZeroAmount a1 -> Just 0 -- if there are no postings, we consumed 0% of budget -> Just $ 100 * aquantity a / aquantity b
| acommodity a1 == acommodity a2 && aquantity a2 /= 0 -> _ -> Nothing
Just $ 100 * aquantity a1 / aquantity a2 where
_ -> Nothing toCost = normaliseMixedAmount . costOfMixedAmount
where
toCost = normaliseMixedAmount . costOfMixedAmount
showamt :: MixedAmount -> String showamt :: MixedAmount -> String
showamt | color_ ropts = cshowMixedAmountOneLineWithoutPrice showamt | color_ ropts = cshowMixedAmountOneLineWithoutPrice

15
tests/budget/budget.test
View File

@ -41,7 +41,7 @@ Budget performance in 2016/12/01-2016/12/03:
expenses:food || $10 [ 100% of $10] $9 [ 90% of $10] $11 [ 110% of $10] expenses:food || $10 [ 100% of $10] $9 [ 90% of $10] $11 [ 110% of $10]
expenses:leisure || 0 [ 0% of $15] $5 [ 33% of $15] 0 [ 0% of $15] expenses:leisure || 0 [ 0% of $15] $5 [ 33% of $15] 0 [ 0% of $15]
-----------------------++------------------------------------------------------------------------------ -----------------------++------------------------------------------------------------------------------
|| 0 [ 0% of 0] 0 [ 0% of 0] 0 [ 0% of 0] || 0 [ 0] 0 [ 0] 0 [ 0]
# 2. --show-unbudgeted # 2. --show-unbudgeted
$ hledger bal -D -b 2016-12-01 -e 2016-12-04 -f - --budget --show-unbudgeted $ hledger bal -D -b 2016-12-01 -e 2016-12-04 -f - --budget --show-unbudgeted
@ -55,7 +55,7 @@ Budget performance in 2016/12/01-2016/12/03:
expenses:leisure || 0 [ 0% of $15] $5 [ 33% of $15] 0 [ 0% of $15] expenses:leisure || 0 [ 0% of $15] $5 [ 33% of $15] 0 [ 0% of $15]
expenses:movies || 0 0 $25 expenses:movies || 0 0 $25
------------------++------------------------------------------------------------------------------ ------------------++------------------------------------------------------------------------------
|| 0 [ 0% of 0] 0 [ 0% of 0] 0 [ 0% of 0] || 0 [ 0] 0 [ 0] 0 [ 0]
# 3. Test that budget works with mix of commodities # 3. Test that budget works with mix of commodities
< <
@ -102,8 +102,7 @@ Budget performance in 2016/12/01-2016/12/03:
expenses:food || £10 [ 150% of $10] 20 CAD [ 210% of $10] $11 [ 110% of $10] expenses:food || £10 [ 150% of $10] 20 CAD [ 210% of $10] $11 [ 110% of $10]
expenses:leisure || 0 [ 0% of $15] $5 [ 33% of $15] 0 [ 0% of $15] expenses:leisure || 0 [ 0% of $15] $5 [ 33% of $15] 0 [ 0% of $15]
-----------------------++------------------------------------------------------------------------------------- -----------------------++-------------------------------------------------------------------------------------
|| $-15, £10 [ 0% of 0] $-21, 20 CAD [ 0% of 0] 0 [ 0% of 0] || $-15, £10 [ 0] $-21, 20 CAD [ 0] 0 [ 0]
# TODO zero totals ^
< <
~ daily ~ daily
@ -142,8 +141,8 @@ Budget performance in 2018/01/01-2018/01/03:
|| 2018/01/01 2018/01/02 2018/01/03 || 2018/01/01 2018/01/02 2018/01/03
===++============================================================================== ===++==============================================================================
a || 1 [ 10% of 10] 0 [ 0% of 10] 1 [ 10% of 10] a || 1 [ 10% of 10] 0 [ 0% of 10] 1 [ 10% of 10]
b || 1 [ 1% of 100] 0 [ 0% of 0] 1 [ 0] b || 1 [ 1% of 100] 0 [ 0] 1 [ 0]
c || 1 [ 0% of 1000] 0 [ 0% of 0] 1 [ 0] c || 1 [ 0% of 1000] 0 [ 0] 1 [ 0]
---++------------------------------------------------------------------------------ ---++------------------------------------------------------------------------------
|| 3 [ 0% of 1110] 0 [ 0% of 10] 3 [ 30% of 10] || 3 [ 0% of 1110] 0 [ 0% of 10] 3 [ 30% of 10]
@ -247,9 +246,9 @@ Budget performance in 2018/01/01-2018/01/02:
|| 2018/01/01 2018/01/02 || 2018/01/01 2018/01/02
===++==================================================== ===++====================================================
a || 0 [ 1] 0 [ 1] a || 0 [ 0% of 1] 0 [ 0% of 1]
---++---------------------------------------------------- ---++----------------------------------------------------
|| 0 [ 1] 0 [ 1] || 0 [ 0% of 1] 0 [ 0% of 1]
# 11. With -E, zeroes are shown # 11. With -E, zeroes are shown
$ hledger -f- bal --budget -D date:2018/1/1-2018/1/3 -E $ hledger -f- bal --budget -D date:2018/1/1-2018/1/3 -E