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

ui: make F key keep working, fixing breakage in 1.20 (#1411)

Browse Source 
This seems to be fallout from #1340's
2020-09-16 d0d39e615 lib,cli,ui,web: Introduce ReportSpec, which holds ReportOpts, the day of the report, and the parsed Query.
This commit is contained in:
Simon Michael 2020-12-11 09:34:21 -08:00
parent b25b2ba33d
commit b6cb95b534
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hledger-ui/Hledger/UI/AccountsScreen.hs
View File

@ -53,11 +53,11 @@ accountsScreen = AccountsScreen{
asInit :: Day -> Bool -> UIState -> UIState asInit :: Day -> Bool -> UIState -> UIState
asInit d reset ui@UIState{ asInit d reset ui@UIState{
aopts=uopts@UIOpts{cliopts_=copts@CliOpts{reportspec_=rspec@ReportSpec{rsOpts=ropts}}}, aopts=UIOpts{cliopts_=CliOpts{reportspec_=rspec@ReportSpec{rsOpts=ropts}}},
ajournal=j, ajournal=j,
aScreen=s@AccountsScreen{} aScreen=s@AccountsScreen{}
} = } =
ui{aopts=uopts', aScreen=s & asList .~ newitems'} ui{aScreen=s & asList .~ newitems'}
where where
newitems = list AccountsList (V.fromList $ displayitems ++ blankitems) 1 newitems = list AccountsList (V.fromList $ displayitems ++ blankitems) 1
@ -80,7 +80,7 @@ asInit d reset ui@UIState{
where where
as = map asItemAccountName displayitems as = map asItemAccountName displayitems
uopts' = uopts{cliopts_=copts{reportspec_=rspec'}} -- Further restrict the query based on the current period and future/forecast mode.
rspec' = rspec{rsQuery=simplifyQuery $ And [rsQuery rspec, periodq, excludeforecastq (forecast_ ropts)]} rspec' = rspec{rsQuery=simplifyQuery $ And [rsQuery rspec, periodq, excludeforecastq (forecast_ ropts)]}
where where
periodq = Date $ periodAsDateSpan $ period_ ropts periodq = Date $ periodAsDateSpan $ period_ ropts
@ -106,7 +106,8 @@ asInit d reset ui@UIState{
Mixed amts = normaliseMixedAmountSquashPricesForDisplay $ stripPrices bal Mixed amts = normaliseMixedAmountSquashPricesForDisplay $ stripPrices bal
stripPrices (Mixed as) = Mixed $ map stripprice as where stripprice a = a{aprice=Nothing} stripPrices (Mixed as) = Mixed $ map stripprice as where stripprice a = a{aprice=Nothing}
displayitems = map displayitem items displayitems = map displayitem items
-- blanks added for scrolling control, cf RegisterScreen -- blanks added for scrolling control, cf RegisterScreen.
-- XXX Ugly. Changing to 0 helps when debugging.
blankitems = replicate 100 blankitems = replicate 100
AccountsScreenItem{asItemIndentLevel = 0 AccountsScreenItem{asItemIndentLevel = 0
,asItemAccountName = "" ,asItemAccountName = ""