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

ui: restore the original accounts scope when backing up to top level

Browse Source
This commit is contained in:
Simon Michael 2010-04-15 21:41:18 +00:00
parent 6d18b8c0af
commit fc330b5c9f
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Hledger/Cli/Commands/Vty.hs
View File

@ -26,7 +26,7 @@ data AppState = AppState {
,ah :: Int -- ^ window height ,ah :: Int -- ^ window height
,amsg :: String -- ^ status message ,amsg :: String -- ^ status message
,aopts :: [Opt] -- ^ command-line opts ,aopts :: [Opt] -- ^ command-line opts
,aargs :: [String] -- ^ command-line args ,aargs :: [String] -- ^ command-line args at startup
,aledger :: Ledger -- ^ parsed ledger ,aledger :: Ledger -- ^ parsed ledger
,abuf :: [String] -- ^ lines of the current buffered view ,abuf :: [String] -- ^ lines of the current buffered view
,alocs :: [Loc] -- ^ user's navigation trail within the UI ,alocs :: [Loc] -- ^ user's navigation trail within the UI
@ -38,6 +38,7 @@ data Loc = Loc {
scr :: Screen -- ^ one of the available screens scr :: Screen -- ^ one of the available screens
,sy :: Int -- ^ viewport y scroll position ,sy :: Int -- ^ viewport y scroll position
,cy :: Int -- ^ cursor y position ,cy :: Int -- ^ cursor y position
,largs :: [String] -- ^ command-line args, possibly narrowed for this location
} deriving (Show) } deriving (Show)
-- | The screens available within the user interface. -- | The screens available within the user interface.
@ -54,7 +55,7 @@ vty opts args l = do
DisplayRegion w h <- display_bounds $ terminal v DisplayRegion w h <- display_bounds $ terminal v
let opts' = SubTotal:opts let opts' = SubTotal:opts
t <- getCurrentLocalTime t <- getCurrentLocalTime
let a = enter t BalanceScreen let a = enter t BalanceScreen args
AppState { AppState {
av=v av=v
,aw=fromIntegral w ,aw=fromIntegral w
@ -207,24 +208,31 @@ exit = popLoc
loc :: AppState -> Loc loc :: AppState -> Loc
loc = head . alocs loc = head . alocs
-- | Get the filter pattern args in effect for the current ui location.
currentArgs :: AppState -> [String]
currentArgs (AppState {alocs=Loc{largs=as}:_}) = as
currentArgs (AppState {aargs=as}) = as
screen :: AppState -> Screen screen :: AppState -> Screen
screen a = scr where (Loc scr _ _) = loc a screen a = scr where (Loc scr _ _ _) = loc a
-- | Enter a new screen, saving the old ui location on the stack. -- | Enter a new screen, with possibly new args, saving the old ui location on the stack.
enter :: LocalTime -> Screen -> AppState -> AppState enter :: LocalTime -> Screen -> [String] -> AppState -> AppState
enter t scr@BalanceScreen a = updateData t $ pushLoc Loc{scr=scr,sy=0,cy=0} a enter t scr@BalanceScreen args a = updateData t $ pushLoc Loc{scr=scr,sy=0,cy=0,largs=args} a
enter t scr@RegisterScreen a = updateData t $ pushLoc Loc{scr=scr,sy=0,cy=0} a enter t scr@RegisterScreen args a = updateData t $ pushLoc Loc{scr=scr,sy=0,cy=0,largs=args} a
enter t scr@PrintScreen a = updateData t $ pushLoc Loc{scr=scr,sy=0,cy=0} a enter t scr@PrintScreen args a = updateData t $ pushLoc Loc{scr=scr,sy=0,cy=0,largs=args} a
resetTrailAndEnter t scr = enter t scr . clearLocs resetTrailAndEnter :: LocalTime -> Screen -> AppState -> AppState
resetTrailAndEnter t scr a = enter t scr (aargs a) $ clearLocs a
-- | Regenerate the display data appropriate for the current screen. -- | Regenerate the display data appropriate for the current screen.
updateData :: LocalTime -> AppState -> AppState updateData :: LocalTime -> AppState -> AppState
updateData t a@AppState{aopts=opts,aargs=args,aledger=l} = updateData t a@AppState{aopts=opts,aledger=l} =
case screen a of case screen a of
BalanceScreen -> a{abuf=lines $ showBalanceReport opts (optsToFilterSpec opts args t) l, aargs=[]} BalanceScreen -> a{abuf=lines $ showBalanceReport opts fspec l}
RegisterScreen -> a{abuf=lines $ showRegisterReport opts (optsToFilterSpec opts args t) l} RegisterScreen -> a{abuf=lines $ showRegisterReport opts fspec l}
PrintScreen -> a{abuf=lines $ showTransactions (optsToFilterSpec opts args t) l} PrintScreen -> a{abuf=lines $ showTransactions fspec l}
where fspec = optsToFilterSpec opts (currentArgs a) t
backout :: LocalTime -> AppState -> AppState backout :: LocalTime -> AppState -> AppState
backout t a | screen a == BalanceScreen = a backout t a | screen a == BalanceScreen = a
@ -233,8 +241,8 @@ backout t a | screen a == BalanceScreen = a
drilldown :: LocalTime -> AppState -> AppState drilldown :: LocalTime -> AppState -> AppState
drilldown t a = drilldown t a =
case screen a of case screen a of
BalanceScreen -> enter t RegisterScreen a{aargs=[currentAccountName a]} BalanceScreen -> enter t RegisterScreen [currentAccountName a] a
RegisterScreen -> scrollToTransaction e $ enter t PrintScreen a RegisterScreen -> scrollToTransaction e $ enter t PrintScreen (currentArgs a) a
PrintScreen -> a PrintScreen -> a
where e = currentTransaction a where e = currentTransaction a