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

web: refactor, fix a sign bug in register

Browse Source
This commit is contained in:
Simon Michael 2011-07-01 02:17:31 +00:00
parent 8424caddc6
commit 5ed70248d4
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hledger/Hledger/Cli/Register.hs
View File

@ -189,7 +189,7 @@ journalRegisterReport :: [Opt] -> Journal -> Matcher -> AccountRegisterReport
journalRegisterReport _ Journal{jtxns=ts} m = (totallabel, items) journalRegisterReport _ Journal{jtxns=ts} m = (totallabel, items)
where where
ts' = sortBy (comparing tdate) $ filter (not . null . tpostings) $ map (filterTransactionPostings m) ts ts' = sortBy (comparing tdate) $ filter (not . null . tpostings) $ map (filterTransactionPostings m) ts
items = reverse $ accountRegisterReportItems m Nothing nullmixedamt id (+) ts' items = reverse $ accountRegisterReportItems m Nothing nullmixedamt id ts'
-- | Get a conventional account register report, with the specified -- | Get a conventional account register report, with the specified
-- options, for the currently focussed account (or possibly the focussed -- options, for the currently focussed account (or possibly the focussed
@ -215,9 +215,9 @@ accountRegisterReport opts j m thisacctmatcher = (label, items)
ts = sortBy (comparing tdate) $ filter (matchesTransaction thisacctmatcher) $ jtxns j ts = sortBy (comparing tdate) $ filter (matchesTransaction thisacctmatcher) $ jtxns j
-- starting balance: if we are filtering by a start date and nothing else, -- starting balance: if we are filtering by a start date and nothing else,
-- the sum of postings to this account before that date; otherwise zero. -- the sum of postings to this account before that date; otherwise zero.
(startbal,label, sumfn) | matcherIsNull m = (nullmixedamt, balancelabel, (+)) (startbal,label) | matcherIsNull m = (nullmixedamt, balancelabel)
| matcherIsStartDateOnly effective m = (sumPostings priorps, balancelabel, (+)) | matcherIsStartDateOnly effective m = (sumPostings priorps, balancelabel)
| otherwise = (nullmixedamt, totallabel, (-)) | otherwise = (nullmixedamt, totallabel)
where where
priorps = -- ltrace "priorps" $ priorps = -- ltrace "priorps" $
filter (matchesPosting filter (matchesPosting
@ -227,7 +227,7 @@ accountRegisterReport opts j m thisacctmatcher = (label, items)
tostartdatematcher = MatchDate True (DateSpan Nothing startdate) tostartdatematcher = MatchDate True (DateSpan Nothing startdate)
startdate = matcherStartDate effective m startdate = matcherStartDate effective m
effective = Effective `elem` opts effective = Effective `elem` opts
items = reverse $ accountRegisterReportItems m (Just thisacctmatcher) startbal negate sumfn ts items = reverse $ accountRegisterReportItems m (Just thisacctmatcher) startbal negate ts
-- | Generate account register line items from a list of transactions, -- | Generate account register line items from a list of transactions,
-- using the provided query and "this account" matchers, starting balance, -- using the provided query and "this account" matchers, starting balance,
@ -235,9 +235,9 @@ accountRegisterReport opts j m thisacctmatcher = (label, items)
-- This is used for both accountRegisterReport and journalRegisterReport, -- This is used for both accountRegisterReport and journalRegisterReport,
-- which makes it a bit overcomplicated. -- which makes it a bit overcomplicated.
accountRegisterReportItems :: Matcher -> Maybe Matcher -> MixedAmount -> (MixedAmount -> MixedAmount) -> (MixedAmount -> MixedAmount -> MixedAmount) -> [Transaction] -> [AccountRegisterReportItem] accountRegisterReportItems :: Matcher -> Maybe Matcher -> MixedAmount -> (MixedAmount -> MixedAmount) -> [Transaction] -> [AccountRegisterReportItem]
accountRegisterReportItems _ _ _ _ _ [] = [] accountRegisterReportItems _ _ _ _ [] = []
accountRegisterReportItems matcher thisacctmatcher bal signfn sumfn (t:ts) = accountRegisterReportItems matcher thisacctmatcher bal signfn (t:ts) =
case i of Just i' -> i':is case i of Just i' -> i':is
Nothing -> is Nothing -> is
where where
@ -248,28 +248,31 @@ accountRegisterReportItems matcher thisacctmatcher bal signfn sumfn (t:ts) =
numotheraccts = length $ nub $ map paccount psotheracct numotheraccts = length $ nub $ map paccount psotheracct
amt = sum $ map pamount psotheracct amt = sum $ map pamount psotheracct
acct | isNothing thisacctmatcher = summarisePostings psmatched -- journal register acct | isNothing thisacctmatcher = summarisePostings psmatched -- journal register
| numotheraccts > 0 = prefix ++ commafy (simplifyPostingAccounts psotheracct) | numotheraccts == 0 = "transfer between " ++ summarisePostingAccounts psthisacct
| otherwise = "transfer between " ++ commafy (simplifyPostingAccounts psthisacct) | otherwise = prefix ++ summarisePostingAccounts psotheracct
where prefix = maybe "" (\b -> if b then "from " else "to ") $ isNegativeMixedAmount amt where prefix = maybe "" (\b -> if b then "from " else "to ") $ isNegativeMixedAmount amt
(i,bal') = case psmatched of (i,bal') = case psmatched of
[] -> (Nothing,bal) [] -> (Nothing,bal)
_ -> (Just (t, tmatched, numotheraccts > 1, acct, a, b), b) _ -> (Just (t, tmatched, numotheraccts > 1, acct, a, b), b)
where where
a = signfn amt a = signfn amt
b = bal `sumfn` a b = bal + a
is = accountRegisterReportItems matcher thisacctmatcher bal' signfn sumfn ts is = accountRegisterReportItems matcher thisacctmatcher bal' signfn ts
-- | Generate a short readable summary of some postings. -- | Generate a short readable summary of some postings, like
-- "from (negatives) to (positives)".
summarisePostings :: [Posting] -> String
summarisePostings ps = summarisePostings ps =
case (simplifyPostingAccounts tos, simplifyPostingAccounts froms) of case (summarisePostingAccounts froms, summarisePostingAccounts tos) of
([],ts) -> "to "++commafy ts ("",t) -> "to "++t
(fs,[]) -> "from "++commafy fs (f,"") -> "from "++f
(fs,ts) -> "from "++commafy fs++" to "++commafy ts (f,t) -> "from "++f++" to "++t
where where
(tos,froms) = partition (fromMaybe False . isNegativeMixedAmount . pamount) ps (froms,tos) = partition (fromMaybe False . isNegativeMixedAmount . pamount) ps
simplifyPostingAccounts = map accountLeafName . nub . map paccount -- | Generate a simplified summary of some postings' accounts.
commafy = intercalate ", " summarisePostingAccounts :: [Posting] -> String
summarisePostingAccounts = intercalate ", " . map accountLeafName . nub . map paccount
filterTransactionPostings :: Matcher -> Transaction -> Transaction filterTransactionPostings :: Matcher -> Transaction -> Transaction
filterTransactionPostings m t@Transaction{tpostings=ps} = t{tpostings=filter (m `matchesPosting`) ps} filterTransactionPostings m t@Transaction{tpostings=ps} = t{tpostings=filter (m `matchesPosting`) ps}