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

Make previous entered day a default one

Browse Source
This commit is contained in:
Roman Cheplyaka 2010-02-03 01:56:36 +00:00
parent b2e89a8c13
commit acecc28ce5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Commands/Add.hs
View File

@ -27,7 +27,8 @@ add opts args l
hPutStrLn stderr hPutStrLn stderr
"Enter one or more transactions, which will be added to your ledger file.\n\ "Enter one or more transactions, which will be added to your ledger file.\n\
\To complete a transaction, enter . as account name. To quit, enter control-d." \To complete a transaction, enter . as account name. To quit, enter control-d."
getAndAddTransactions l opts args `catch` (\e -> unless (isEOFError e) $ ioError e) today <- getCurrentDay
getAndAddTransactions l opts args today `catch` (\e -> unless (isEOFError e) $ ioError e)
-- | Read a number of ledger transactions from the command line, -- | Read a number of ledger transactions from the command line,
-- prompting, validating, displaying and appending them to the ledger -- prompting, validating, displaying and appending them to the ledger
@ -43,7 +44,7 @@ getTransaction :: Ledger -> [String] -> IO LedgerTransaction
getTransaction l args = do getTransaction l args = do
today <- getCurrentDay today <- getCurrentDay
datestr <- askFor "date" datestr <- askFor "date"
(Just $ showDate today) (Just $ showDate defaultDate)
(Just $ \s -> null s || (Just $ \s -> null s ||
isRight (parse (smartdate >> many spacenonewline >> eof) "" $ lowercase s)) isRight (parse (smartdate >> many spacenonewline >> eof) "" $ lowercase s))
description <- askFor "description" Nothing (Just $ not . null) description <- askFor "description" Nothing (Just $ not . null)
@ -67,7 +68,7 @@ getTransaction l args = do
retry = do retry = do
hPutStrLn stderr $ "\n" ++ nonzerobalanceerror ++ ". Re-enter:" hPutStrLn stderr $ "\n" ++ nonzerobalanceerror ++ ". Re-enter:"
getpostingsandvalidate getpostingsandvalidate
either (const retry) return $ balanceTransaction t either (const retry) return $ balanceLedgerTransaction t
unless (null historymatches) unless (null historymatches)
(do (do
hPutStrLn stderr "Similar transactions found, using the first for defaults:\n" hPutStrLn stderr "Similar transactions found, using the first for defaults:\n"