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

small cleanups

Browse Source
This commit is contained in:
Simon Michael 2008-11-22 05:51:57 +00:00
parent 71667f654a
commit 825d2ac2d4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BalanceCommand.hs
View File

@ -117,7 +117,7 @@ import Utils
balance :: [Opt] -> [String] -> Ledger -> IO () balance :: [Opt] -> [String] -> Ledger -> IO ()
balance opts args l = putStr $ showBalanceReport opts args l balance opts args l = putStr $ showBalanceReport opts args l
-- | Generate balance report output for a ledger, based on options. -- | Generate balance report output for a ledger.
showBalanceReport :: [Opt] -> [String] -> Ledger -> String showBalanceReport :: [Opt] -> [String] -> Ledger -> String
showBalanceReport opts args l = acctsstr ++ (if collapse then "" else totalstr) showBalanceReport opts args l = acctsstr ++ (if collapse then "" else totalstr)
where where
@ -138,7 +138,7 @@ showBalanceReport opts args l = acctsstr ++ (if collapse then "" else totalstr)
hasparentshowing aname = (parentAccountName $ aname) `elem` matchedacctnames hasparentshowing aname = (parentAccountName $ aname) `elem` matchedacctnames
-- | Identify the accounts we are interested in seeing balances for in the -- | Identify the accounts we are interested in seeing balances for in the
-- balance report, based on the -s flag and account patterns. -- balance report, based on the -s flag and account patterns. See Tests.hs.
balancereportacctnames :: Ledger -> Bool -> [String] -> Tree Account -> [AccountName] balancereportacctnames :: Ledger -> Bool -> [String] -> Tree Account -> [AccountName]
balancereportacctnames l False [] t = filter (/= "top") $ map aname $ flatten $ treeprune 1 t balancereportacctnames l False [] t = filter (/= "top") $ map aname $ flatten $ treeprune 1 t
balancereportacctnames l False pats t = filter (/= "top") $ ns balancereportacctnames l False pats t = filter (/= "top") $ ns
@ -158,9 +158,9 @@ balancereportacctnames l True pats t = nub $ map aname $ addsubaccts l $ as
pruneZeroBalanceLeaves :: Tree Account -> Tree Account pruneZeroBalanceLeaves :: Tree Account -> Tree Account
pruneZeroBalanceLeaves = treefilter (not . isZeroMixedAmount . abalance) pruneZeroBalanceLeaves = treefilter (not . isZeroMixedAmount . abalance)
-- | Show a tree of accounts with balances, eliding boring parent accounts -- | Show this tree of accounts with balances, eliding boring parent
-- and omitting uninteresting subaccounts, using the provided list of -- accounts and omitting uninteresting subaccounts based on the provided
-- account names we want to see balances for. -- list of account names we want to see balances for.
showAccountTreeWithBalances :: [AccountName] -> Tree Account -> String showAccountTreeWithBalances :: [AccountName] -> Tree Account -> String
showAccountTreeWithBalances matchednames t = showAccountTreeWithBalances' matchednames 0 "" t showAccountTreeWithBalances matchednames t = showAccountTreeWithBalances' matchednames 0 "" t
where where
@ -174,7 +174,7 @@ showAccountTreeWithBalances matchednames t = showAccountTreeWithBalances' matche
subsnoindent = showsubs indent "" subsnoindent = showsubs indent ""
subsindented = showsubs (indent+1) "" subsindented = showsubs (indent+1) ""
showsubs i p = concatMap (showAccountTreeWithBalances' matchednames i p) subs showsubs i p = concatMap (showAccountTreeWithBalances' matchednames i p) subs
hasmatchedsubs = not $ null $ filter ((`elem` matchednames) . aname) $ concatMap flatten subs hasmatchedsubs = any ((`elem` matchednames) . aname) $ concatMap flatten subs
amt = padleft 20 $ showMixedAmount bal amt = padleft 20 $ showMixedAmount bal
this = concatTopPadded [amt, spaces ++ prefix ++ leafname] ++ "\n" this = concatTopPadded [amt, spaces ++ prefix ++ leafname] ++ "\n"
spaces = " " ++ replicate (indent * 2) ' ' spaces = " " ++ replicate (indent * 2) ' '