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

resolve conflicts (Add Ledger.Amount.convertMixedAmountTo function)

Browse Source
This commit is contained in:
Simon Michael 2010-02-04 16:40:30 +00:00
parent 5c23ebd01b
commit 30dee8cc7d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Ledger/Amount.hs
View File

@ -89,6 +89,12 @@ amountop op a@(Amount _ _ _) (Amount bc bq _) =
convertAmountTo :: Commodity -> Amount -> Amount convertAmountTo :: Commodity -> Amount -> Amount
convertAmountTo c2 (Amount c1 q _) = Amount c2 (q * conversionRate c1 c2) Nothing convertAmountTo c2 (Amount c1 q _) = Amount c2 (q * conversionRate c1 c2) Nothing
-- | Convert mixed amount to the specified commodity
convertMixedAmountTo :: Commodity -> MixedAmount -> Amount
convertMixedAmountTo c2 (Mixed ams) = Amount c2 total Nothing
where
total = sum . map (quantity . convertAmountTo c2) $ ams
-- | Convert an amount to the commodity of its saved price, if any. -- | Convert an amount to the commodity of its saved price, if any.
costOfAmount :: Amount -> Amount costOfAmount :: Amount -> Amount
costOfAmount a@(Amount _ _ Nothing) = a costOfAmount a@(Amount _ _ Nothing) = a
@ -97,11 +103,6 @@ costOfAmount (Amount _ q (Just price))
| otherwise = Amount pc (pq*q) Nothing | otherwise = Amount pc (pq*q) Nothing
where (Amount pc pq _) = head $ amounts price where (Amount pc pq _) = head $ amounts price
-- | Convert an amount to the specified commodity using the appropriate
-- exchange rate (which is currently always 1).
convertAmountTo :: Commodity -> Amount -> Amount
convertAmountTo c2 (Amount c1 q _) = Amount c2 (q * conversionRate c1 c2) Nothing
-- | Get the string representation of an amount, based on its commodity's -- | Get the string representation of an amount, based on its commodity's
-- display settings. -- display settings.
showAmount :: Amount -> String showAmount :: Amount -> String