simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-11-12 19:08:34 +03:00
Code Issues Projects Releases Wiki Activity

ui: transaction: show when empty/cleared/real are affecting the txn list

Browse Source
This commit is contained in:
Simon Michael 2016-06-03 18:00:38 -07:00
parent 9e42e231c7
commit 3b24c15813
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hledger-ui/Hledger/UI/TransactionScreen.hs
View File

@ -9,7 +9,7 @@ where
-- import Lens.Micro ((^.)) -- import Lens.Micro ((^.))
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
-- import Data.List import Data.List
-- import Data.List.Split (splitOn) -- import Data.List.Split (splitOn)
-- import Data.Ord -- import Data.Ord
import Data.Monoid import Data.Monoid
@ -22,7 +22,7 @@ import Graphics.Vty as Vty
-- import Safe (headDef, lastDef) -- import Safe (headDef, lastDef)
import Brick import Brick
import Brick.Widgets.List (listMoveTo) import Brick.Widgets.List (listMoveTo)
-- import Brick.Widgets.Border (borderAttr) import Brick.Widgets.Border (borderAttr)
-- import Brick.Widgets.Border.Style -- import Brick.Widgets.Border.Style
-- import Brick.Widgets.Center -- import Brick.Widgets.Center
-- import Text.Printf -- import Text.Printf
@ -51,7 +51,7 @@ initTransactionScreen _d st@AppState{aopts=UIOpts{cliopts_=CliOpts{reportopts_=_
initTransactionScreen _ _ = error "init function called with wrong screen type, should not happen" initTransactionScreen _ _ = error "init function called with wrong screen type, should not happen"
drawTransactionScreen :: AppState -> [Widget] drawTransactionScreen :: AppState -> [Widget]
drawTransactionScreen AppState{aopts=UIOpts{cliopts_=CliOpts{reportopts_=_ropts}} drawTransactionScreen AppState{aopts=UIOpts{cliopts_=CliOpts{reportopts_=ropts}}
,aScreen=TransactionScreen{tsState=((i,t),nts,acct)}} = [ui] ,aScreen=TransactionScreen{tsState=((i,t),nts,acct)}} = [ui]
where where
-- datedesc = show (tdate t) ++ " " ++ tdescription t -- datedesc = show (tdate t) ++ " " ++ tdescription t
@ -62,16 +62,17 @@ drawTransactionScreen AppState{aopts=UIOpts{cliopts_=CliOpts{reportopts_=_ropts}
<+> (str $ "#" ++ show (tindex t)) <+> (str $ "#" ++ show (tindex t))
<+> str " (" <+> str " ("
<+> withAttr ("border" <> "bold") (str $ show i) <+> withAttr ("border" <> "bold") (str $ show i)
<+> str (" of "++show (length nts)++" in "++T.unpack acct++")") <+> str (" of "++show (length nts))
-- on this screen we will ignore real/cleared/empty and always show all postings <+> togglefilters
-- <+> togglefilters <+> str (" in "++T.unpack acct++")")
-- togglefilters = togglefilters =
-- case concat [ case concat [
-- if cleared_ ropts then ["cleared"] else [] if cleared_ ropts then ["cleared"] else []
-- ,if real_ ropts then ["real"] else [] ,if real_ ropts then ["real"] else []
-- ] of ,if empty_ ropts then [] else ["nonzero"]
-- [] -> str "" ] of
-- fs -> withAttr (borderAttr <> "query") (str $ " " ++ intercalate ", " fs) <+> str " postings" [] -> str ""
fs -> withAttr (borderAttr <> "query") (str $ " " ++ intercalate ", " fs)
bottomlabel = borderKeysStr [ bottomlabel = borderKeysStr [
("left", "back") ("left", "back")
,("up/down", "prev/next") ,("up/down", "prev/next")
@ -130,8 +131,10 @@ handleTransactionScreen st@AppState{
Left err -> continue $ screenEnter d ES.screen{esState=err} st Left err -> continue $ screenEnter d ES.screen{esState=err} st
-- Vty.EvKey (Vty.KChar 'C') [] -> continue $ reload j d $ stToggleCleared st -- if allowing toggling here, we should refresh the txn list from the parent register screen
-- Vty.EvKey (Vty.KChar 'R') [] -> continue $ reload j d $ stToggleReal st -- Vty.EvKey (Vty.KChar 'E') [] -> continue $ reload j d $ stToggleEmpty st
-- Vty.EvKey (Vty.KChar 'C') [] -> continue $ reload j d $ stToggleCleared st
-- Vty.EvKey (Vty.KChar 'R') [] -> continue $ reload j d $ stToggleReal st
Vty.EvKey (Vty.KUp) [] -> continue $ reload j d st{aScreen=s{tsState=((iprev,tprev),nts,acct)}} Vty.EvKey (Vty.KUp) [] -> continue $ reload j d st{aScreen=s{tsState=((iprev,tprev),nts,acct)}}
Vty.EvKey (Vty.KDown) [] -> continue $ reload j d st{aScreen=s{tsState=((inext,tnext),nts,acct)}} Vty.EvKey (Vty.KDown) [] -> continue $ reload j d st{aScreen=s{tsState=((inext,tnext),nts,acct)}}