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

;lib: postingsReport cleanup

Browse Source
This commit is contained in:
Simon Michael 2019-05-04 17:09:16 -07:00
parent cc05f48697
commit 66b1599058
2 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hledger-lib/Hledger/Data/MarketPrice.hs
View File

@ -8,9 +8,17 @@ value of things at a given date.
-}
module Hledger.Data.MarketPrice
{-# LANGUAGE RecordWildCards #-}
module Hledger.Data.MarketPrice (
showMarketPrice
,postingValueAtDate
)
where
import Data.List
import qualified Data.Text as T
import Data.Time.Calendar
import Hledger.Data.Amount
import Hledger.Data.Dates
@ -25,3 +33,12 @@ showMarketPrice mp = unwords
, T.unpack (mpcommodity mp)
, (showAmount . setAmountPrecision maxprecision) (mpamount mp)
]
-- | Convert this posting's amount to its value on the given date in
-- its default valuation commodity, using market prices from the given journal.
postingValueAtDate :: Journal -> Day -> Posting -> Posting
postingValueAtDate j d p@Posting{..} = p{pamount=mixedAmountValue prices d pamount}
where
-- prices are in parse order - sort into date then parse order,
-- & reversed for quick lookup of the latest price.
prices = reverse $ sortOn mpdate $ jmarketprices j

71
hledger-lib/Hledger/Reports/PostingsReport.hs
View File

@ -72,47 +72,38 @@ postingsReport ropts@ReportOpts{..} q j =
(precedingps, reportps) = matchedPostingsBeforeAndDuring ropts q j reportspan
-- Postings or summary pseudo postings to be displayed.
-- If --value-at is present, we'll need to convert them to value in various ways.
displayps
| multiperiod = case mvalueat of
Just AtTransaction
-> [(postingValueAtDate (postingDate p) p, end) | (p,end) <- summarisePostingsByInterval interval_ whichdate depth showempty reportspan reportps]
Just AtPeriod
-> [(postingValueAtDate (
maybe (error' "postingsReport: expected a subperiod end date") -- XXX shouldn't happen
(addDays (-1)) end) p
, end)
| (p,end) <- summarisePostingsByInterval interval_ whichdate depth showempty reportspan reportps]
Just (AtDate d)
-> [(postingValueAtDate d p, end) | (p,end) <- summarisePostingsByInterval interval_ whichdate depth showempty reportspan reportps]
Just AtNow
-> [(postingValueAtDate today p, end) | (p,end) <- summarisePostingsByInterval interval_ whichdate depth showempty reportspan reportps]
Nothing
-> [(p, end) | (p,end) <- summarisePostingsByInterval interval_ whichdate depth showempty reportspan reportps]
| otherwise = case mvalueat of
Just AtTransaction
-> [(postingValueAtDate (postingDate p) p, Nothing) | p <- reportps]
Just AtPeriod
-> [(postingValueAtDate reportperiodlastday p, Nothing) | p <- reportps]
Just (AtDate d)
-> [(postingValueAtDate d p, Nothing) | p <- reportps]
Just AtNow
-> [(postingValueAtDate today p, Nothing) | p <- reportps]
Nothing
-> [(p, Nothing) | p <- reportps]
where
mvalueat = if value_ then Just value_at_ else Nothing
-- If --value-at is present, we'll need to convert them to value as of various dates.
displayps =
let
multiperiod = interval_ /= NoInterval
showempty = empty_ || average_
reportperiodlastday =
fromMaybe (error' "postingsReport: expected a non-empty journal") -- XXX shouldn't happen
$ reportPeriodOrJournalLastDay ropts j
today = fromMaybe (error' "postingsReport: ReportOpts today_ is unset so could not satisfy --value-at=now") today_
postingValueAtDate d p@Posting{..} = p{pamount=mixedAmountValue prices d pamount}
where
-- prices are in parse order - sort into date then parse order,
-- & reversed for quick lookup of the latest price.
prices = reverse $ sortOn mpdate $ jmarketprices j
mvalueat = if value_ then Just value_at_ else Nothing
today = fromMaybe (error' "postingsReport: ReportOpts today_ is unset so could not satisfy --value-at=now") today_
in
if multiperiod then
let
showempty = empty_ || average_
summaryps = summarisePostingsByInterval interval_ whichdate depth showempty reportspan reportps
in case mvalueat of
Nothing -> [(p , periodend) | (p,periodend) <- summaryps]
Just AtTransaction -> [(postingValueAtDate j (postingDate p) p , periodend) | (p,periodend) <- summaryps]
Just AtPeriod -> [(postingValueAtDate j periodlastday p , periodend) | (p,periodend) <- summaryps
,let periodlastday = maybe
(error' "postingsReport: expected a subperiod end date") -- XXX shouldn't happen
(addDays (-1))
periodend
]
Just AtNow -> [(postingValueAtDate j today p , periodend) | (p,periodend) <- summaryps]
Just (AtDate d) -> [(postingValueAtDate j d p , periodend) | (p,periodend) <- summaryps]
else
let reportperiodlastday =
fromMaybe (error' "postingsReport: expected a non-empty journal") -- XXX shouldn't happen
$ reportPeriodOrJournalLastDay ropts j
in case mvalueat of
Nothing -> [(p , Nothing) | p <- reportps]
Just AtTransaction -> [(postingValueAtDate j (postingDate p) p , Nothing) | p <- reportps]
Just AtPeriod -> [(postingValueAtDate j reportperiodlastday p, Nothing) | p <- reportps]
Just AtNow -> [(postingValueAtDate j today p , Nothing) | p <- reportps]
Just (AtDate d) -> [(postingValueAtDate j d p , Nothing) | p <- reportps]
-- posting report items ready for display
items = dbg1 "postingsReport items" $ postingsReportItems displayps (nullposting,Nothing) whichdate depth startbal runningcalc startnum