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

web: fix warnings

Browse Source
This commit is contained in:
Simon Michael 2014-07-15 06:55:14 -07:00
parent b0d74b1466
commit b42298c1e2
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hledger-web/Handler/JournalEditR.hs
View File

@ -6,7 +6,6 @@ import Import
import Handler.Common import Handler.Common
import Handler.Post import Handler.Post
import Handler.Utils
-- | The journal editform, no sidebar. -- | The journal editform, no sidebar.

10
hledger-web/Handler/Post.hs
View File

@ -65,17 +65,17 @@ handleAdd = do
, isRight en , isRight en
, let Right n = en , let Right n = en
] ]
num = length acctparams num' = length acctparams
paramErrs | not $ length amtparams `elem` [num, num-1] = ["different number of account and amount parameters"] paramErrs | not $ length amtparams `elem` [num', num'-1] = ["different number of account and amount parameters"]
| otherwise = catMaybes | otherwise = catMaybes
[if map fst acctparams == [1..num] then Nothing else Just "misnumbered account parameters" [if map fst acctparams == [1..num'] then Nothing else Just "misnumbered account parameters"
,if map fst amtparams == [1..num] || map fst amtparams == [1..(num-1)] then Nothing else Just "misnumbered amount parameters" ,if map fst amtparams == [1..num'] || map fst amtparams == [1..(num'-1)] then Nothing else Just "misnumbered amount parameters"
] ]
eaccts = map (parsewith (accountnamep <* eof) . strip . T.unpack . snd) acctparams eaccts = map (parsewith (accountnamep <* eof) . strip . T.unpack . snd) acctparams
eamts = map (parseWithCtx nullctx (amountp <* eof) . strip . T.unpack . snd) amtparams eamts = map (parseWithCtx nullctx (amountp <* eof) . strip . T.unpack . snd) amtparams
(accts, acctErrs) = (rights eaccts, map show $ lefts eaccts) (accts, acctErrs) = (rights eaccts, map show $ lefts eaccts)
(amts', amtErrs) = (rights eamts, map show $ lefts eamts) (amts', amtErrs) = (rights eamts, map show $ lefts eamts)
amts | length amts' == num = amts' amts | length amts' == num' = amts'
| otherwise = amts' ++ [missingamt] | otherwise = amts' ++ [missingamt]
-- if no errors so far, generate a transaction and balance it or get the error. -- if no errors so far, generate a transaction and balance it or get the error.