2538d14ea7
The first of several conversions from String to (strict) Text, hopefully reducing space and time usage. This one shows a small improvement, with GHC 7.10.3 and text-1.2.2.1: hledger -f data/100x100x10.journal stats string: <<ghc: 39471064 bytes, 77 GCs, 198421/275048 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.001 elapsed), 0.015 MUT (0.020 elapsed), 0.010 GC (0.014 elapsed) :ghc>> text: <<ghc: 39268024 bytes, 77 GCs, 197018/270840 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.002 elapsed), 0.016 MUT (0.022 elapsed), 0.009 GC (0.011 elapsed) :ghc>> hledger -f data/1000x100x10.journal stats string: <<ghc: 318555920 bytes, 617 GCs, 2178997/7134472 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.001 elapsed), 0.129 MUT (0.136 elapsed), 0.067 GC (0.077 elapsed) :ghc>> text: <<ghc: 314248496 bytes, 612 GCs, 2074045/6617960 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.003 elapsed), 0.137 MUT (0.145 elapsed), 0.067 GC (0.079 elapsed) :ghc>> hledger -f data/10000x100x10.journal stats string: <<ghc: 3114763608 bytes, 6026 GCs, 18858950/75552024 avg/max bytes residency (11 samples), 201M in use, 0.000 INIT (0.000 elapsed), 1.331 MUT (1.372 elapsed), 0.699 GC (0.812 elapsed) :ghc>> text: <<ghc: 3071468920 bytes, 5968 GCs, 14120344/62951360 avg/max bytes residency (9 samples), 124M in use, 0.000 INIT (0.003 elapsed), 1.272 MUT (1.349 elapsed), 0.513 GC (0.578 elapsed) :ghc>> hledger -f data/100000x100x10.journal stats string: <<ghc: 31186579432 bytes, 60278 GCs, 135332581/740228992 avg/max bytes residency (13 samples), 1697M in use, 0.000 INIT (0.008 elapsed), 14.677 MUT (15.508 elapsed), 7.081 GC (8.074 elapsed) :ghc>> text: <<ghc: 30753427672 bytes, 59763 GCs, 117595958/666457240 avg/max bytes residency (14 samples), 1588M in use, 0.000 INIT (0.008 elapsed), 13.713 MUT (13.966 elapsed), 6.220 GC (7.108 elapsed) :ghc>>
95 lines
3.5 KiB
Haskell
95 lines
3.5 KiB
Haskell
{-# LANGUAGE OverloadedStrings, QuasiQuotes, RecordWildCards #-}
|
|
-- | /journal handlers.
|
|
|
|
module Handler.JournalR where
|
|
|
|
-- import Data.Text (Text)
|
|
import qualified Data.Text as T
|
|
import Import
|
|
|
|
import Handler.AddForm
|
|
import Handler.Common
|
|
|
|
import Hledger.Data
|
|
import Hledger.Query
|
|
import Hledger.Reports
|
|
import Hledger.Utils
|
|
import Hledger.Cli.CliOptions
|
|
import Hledger.Web.WebOptions
|
|
|
|
-- | The formatted journal view, with sidebar.
|
|
getJournalR :: Handler Html
|
|
getJournalR = do
|
|
vd@VD{..} <- getViewData
|
|
let -- XXX like registerReportAsHtml
|
|
inacct = inAccount qopts
|
|
-- injournal = isNothing inacct
|
|
filtering = m /= Any
|
|
-- showlastcolumn = if injournal && not filtering then False else True
|
|
title = case inacct of
|
|
Nothing -> "General Journal"++s2
|
|
Just (a,inclsubs) -> "Transactions in "++T.unpack a++s1++s2
|
|
where s1 = if inclsubs then "" else " (excluding subaccounts)"
|
|
where
|
|
s2 = if filtering then ", filtered" else ""
|
|
maincontent = journalTransactionsReportAsHtml opts vd $ journalTransactionsReport (reportopts_ $ cliopts_ opts) j m
|
|
hledgerLayout vd "journal" [hamlet|
|
|
<h2#contenttitle>#{title}
|
|
<!-- p>Journal entries record movements of commodities between accounts. -->
|
|
<a#addformlink role="button" style="cursor:pointer; margin-top:1em;" data-toggle="modal" data-target="#addmodal" title="Add a new transaction to the journal" >Add a transaction
|
|
^{maincontent}
|
|
|]
|
|
|
|
postJournalR :: Handler Html
|
|
postJournalR = postAddForm
|
|
|
|
-- | Render a "TransactionsReport" as html for the formatted journal view.
|
|
journalTransactionsReportAsHtml :: WebOpts -> ViewData -> TransactionsReport -> HtmlUrl AppRoute
|
|
journalTransactionsReportAsHtml _ vd (_,items) = [hamlet|
|
|
<table.transactionsreport>
|
|
<tr.headings>
|
|
<th.date style="text-align:left;">
|
|
Date
|
|
<span .glyphicon .glyphicon-chevron-up>
|
|
<th.description style="text-align:left;">Description
|
|
<th.account style="text-align:left;">Account
|
|
<th.amount style="text-align:right;">Amount
|
|
$forall i <- numberTransactionsReportItems items
|
|
^{itemAsHtml vd i}
|
|
|]
|
|
where
|
|
-- .#{datetransition}
|
|
itemAsHtml :: ViewData -> (Int, Bool, Bool, Bool, TransactionsReportItem) -> HtmlUrl AppRoute
|
|
itemAsHtml VD{..} (n, _, _, _, (torig, _, split, _, amt, _)) = [hamlet|
|
|
<tbody ##{tindex torig}>
|
|
<tr .item.#{evenodd}.#{firstposting} style="vertical-align:top;" title="#{show torig}">
|
|
<td.date>#{date}
|
|
<td.description colspan=2>#{elideRight 60 desc}
|
|
<td.amount style="text-align:right;">
|
|
$if showamt
|
|
\#{mixedAmountAsHtml amt}
|
|
$forall p' <- tpostings torig
|
|
<tr .item.#{evenodd}.posting title="#{show torig}">
|
|
<td.date>
|
|
<td.description>
|
|
<td.account>
|
|
|
|
<a href="@?{acctlink (paccount p')}##{tindex torig}" title="#{paccount p'}">#{elideAccountName 40 $ paccount p'}
|
|
<td.amount style="text-align:right;">#{mixedAmountAsHtml $ pamount p'}
|
|
<tr.#{evenodd}>
|
|
<td>
|
|
<td>
|
|
<td>
|
|
<td>
|
|
|]
|
|
where
|
|
acctlink a = (RegisterR, [("q", T.pack $ accountQuery a)])
|
|
evenodd = if even n then "even" else "odd" :: String
|
|
-- datetransition | newm = "newmonth"
|
|
-- | newd = "newday"
|
|
-- | otherwise = "" :: String
|
|
(firstposting, date, desc) = (False, show $ tdate torig, tdescription torig)
|
|
-- acctquery = (here, [("q", T.pack $ accountQuery acct)])
|
|
showamt = not split || not (isZeroMixedAmount amt)
|
|
|