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

clarify the two kinds of boring account

Browse Source
This commit is contained in:
Simon Michael 2008-10-03 07:36:45 +00:00
parent 49939fa3a6
commit 7acd389624
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Ledger/Ledger.hs
View File

@ -225,7 +225,7 @@ showAccountTree l = showAccountTree' l 0 . pruneBoringBranches
showAccountTree' :: Ledger -> Int -> Tree Account -> String showAccountTree' :: Ledger -> Int -> Tree Account -> String
showAccountTree' l indentlevel t showAccountTree' l indentlevel t
-- skip a boring inner account -- skip a boring inner account
| length subs > 0 && isBoringAccount l acct = subsindented 0 | length subs > 0 && isBoringInnerAccount l acct = subsindented 0
-- otherwise show normal indented account name with balance, -- otherwise show normal indented account name with balance,
-- prefixing the names of any boring parents -- prefixing the names of any boring parents
| otherwise = | otherwise =
@ -237,11 +237,13 @@ showAccountTree' l indentlevel t
bal = printf "%20s" $ show $ abalance $ acct bal = printf "%20s" $ show $ abalance $ acct
indent = replicate (indentlevel * 2) ' ' indent = replicate (indentlevel * 2) ' '
prefix = concatMap (++ ":") $ map accountLeafName $ reverse boringparents prefix = concatMap (++ ":") $ map accountLeafName $ reverse boringparents
boringparents = takeWhile (isBoringAccountName l) $ parentAccountNames $ aname acct boringparents = takeWhile (isBoringInnerAccountName l) $ parentAccountNames $ aname acct
leafname = accountLeafName $ aname acct leafname = accountLeafName $ aname acct
isBoringAccount :: Ledger -> Account -> Bool -- | Is this account a boring inner account in this ledger ?
isBoringAccount l a -- Boring inner accounts have no transactions and one subaccount.
isBoringInnerAccount :: Ledger -> Account -> Bool
isBoringInnerAccount l a
| name == "top" = False | name == "top" = False
| (length txns == 0) && ((length subs) == 1) = True | (length txns == 0) && ((length subs) == 1) = True
| otherwise = False | otherwise = False
@ -250,9 +252,13 @@ isBoringAccount l a
txns = atransactions a txns = atransactions a
subs = subAccountNamesFrom (accountnames l) name subs = subAccountNamesFrom (accountnames l) name
isBoringAccountName :: Ledger -> AccountName -> Bool -- | Is the named account a boring inner account in this ledger ?
isBoringAccountName l = isBoringAccount l . ledgerAccount l isBoringInnerAccountName :: Ledger -> AccountName -> Bool
isBoringInnerAccountName l = isBoringInnerAccount l . ledgerAccount l
-- | Remove boring branches (and leaves) from a tree of accounts.
-- A boring branch contains only accounts which have a 0 balance or no
-- transactions.
pruneBoringBranches :: Tree Account -> Tree Account pruneBoringBranches :: Tree Account -> Tree Account
pruneBoringBranches = pruneBoringBranches =
treefilter hastxns . treefilter hasbalance treefilter hastxns . treefilter hasbalance