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

lib,cli: Fix ledgerDateSpan, so that in takes transaction dates into account.

Browse Source
This commit is contained in:
Stephen Morgan 2021-04-03 16:35:58 +11:00 committed by Simon Michael
parent 5fbb67b893
commit edbb713cf8
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-lib/Hledger/Data/Ledger.hs
View File

@ -31,9 +31,7 @@ import Text.Printf
import Hledger.Utils.Test import Hledger.Utils.Test
import Hledger.Data.Types import Hledger.Data.Types
import Hledger.Data.Account import Hledger.Data.Account
import Hledger.Data.Dates (daysSpan)
import Hledger.Data.Journal import Hledger.Data.Journal
import Hledger.Data.Posting (postingDate)
import Hledger.Query import Hledger.Query
@ -94,7 +92,7 @@ ledgerPostings = journalPostings . ljournal
-- | The (fully specified) date span containing all the ledger's (filtered) transactions, -- | The (fully specified) date span containing all the ledger's (filtered) transactions,
-- or DateSpan Nothing Nothing if there are none. -- or DateSpan Nothing Nothing if there are none.
ledgerDateSpan :: Ledger -> DateSpan ledgerDateSpan :: Ledger -> DateSpan
ledgerDateSpan = daysSpan . map postingDate . ledgerPostings ledgerDateSpan = journalDateSpanBothDates . ljournal
-- | All commodities used in this ledger. -- | All commodities used in this ledger.
ledgerCommodities :: Ledger -> [CommoditySymbol] ledgerCommodities :: Ledger -> [CommoditySymbol]

2
hledger/Hledger/Cli/Commands/Stats.hs
View File

@ -46,7 +46,7 @@ stats opts@CliOpts{reportspec_=rspec} j = do
d <- getCurrentDay d <- getCurrentDay
let q = rsQuery rspec let q = rsQuery rspec
l = ledgerFromJournal q j l = ledgerFromJournal q j
reportspan = (ledgerDateSpan l) `spanDefaultsFrom` (queryDateSpan False q) reportspan = ledgerDateSpan l `spanDefaultsFrom` queryDateSpan False q
intervalspans = splitSpan (interval_ $ rsOpts rspec) reportspan intervalspans = splitSpan (interval_ $ rsOpts rspec) reportspan
showstats = showLedgerStats l d showstats = showLedgerStats l d
s = intercalate "\n" $ map showstats intervalspans s = intercalate "\n" $ map showstats intervalspans