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

add: clarify "accept"

Browse Source
This commit is contained in:
Simon Michael 2014-02-21 07:23:10 -08:00
parent f34d3aa9d6
commit e35614c88d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hledger/Hledger/Cli/Add.hs
View File

@ -122,7 +122,7 @@ instance Exception RestartEntryException
-- | Information used as the basis for suggested account names, amounts etc. in add prompt. -- | Information used as the basis for suggested account names, amounts etc. in add prompt.
data PostingsState = PostingsState { data PostingsState = PostingsState {
psJournal :: Journal psJournal :: Journal
,psAccept :: AccountName -> Bool ,psValidateAccount :: AccountName -> Bool
,psSuggestHistoricalAmount :: Bool ,psSuggestHistoricalAmount :: Bool
,psHistory :: Maybe [Posting] ,psHistory :: Maybe [Posting]
} }
@ -138,13 +138,13 @@ getPostingsForTransactionWithHistory j opts datestr code description comment def
| otherwise = Just $ snd $ head historymatches | otherwise = Just $ snd $ head historymatches
bestmatchpostings = maybe Nothing (Just . tpostings) bestmatch bestmatchpostings = maybe Nothing (Just . tpostings) bestmatch
date = fixSmartDate today $ fromparse $ (parse smartdate "" . lowercase) datestr date = fixSmartDate today $ fromparse $ (parse smartdate "" . lowercase) datestr
accept x = x == "." || (not . null) x && validateaccount x = x == "." || (not . null) x &&
if no_new_accounts_ opts if no_new_accounts_ opts
then x `elem` existingaccts then x `elem` existingaccts
else True else True
existingaccts = journalAccountNames j existingaccts = journalAccountNames j
getvalidpostings = do getvalidpostings = do
ps <- getPostingsLoop (PostingsState j accept True bestmatchpostings) [] defargs ps <- getPostingsLoop (PostingsState j validateaccount True bestmatchpostings) [] defargs
let t = nulltransaction{tdate=date let t = nulltransaction{tdate=date
,tstatus=False ,tstatus=False
,tcode=code ,tcode=code
@ -172,7 +172,7 @@ getPostingsLoop st enteredps defargs = do
defargs' = tailDef [] defargs defargs' = tailDef [] defargs
ordot | null enteredps || length enteredrealps == 1 = "" :: String ordot | null enteredps || length enteredrealps == 1 = "" :: String
| otherwise = " (or . to complete this transaction)" | otherwise = " (or . to complete this transaction)"
account <- runInteractionWithAccountCompletion j $ askFor (printf "account %d%s" n ordot) defacct (Just accept) account <- runInteractionWithAccountCompletion j $ askFor (printf "account %d%s" n ordot) defacct (Just validateaccount)
when (account=="<") $ throwIO RestartEntryException when (account=="<") $ throwIO RestartEntryException
if account=="." if account=="."
then then
@ -227,7 +227,7 @@ getPostingsLoop st enteredps defargs = do
j = psJournal st j = psJournal st
historicalps = psHistory st historicalps = psHistory st
ctx = jContext j ctx = jContext j
accept = psAccept st validateaccount = psValidateAccount st
suggesthistorical = psSuggestHistoricalAmount st suggesthistorical = psSuggestHistoricalAmount st
n = length enteredps + 1 n = length enteredps + 1
enteredrealps = filter isReal enteredps enteredrealps = filter isReal enteredps