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

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

Browse Source 
Bug was introduced in commit 2a99b3d456
in an effort to get rid of partial List.tail,
because GHC-9.8 started to warn about it.

Problem is that the rewritten code with tailDef always removes the last account,
whereas the original intention was to replace all accounts by a comma except the last one.
addCommas should prepare a comma separated list like List.intercalate.
This commit is contained in:
Henning Thielemann 2024-09-13 14:01:20 +02:00 committed by Simon Michael
parent 07b3cc495b
commit b74815287d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,9 +9,9 @@
module Hledger.Web.Handler.RegisterR where module Hledger.Web.Handler.RegisterR where
import qualified Data.List.NonEmpty as NonEmpty
import Data.List (intersperse, nub, partition) import Data.List (intersperse, nub, partition)
import qualified Data.Text as T import qualified Data.Text as T
import Safe (tailDef)
import Text.Hamlet (hamletFile) import Text.Hamlet (hamletFile)
import Hledger import Hledger
@ -42,10 +42,11 @@ getRegisterR = do
map (\(acct,(name,comma)) -> (acct, (T.pack name, T.pack comma))) . map (\(acct,(name,comma)) -> (acct, (T.pack name, T.pack comma))) .
undecorateLinks . elideRightDecorated 40 . decorateLinks . undecorateLinks . elideRightDecorated 40 . decorateLinks .
addCommas . preferReal . otherTransactionAccounts q acctQuery addCommas . preferReal . otherTransactionAccounts q acctQuery
snoc xs x = NonEmpty.prependList xs $ NonEmpty.singleton x
addCommas xs = addCommas xs =
zip xs $ zip xs $
zip (map (T.unpack . accountSummarisedName . paccount) xs) $ zip (map (T.unpack . accountSummarisedName . paccount) xs) $
tailDef [""] $ (", "<$xs) NonEmpty.tail $ snoc (", "<$xs) ""
items = items =
styleAmounts (journalCommodityStylesWith HardRounding j) $ styleAmounts (journalCommodityStylesWith HardRounding j) $
accountTransactionsReport rspec{_rsQuery=q} j acctQuery accountTransactionsReport rspec{_rsQuery=q} j acctQuery