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

Fixed multi commodities in sidebar

Browse Source
This commit is contained in:
Dominik Süß 2016-10-24 15:34:33 +02:00 committed by Simon Michael
parent 5d677fc174
commit 0567e00625
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hledger-web/Handler/Common.hs
View File

@ -178,7 +178,7 @@ balanceReportAsHtml _ vd@VD{..} (items',total) =
$forall i <- items $forall i <- items
^{itemAsHtml vd i} ^{itemAsHtml vd i}
<li .total> <li .total>
<span .balance>#{mixedAmountAsHtml total} #{mixedAmountAsHtml total}
|] |]
where where
l = ledgerFromJournal Any j l = ledgerFromJournal Any j
@ -191,7 +191,7 @@ balanceReportAsHtml _ vd@VD{..} (items',total) =
<a href="@?{acctquery}" .#{inacctclass} title="Show transactions affecting this account and subaccounts">#{adisplay} <a href="@?{acctquery}" .#{inacctclass} title="Show transactions affecting this account and subaccounts">#{adisplay}
$if hassubs $if hassubs
<a href="@?{acctonlyquery}" .only .hidden-sm .hidden-xs title="Show transactions affecting this account but not subaccounts">only <a href="@?{acctonlyquery}" .only .hidden-sm .hidden-xs title="Show transactions affecting this account but not subaccounts">only
<span .balance>#{mixedAmountAsHtml abal} #{mixedAmountAsHtml abal}
|] |]
where where
hassubs = not $ maybe False (null.asubs) $ ledgerAccount l acct hassubs = not $ maybe False (null.asubs) $ ledgerAccount l acct
@ -229,8 +229,8 @@ numberTransactionsReportItems items = number 0 nulldate items
(prevdy,prevdm,_) = toGregorian prevd (prevdy,prevdm,_) = toGregorian prevd
mixedAmountAsHtml :: MixedAmount -> Html mixedAmountAsHtml :: MixedAmount -> Html
mixedAmountAsHtml b = preEscapedString $ addclass $ intercalate "<br>" $ lines $ showMixedAmountWithoutPrice b mixedAmountAsHtml b = preEscapedString $ unlines $ map addclass $ lines $ showMixedAmountWithoutPrice b
where addclass = printf "<span class=\"%s\">%s</span>" (c :: String) where addclass = printf "<span class=\"%s\">%s</span><br/>" (c :: String)
c = case isNegativeMixedAmount b of Just True -> "negative amount" c = case isNegativeMixedAmount b of Just True -> "negative amount"
_ -> "positive amount" _ -> "positive amount"

4
hledger-web/static/hledger.css
View File

@ -150,6 +150,10 @@ ul {
color: #11427D; color: #11427D;
} }
#sidebar-menu .main-menu .amount {
float: right;
}
.transactionsreport .nonhead { .transactionsreport .nonhead {
border: none !important; border: none !important;
} }