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

web: in account register, show multiple postings as a single "split"

Browse Source 
Clicking on one of these currently goes nowhere.
This commit is contained in:
Simon Michael 2011-06-14 19:10:57 +00:00
parent d35fbac422
commit 9fac61eb0d
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,13 +120,10 @@ accountRegisterReport opts j m thisacctmatcher = (label, postingsToRegisterRepor
-- | otherwise = summarisePostingsByInterval interval depth empty filterspan displayps -- | otherwise = summarisePostingsByInterval interval depth empty filterspan displayps
-- transactions affecting this account -- transactions affecting this account
ts = filter (matchesTransaction thisacctmatcher) $ jtxns j ts = sortBy (comparing tdate) $ filter (matchesTransaction thisacctmatcher) $ jtxns j
-- all postings in these transactions -- starting balance: if we are filtering by a start date and nothing else,
ps = transactionsPostings ts -- the sum of postings to this account before that date; otherwise zero.
-- starting balance: if we are filtering by a start date and nothing else
-- else, the sum of postings to this account before it; otherwise zero.
(startbal,label, sumfn) | matcherIsNull m = (nullmixedamt,balancelabel,(-)) (startbal,label, sumfn) | matcherIsNull m = (nullmixedamt,balancelabel,(-))
| matcherIsStartDateOnly effective m = (sumPostings priorps,balancelabel,(-)) | matcherIsStartDateOnly effective m = (sumPostings priorps,balancelabel,(-))
| otherwise = (nullmixedamt,totallabel,(+)) | otherwise = (nullmixedamt,totallabel,(+))
@ -134,7 +131,8 @@ accountRegisterReport opts j m thisacctmatcher = (label, postingsToRegisterRepor
priorps = -- ltrace "priorps" $ priorps = -- ltrace "priorps" $
filter (matchesPosting filter (matchesPosting
(-- ltrace "priormatcher" $ (-- ltrace "priormatcher" $
MatchAnd [thisacctmatcher, tostartdatematcher])) ps MatchAnd [thisacctmatcher, tostartdatematcher]))
$ transactionsPostings ts
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
@ -142,9 +140,21 @@ accountRegisterReport opts j m thisacctmatcher = (label, postingsToRegisterRepor
-- postings to display: this account's transactions' "other" postings, with any additional filter applied -- postings to display: this account's transactions' "other" postings, with any additional filter applied
-- XXX would be better to collapse multiple postings from one txn into one (expandable) "split" item -- XXX would be better to collapse multiple postings from one txn into one (expandable) "split" item
displayps = -- ltrace "displayps" $ displayps = -- ltrace "displayps" $
filter (matchesPosting $ catMaybes $ map displayPostingFromTransaction ts
-- ltrace "displaymatcher" $
(MatchAnd [negateMatcher thisacctmatcher, m])) ps displaymatcher = -- ltrace "displaymatcher" $
MatchAnd [negateMatcher thisacctmatcher, m]
-- get the other account posting from this transaction, or if there
-- is more than one make a dummy posting indicating that
displayPostingFromTransaction :: Transaction -> Maybe Posting
displayPostingFromTransaction Transaction{tpostings=ps} =
case filter (displaymatcher `matchesPosting`) ps of
[] -> Nothing -- a virtual transaction, maybe
[p] -> Just p
ps'@(p':_) -> Just p'{paccount=splitdesc,pamount=splitamt}
where splitdesc = "SPLIT ("++intercalate ", " (map (accountLeafName . paccount) ps')++")"
splitamt = sum $ map pamount ps'
totallabel = "Total" totallabel = "Total"
balancelabel = "Balance" balancelabel = "Balance"