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

lib: fix forecast start/end dates

Browse Source 
pushed too soon
This commit is contained in:
Simon Michael 2018-06-18 18:08:55 -07:00
parent 26d2c79ce0
commit 9c1db9ed9f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,12 +144,12 @@ journalAddForecast opts@CliOpts{reportopts_=ropts} j = do
today <- getCurrentDay today <- getCurrentDay
-- "They start on or after the day following the latest normal transaction in the journal, or today if there are none." -- "They start on or after the day following the latest normal transaction in the journal, or today if there are none."
let DateSpan mjournalstart _ = journalDateSpan False j -- ignore secondary dates let DateSpan _ mjournalend = dbg2 "journalspan" $ journalDateSpan False j -- ignore secondary dates
forecaststart = fromMaybe today mjournalstart forecaststart = dbg2 "forecaststart" $ fromMaybe today mjournalend
-- "They end on or before the specified report end date, or 180 days from today if unspecified." -- "They end on or before the specified report end date, or 180 days from today if unspecified."
mspecifiedstart <- fst <$> specifiedStartEndDates ropts mspecifiedend <- snd . dbg2 "specifieddates" <$> specifiedStartEndDates ropts
let forecastend = fromMaybe (addDays 180 today) mspecifiedstart let forecastend = dbg2 "forecastend" $ fromMaybe (addDays 180 today) mspecifiedend
let forecastspan = DateSpan (Just forecaststart) (Just forecastend) let forecastspan = DateSpan (Just forecaststart) (Just forecastend)
forecasttxns = [ txnTieKnot t | pt <- jperiodictxns j forecasttxns = [ txnTieKnot t | pt <- jperiodictxns j