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

ui: register: fix queries, broken in 1.21 (#1523)

Browse Source
This commit is contained in:
Simon Michael 2021-04-12 12:05:35 -10:00
parent 493ed14629
commit b13df845c0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hledger-ui/Hledger/UI/RegisterScreen.hs
View File

@ -65,6 +65,8 @@ rsInit d reset ui@UIState{aopts=_uopts@UIOpts{cliopts_=CliOpts{reportspec_=rspec
-- XXX temp -- XXX temp
inclusive = tree_ ropts || rsForceInclusive inclusive = tree_ ropts || rsForceInclusive
thisacctq = Acct $ (if inclusive then accountNameToAccountRegex else accountNameToAccountOnlyRegex) rsAccount thisacctq = Acct $ (if inclusive then accountNameToAccountRegex else accountNameToAccountOnlyRegex) rsAccount
-- adjust the report options and regenerate the ReportSpec, carefully as usual to avoid screwups (#1523)
ropts' = ropts { ropts' = ropts {
-- ignore any depth limit, as in postingsReport; allows register's total to match accounts screen -- ignore any depth limit, as in postingsReport; allows register's total to match accounts screen
depth_=Nothing depth_=Nothing
@ -72,10 +74,10 @@ rsInit d reset ui@UIState{aopts=_uopts@UIOpts{cliopts_=CliOpts{reportspec_=rspec
-- always show historical balance -- always show historical balance
-- , balancetype_= HistoricalBalance -- , balancetype_= HistoricalBalance
} }
-- regenerate the ReportSpec, making sure to use the above rspec' =
rspec' = rspec{ rsQuery=simplifyQuery $ queryFromFlags ropts' either (error "rsInit: adjusting the query for register, should not have failed") id $ -- PARTIAL:
, rsOpts=ropts' updateReportSpec ropts' rspec
}
-- Further restrict the query based on the current period and future/forecast mode. -- Further restrict the query based on the current period and future/forecast mode.
q = simplifyQuery $ And [rsQuery rspec', periodq, excludeforecastq (forecast_ ropts)] q = simplifyQuery $ And [rsQuery rspec', periodq, excludeforecastq (forecast_ ropts)]
where where
@ -87,7 +89,6 @@ rsInit d reset ui@UIState{aopts=_uopts@UIOpts{cliopts_=CliOpts{reportspec_=rspec
Not (Date $ DateSpan (Just $ addDays 1 d) Nothing) Not (Date $ DateSpan (Just $ addDays 1 d) Nothing)
,Not generatedTransactionTag ,Not generatedTransactionTag
] ]
items = accountTransactionsReport rspec' j q thisacctq items = accountTransactionsReport rspec' j q thisacctq
items' = (if empty_ ropts then id else filter (not . mixedAmountLooksZero . fifth6)) $ -- without --empty, exclude no-change txns items' = (if empty_ ropts then id else filter (not . mixedAmountLooksZero . fifth6)) $ -- without --empty, exclude no-change txns
reverse -- most recent last reverse -- most recent last