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

dev: clarify orderedAmounts

Browse Source
This commit is contained in:
Simon Michael 2023-08-24 16:41:53 +01:00
parent 3f050d45a9
commit 28cdcd1bfd
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -911,11 +911,18 @@ showMixedAmountOneLineB opts@AmountDisplayOpts{displayMaxWidth=mmax,displayMinWi
-- Add the elision strings (if any) to each amount -- Add the elision strings (if any) to each amount
withElided = zipWith (\n2 amt -> (amt, elisionDisplay Nothing (wbWidth sep) n2 amt)) [n-1,n-2..0] withElided = zipWith (\n2 amt -> (amt, elisionDisplay Nothing (wbWidth sep) n2 amt)) [n-1,n-2..0]
-- Get a mixed amount's component amounts with a bit of cleanup (like @amounts@),
-- and if a commodity display order is provided, sort them according to that.
orderedAmounts :: AmountDisplayOpts -> MixedAmount -> [Amount] orderedAmounts :: AmountDisplayOpts -> MixedAmount -> [Amount]
orderedAmounts dopts = maybe id (mapM pad) (displayOrder dopts) . amounts orderedAmounts AmountDisplayOpts{displayOrder=mcommodityorder} =
amounts
<&> maybe id (mapM findfirst) mcommodityorder -- maybe sort them (somehow..)
where where
pad c = fromMaybe (amountWithCommodity c nullamt) . find ((c==) . acommodity) -- Find the first amount with the given commodity, otherwise a null amount in that commodity.
findfirst :: CommoditySymbol -> [Amount] -> Amount
findfirst c = fromMaybe nullamtc . find ((c==) . acommodity)
where
nullamtc = amountWithCommodity c nullamt
data AmountDisplay = AmountDisplay data AmountDisplay = AmountDisplay
{ adBuilder :: !WideBuilder -- ^ String representation of the Amount { adBuilder :: !WideBuilder -- ^ String representation of the Amount