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

web: add form fixes

Browse Source
This commit is contained in:
Simon Michael 2010-07-17 01:24:59 +00:00
parent 9acb57cfc5
commit 50aeb272b0
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Hledger/Cli/Commands/Web.hs
View File

@ -290,24 +290,25 @@ postJournalPage = do
today <- liftIO getCurrentDay today <- liftIO getCurrentDay
-- get form input values. M means a Maybe value. -- get form input values. M means a Maybe value.
(dateM, descM, acct1M, amt1M, acct2M, amt2M) <- runFormPost' (dateM, descM, acct1M, amt1M, acct2M, amt2M) <- runFormPost'
$ (,,,,,) $ (,,,,,)
<$> maybeStringInput "date" <$> maybeStringInput "date"
<*> maybeStringInput "descritpion" <*> maybeStringInput "description"
<*> maybeStringInput "accountname1" <*> maybeStringInput "accountname1"
<*> maybeStringInput "amount1" <*> maybeStringInput "amount1"
<*> maybeStringInput "accountname2" <*> maybeStringInput "accountname2"
<*> maybeStringInput "amount2" <*> maybeStringInput "amount2"
-- supply defaults and parse date and amounts, or get errors. -- supply defaults and parse date and amounts, or get errors.
let dateE' = maybe (Left "No date provided") (either (\e -> Left ("date: " ++ showDateParseError e)) Right . fixSmartDateStrEither today) dateM let dateE = maybe (Left "date required") (either (\e -> Left $ showDateParseError e) Right . fixSmartDateStrEither today) dateM
amt1E' = maybe (Left "No amount provided") (either (const (Right missingamt)) Right . parse someamount "") amt1M -- XXX missingamt only when missing/empty descE = Right $ fromMaybe "" descM
amt2E' = case amt2M of Nothing -> Right missingamt acct1E = maybe (Left "to account required") Right acct1M
Just amt -> (either (const (Right missingamt)) Right . parse someamount "") amt acct2E = maybe (Left "from account required") Right acct2M
toEither = maybe (Left "") Right amt1E = maybe (Left "amount required") (either (const $ Left "could not parse amount") Right . parse someamount "") amt1M
strEs = [dateE', Right $ fromMaybe "" descM, toEither acct1M, toEither acct2M] amt2E = maybe (Right missingamt) (either (const $ Left "could not parse amount") Right . parse someamount "") amt2M
amtEs = [amt1E', amt2E'] strEs = [dateE, descE, acct1E, acct2E]
errs = lefts strEs ++ lefts amtEs amtEs = [amt1E, amt2E]
[date,desc,acct1,acct2] = rights strEs [date,desc,acct1,acct2] = rights strEs
[amt1,amt2] = rights amtEs [amt1,amt2] = rights amtEs
errs = lefts strEs ++ lefts amtEs
-- 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.
tE | not $ null errs = Left errs tE | not $ null errs = Left errs
| otherwise = either (\e -> Left ["unbalanced postings: " ++ (head $ lines e)]) Right | otherwise = either (\e -> Left ["unbalanced postings: " ++ (head $ lines e)]) Right
@ -435,7 +436,7 @@ postEditPage = do
redirect RedirectTemporary EditPage) redirect RedirectTemporary EditPage)
(const $ do (const $ do
liftIO $ writeFileWithBackup f tnew liftIO $ writeFileWithBackup f tnew
setMessage $ string $ printf "Saved journal to %s\n" (show f) setMessage $ string $ printf "Saved journal %s\n" (show f)
redirect RedirectTemporary JournalPage) redirect RedirectTemporary JournalPage)
jE jE