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

web: show a proper error for a bad date in add form (#17)

Browse Source
This commit is contained in:
Simon Michael 2010-03-09 18:36:27 +00:00
parent d64d0b92d7
commit 400e5bf296
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Commands/Web.hs
View File

@ -327,8 +327,11 @@ handleAddform l = do
validateAmt2 _ = [] validateAmt2 _ = []
amt1' = either (const missingamt) id $ parse someamount "" amt1 amt1' = either (const missingamt) id $ parse someamount "" amt1
amt2' = either (const missingamt) id $ parse someamount "" amt2 amt2' = either (const missingamt) id $ parse someamount "" amt2
(date', dateparseerr) = case fixSmartDateStrEither today date of
Right d -> (d, [])
Left e -> ("1900/01/01", [showDateParseError e])
t = Transaction { t = Transaction {
tdate = parsedate $ fixSmartDateStr today date tdate = parsedate date' -- date' must be parseable
,teffectivedate=Nothing ,teffectivedate=Nothing
,tstatus=False ,tstatus=False
,tcode="" ,tcode=""
@ -340,17 +343,19 @@ handleAddform l = do
] ]
,tpreceding_comment_lines="" ,tpreceding_comment_lines=""
} }
(t', berr) = case balanceTransaction t of (t', balanceerr) = case balanceTransaction t of
Right t'' -> (t'', []) Right t'' -> (t'', [])
Left e -> (t, [e]) Left e -> (t, [head $ lines e]) -- show just the error not the transaction
errs = concat [ errs = concat [
validateDate date validateDate date
,dateparseerr
,validateDesc desc ,validateDesc desc
,validateAcct1 acct1 ,validateAcct1 acct1
,validateAmt1 amt1 ,validateAmt1 amt1
,validateAcct2 acct2 ,validateAcct2 acct2
,validateAmt2 amt2 ,validateAmt2 amt2
] ++ berr ,balanceerr
]
in in
case null errs of case null errs of
False -> Failure errs False -> Failure errs