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

lib: make date: also set forecast end date, not just -e and -p

Browse Source
This commit is contained in:
Simon Michael 2018-06-18 17:55:18 -07:00
parent 816ba0f89d
commit 26d2c79ce0
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hledger/Hledger/Cli/Utils.hs
View File

@ -132,22 +132,34 @@ journalApplyValue ropts j = do
| otherwise = id | otherwise = id
return $ convert j return $ convert j
-- | Run PeriodicTransactions from journal from today or journal end to requested end day. -- | Generate periodic transactions from all periodic transaction rules in the journal.
-- Add generated transactions to the journal -- These transactions are added to the in-memory Journal (but not the on-disk file).
--
-- They start on or after the day following the latest normal transaction in the journal,
-- or today if there are none.
-- They end on or before the specified report end date, or 180 days from today if unspecified.
--
journalAddForecast :: CliOpts -> Journal -> IO Journal journalAddForecast :: CliOpts -> Journal -> IO Journal
journalAddForecast opts j = do journalAddForecast opts@CliOpts{reportopts_=ropts} j = do
today <- getCurrentDay today <- getCurrentDay
-- Create forecast starting from end of journal + 1 day, and until the end of requested reporting period
-- If end is not provided, do 180 days of forecast. -- "They start on or after the day following the latest normal transaction in the journal, or today if there are none."
-- Note that jdatespan already returns last day + 1 let DateSpan mjournalstart _ = journalDateSpan False j -- ignore secondary dates
let startDate = fromMaybe today $ spanEnd (jdatespan j) forecaststart = fromMaybe today mjournalstart
endDate = fromMaybe (addDays 180 today) $ periodEnd (period_ ropts)
dates = DateSpan (Just startDate) (Just endDate) -- "They end on or before the specified report end date, or 180 days from today if unspecified."
withForecast = [ txnTieKnot t | pt <- jperiodictxns j, t <- runPeriodicTransaction pt dates, spanContainsDate dates (tdate t) ] ++ (jtxns j) mspecifiedstart <- fst <$> specifiedStartEndDates ropts
ropts = reportopts_ opts let forecastend = fromMaybe (addDays 180 today) mspecifiedstart
let forecastspan = DateSpan (Just forecaststart) (Just forecastend)
forecasttxns = [ txnTieKnot t | pt <- jperiodictxns j
, t <- runPeriodicTransaction pt forecastspan
, spanContainsDate forecastspan (tdate t)
]
return $
if forecast_ ropts if forecast_ ropts
then return $ journalBalanceTransactions' opts j { jtxns = withForecast } then journalBalanceTransactions' opts j{ jtxns = forecasttxns ++ jtxns j } -- XXX wouldn't appending be better ?
else return j else j
where where
journalBalanceTransactions' opts j = journalBalanceTransactions' opts j =
let assrt = not . ignore_assertions_ $ inputopts_ opts let assrt = not . ignore_assertions_ $ inputopts_ opts