From 9a5e5da3aaa7c13ec34a984725703d480ace16e7 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 11 Jun 2011 18:53:56 +0000 Subject: [PATCH] web: show a count of postings in each account --- hledger-web/.hledger/web/static/style.css | 1 + hledger-web/.hledger/web/templates/balancereportitem.hamlet | 1 + hledger-web/Handlers.hs | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hledger-web/.hledger/web/static/style.css b/hledger-web/.hledger/web/static/style.css index f6a51aa3f..97d552dd6 100644 --- a/hledger-web/.hledger/web/static/style.css +++ b/hledger-web/.hledger/web/static/style.css @@ -24,6 +24,7 @@ body { backgroun .balancereport .inacct { background-color:#eee; font-weight:bold; } .notinacct, .notinacct :link, .notinacct :visited, .notinacct .negative { /*color:#aaa;*/ } +.balancereport .numpostings { padding-left:1em; color:#aaa; } /*------------------------------------------------------------------------------------------*/ /* 2. font families & sizes */ diff --git a/hledger-web/.hledger/web/templates/balancereportitem.hamlet b/hledger-web/.hledger/web/templates/balancereportitem.hamlet index e707dfde9..968d22400 100644 --- a/hledger-web/.hledger/web/templates/balancereportitem.hamlet +++ b/hledger-web/.hledger/web/templates/balancereportitem.hamlet @@ -3,3 +3,4 @@ #{indent} #{adisplay} #{mixedAmountAsHtml abal} + (#{numpostingsinacct acct}) diff --git a/hledger-web/Handlers.hs b/hledger-web/Handlers.hs index b0cd4bab8..e07ec0c6e 100644 --- a/hledger-web/Handlers.hs +++ b/hledger-web/Handlers.hs @@ -62,7 +62,7 @@ postJournalR = handlePost getRegisterR :: Handler RepHtml getRegisterR = do vd@VD{opts=opts,qopts=qopts,m=m,j=j} <- getViewData - let sidecontent = balanceReportAsHtml opts vd{q=""} $ balanceReport opts nullfilterspec j + let sidecontent = balanceReportAsHtml opts vd{q=""} $ balanceReport opts nullfilterspec j maincontent = case inAccountMatcher qopts of Just m' -> accountRegisterReportAsHtml opts vd $ accountRegisterReport opts j m m' Nothing -> postingRegisterReportAsHtml opts vd $ postingRegisterReport opts nullfilterspec $ filterJournalPostings2 m j @@ -126,6 +126,8 @@ accountUrl a = "inacct:" ++ quoteIfSpaced a -- (accountNameToAccountRegex a) balanceReportAsHtml :: [Opt] -> ViewData -> BalanceReport -> Hamlet AppRoute balanceReportAsHtml _ vd@VD{here=here,q=q,m=m,qopts=qopts,j=j} (items,total) = $(Settings.hamletFile "balancereport") where + l = journalToLedger nullfilterspec j + numpostingsinacct = length . apostings . ledgerAccount l filtering = not $ null q inacctmatcher = inAccountMatcher qopts itemAsHtml :: ViewData -> BalanceReportItem -> Hamlet AppRoute