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

ui: register: fix zero txn toggling, and maintain selection

Browse Source
This commit is contained in:
Simon Michael 2016-06-03 12:56:22 -07:00
parent 7338543699
commit fa59fd27ee
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ import Control.Monad.IO.Class (liftIO)
import Data.List import Data.List
import Data.List.Split (splitOn) import Data.List.Split (splitOn)
import Data.Monoid import Data.Monoid
-- import Data.Maybe import Data.Maybe
-- import Data.Text (Text) -- import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
import Data.Time.Calendar (Day) import Data.Time.Calendar (Day)
@ -45,8 +45,8 @@ rsSetCurrentAccount a scr@RegisterScreen{rsState=(l,_)} = scr{rsState=(l,a)}
rsSetCurrentAccount _ scr = scr rsSetCurrentAccount _ scr = scr
initRegisterScreen :: Day -> AppState -> AppState initRegisterScreen :: Day -> AppState -> AppState
initRegisterScreen d st@AppState{aopts=opts, ajournal=j, aScreen=s@RegisterScreen{rsState=(_,acct)}} = initRegisterScreen d st@AppState{aopts=opts, ajournal=j, aScreen=s@RegisterScreen{rsState=(oldl,acct)}} =
st{aScreen=s{rsState=(l,acct)}} st{aScreen=s{rsState=(newl',acct)}}
where where
-- gather arguments and queries -- gather arguments and queries
ropts = (reportopts_ $ cliopts_ opts) ropts = (reportopts_ $ cliopts_ opts)
@ -59,7 +59,7 @@ initRegisterScreen d st@AppState{aopts=opts, ajournal=j, aScreen=s@RegisterScree
q = filterQuery (not . queryIsDepth) $ queryFromOpts d ropts q = filterQuery (not . queryIsDepth) $ queryFromOpts d ropts
(_label,items) = accountTransactionsReport ropts j q thisacctq (_label,items) = accountTransactionsReport ropts j q thisacctq
items' = (if empty_ ropts then id else filter ((/=0) . fifth6)) $ -- exclude zero-change txns unless --empty items' = (if empty_ ropts then id else filter (not . isZeroMixedAmount . fifth6)) $ -- without --empty, exclude no-change txns
reverse -- most recent last reverse -- most recent last
items items
@ -78,11 +78,18 @@ initRegisterScreen d st@AppState{aopts=opts, ajournal=j, aScreen=s@RegisterScree
,t ,t
) )
-- build the List, moving the selection to the end -- build the List
l = listMoveTo (length items) $ newl = list (Name "register") (V.fromList displayitems) 1
list (Name "register") (V.fromList displayitems) 1
-- (listName someList) -- keep the selection on the previously selected transaction if possible,
-- (eg after toggling nonzero mode), otherwise select the last element.
-- XXX the scroll position should be disrupted less
newl' = listMoveTo newselidx newl
where
newselidx = case listSelectedElement oldl of
Nothing -> endidx
Just (_,(_,_,_,_,_,Transaction{tindex=ti})) -> fromMaybe endidx $ findIndex ((==ti) . tindex . sixth6) displayitems
endidx = length displayitems
initRegisterScreen _ _ = error "init function called with wrong screen type, should not happen" initRegisterScreen _ _ = error "init function called with wrong screen type, should not happen"