Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

web: RegisterR.getRegisterR.addCommas: do not drop last account #2230

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions hledger-web/Hledger/Web/Handler/RegisterR.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

module Hledger.Web.Handler.RegisterR where

import qualified Data.List.NonEmpty as NonEmpty
import Data.List (intersperse, nub, partition)
import qualified Data.Text as T
import Safe (tailDef)
import Text.Hamlet (hamletFile)

import Hledger
Expand Down Expand Up @@ -42,10 +42,11 @@ getRegisterR = do
map (\(acct,(name,comma)) -> (acct, (T.pack name, T.pack comma))) .
undecorateLinks . elideRightDecorated 40 . decorateLinks .
addCommas . preferReal . otherTransactionAccounts q acctQuery
snoc xs x = NonEmpty.prependList xs $ NonEmpty.singleton x
addCommas xs =
zip xs $
zip (map (T.unpack . accountSummarisedName . paccount) xs) $
tailDef [""] $ (", "<$xs)
NonEmpty.tail $ snoc (", "<$xs) ""
items =
styleAmounts (journalCommodityStylesWith HardRounding j) $
accountTransactionsReport rspec{_rsQuery=q} j acctQuery
Expand Down
Loading