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

web: avoid spaces before commas in register account links

Browse Source
This commit is contained in:
Henning Thielemann 2019-06-08 10:22:51 +02:00 committed by Simon Michael
parent ac96bcfdf0
commit adbdbf002c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-web/Hledger/Web/Handler/RegisterR.hs
View File

@ -34,8 +34,8 @@ getRegisterR = do
acctQuery = fromMaybe Any (inAccountQuery qopts) acctQuery = fromMaybe Any (inAccountQuery qopts)
acctlink acc = (RegisterR, [("q", accountQuery acc)]) acctlink acc = (RegisterR, [("q", accountQuery acc)])
otherTransAccounts = otherTransAccounts =
zip ("" : repeat (","::T.Text)) . addCommas . preferReal . otherTransactionAccounts m acctQuery
preferReal . otherTransactionAccounts m acctQuery addCommas xs = zip xs $ tail $ (","<$xs) ++ [T.empty]
r@(balancelabel,items) = accountTransactionsReport ropts j m acctQuery r@(balancelabel,items) = accountTransactionsReport ropts j m acctQuery
balancelabel' = if isJust (inAccount qopts) then balancelabel else "Total" balancelabel' = if isJust (inAccount qopts) then balancelabel else "Total"
defaultLayout $ do defaultLayout $ do

5
hledger-web/templates/register.hamlet
View File

@ -26,10 +26,9 @@
<td> <td>
#{textElideRight 30 (tdescription tacct)} #{textElideRight 30 (tdescription tacct)}
<td .account> <td .account>
$forall (comma, Posting { paccount = acc }) <- otherTransAccounts torig $forall (Posting { paccount = acc }, comma) <- otherTransAccounts torig
#{comma}
<a href="@?{acctlink acc}##{tindex torig}" title="#{acc}"> <a href="@?{acctlink acc}##{tindex torig}" title="#{acc}">
#{accountSummarisedName acc} #{accountSummarisedName acc}</a>#{comma}
<td .amount style="text-align:right; white-space:nowrap;"> <td .amount style="text-align:right; white-space:nowrap;">
$if not split || not (isZeroMixedAmount amt) $if not split || not (isZeroMixedAmount amt)
^{mixedAmountAsHtml amt} ^{mixedAmountAsHtml amt}