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

;cln: slight typos cleanup (#1654)

Browse Source
This commit is contained in:
Simon Michael 2021-08-19 17:43:45 -10:00
parent 0982e3343a
commit c135c1a3fc
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hledger-lib/Hledger/Data/Amount.hs
View File

@ -664,7 +664,8 @@ amounts (Mixed ma)
amountsRaw :: MixedAmount -> [Amount] amountsRaw :: MixedAmount -> [Amount]
amountsRaw (Mixed ma) = toList ma amountsRaw (Mixed ma) = toList ma
-- | Get the set of mixed amount commodities. Returns an empty set of no amounts -- | Get this mixed amount's commodities as a set.
-- Returns an empty set if there are no amounts.
maCommodities :: MixedAmount -> S.Set CommoditySymbol maCommodities :: MixedAmount -> S.Set CommoditySymbol
maCommodities = S.fromList . fmap acommodity . amounts' maCommodities = S.fromList . fmap acommodity . amounts'
where amounts' ma@(Mixed m) = if M.null m then [] else amounts ma where amounts' ma@(Mixed m) = if M.null m then [] else amounts ma

8
hledger/test/balance/commodity-column.test
View File

@ -9,7 +9,7 @@ $ hledger -f bcexample.hledger bal assets.*etrade -3 -O csv
"total","70.00 GLD, 17.00 ITOT, 5120.50 USD, 36.00 VEA, 294.00 VHT" "total","70.00 GLD, 17.00 ITOT, 5120.50 USD, 36.00 VEA, 294.00 VHT"
>=0 >=0
# 2. Balance report csv output with one line per commodity (--commodity-columns). # 2. Balance report csv output with one line per commodity (--commodity-column).
$ hledger -f bcexample.hledger bal assets.*etrade -3 -O csv --commodity-column $ hledger -f bcexample.hledger bal assets.*etrade -3 -O csv --commodity-column
> >
"account","commodity","balance" "account","commodity","balance"
@ -65,7 +65,7 @@ $ hledger -f bcexample.hledger bal -T -Y assets.*etrade -3 -O csv
"total","10.00 ITOT, 337.18 USD, 12.00 VEA, 106.00 VHT","70.00 GLD, 18.00 ITOT, -98.12 USD, 10.00 VEA, 18.00 VHT","-11.00 ITOT, 4881.44 USD, 14.00 VEA, 170.00 VHT","70.00 GLD, 17.00 ITOT, 5120.50 USD, 36.00 VEA, 294.00 VHT" "total","10.00 ITOT, 337.18 USD, 12.00 VEA, 106.00 VHT","70.00 GLD, 18.00 ITOT, -98.12 USD, 10.00 VEA, 18.00 VHT","-11.00 ITOT, 4881.44 USD, 14.00 VEA, 170.00 VHT","70.00 GLD, 17.00 ITOT, 5120.50 USD, 36.00 VEA, 294.00 VHT"
>=0 >=0
# 6. Multicolumn balance report csv output with --commodity-columns. # 6. Multicolumn balance report csv output with --commodity-column.
$ hledger -f bcexample.hledger bal -T -Y assets.*etrade -3 -O csv --commodity-column $ hledger -f bcexample.hledger bal -T -Y assets.*etrade -3 -O csv --commodity-column
> >
"account","commodity","2012","2013","2014","total" "account","commodity","2012","2013","2014","total"
@ -95,7 +95,7 @@ Balance changes in 2012-01-01..2014-12-31:
Assets:US:ETrade || VHT 106.00 18.00 170.00 98.00 Assets:US:ETrade || VHT 106.00 18.00 170.00 98.00
>=0 >=0
# 8. Multicolumn budget report csv output with --commodity-columns. # 8. Multicolumn budget report csv output with --commodity-column.
$ hledger -f bcexample.hledger bal -Y assets.*etrade -3 -O csv --commodity-column --budget $ hledger -f bcexample.hledger bal -Y assets.*etrade -3 -O csv --commodity-column --budget
> >
"Account","Commodity","2012","budget","2013","budget","2014","budget" "Account","Commodity","2012","budget","2013","budget","2014","budget"
@ -147,7 +147,7 @@ Balance changes in 2012-01-01..2014-12-31:
Average || 23.33 5.67 1706.83 12.00 98.00 | 23.33 5.67 1706.83 12.00 98.00 Average || 23.33 5.67 1706.83 12.00 98.00 | 23.33 5.67 1706.83 12.00 98.00
>=0 >=0
# 11. Multicolumn balance report with --commodity-column --transpose. # 11. Multicolumn budget report with --commodity-column --transpose.
< <
~ daily from 2016/1/1 ~ daily from 2016/1/1
expenses:food $10 expenses:food $10