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

support all five date comparisons in --display

Browse Source
This commit is contained in:
Simon Michael 2008-11-26 21:18:24 +00:00
parent 33b2deba75
commit dfe59676fb
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Ledger/Parse.hs
View File

@ -541,13 +541,24 @@ smartparsedate s = parsedate $ printf "%04s/%02s/%02s" y m d
type TransactionMatcher = Transaction -> Bool type TransactionMatcher = Transaction -> Bool
-- | Parse a --display expression of the form "d>[DATE]" -- | Parse a --display expression which is a simple date predicate,
-- like "d>[DATE]" or "d<=[DATE]".
datedisplayexpr :: Parser TransactionMatcher datedisplayexpr :: Parser TransactionMatcher
datedisplayexpr = do datedisplayexpr = do
char 'd' char 'd'
char '>' op <- compareop
char '[' char '['
(y,m,d) <- smartdate (y,m,d) <- smartdate
char ']' char ']'
let edate = parsedate $ printf "%04s/%02s/%02s" y m d let edate = parsedate $ printf "%04s/%02s/%02s" y m d
return $ \(Transaction{date=tdate}) -> tdate > edate let matcher = \(Transaction{date=tdate}) ->
case op of
"<" -> tdate < edate
"<=" -> tdate <= edate
"=" -> tdate == edate
"==" -> tdate == edate -- just in case
">=" -> tdate >= edate
">" -> tdate > edate
return matcher
compareop = choice $ map (try . string) ["<=",">=","==","<","=",">"]

3
Options.hs
View File

@ -37,7 +37,8 @@ options = [
Option ['C'] ["cleared"] (NoArg Cleared) "report only on cleared entries", Option ['C'] ["cleared"] (NoArg Cleared) "report only on cleared entries",
Option ['B'] ["cost","basis"] (NoArg CostBasis) "report cost basis of commodities", Option ['B'] ["cost","basis"] (NoArg CostBasis) "report cost basis of commodities",
Option [] ["depth"] (ReqArg Depth "N") "balance report: maximum account depth to show", Option [] ["depth"] (ReqArg Depth "N") "balance report: maximum account depth to show",
Option ['d'] ["display"] (ReqArg Display "EXPR") "display only transactions matching EXPR\n(where EXPR is 'd>[Y/M/D]')", Option ['d'] ["display"] (ReqArg Display "EXPR") ("display only transactions matching simple EXPR\n" ++
"(where EXPR is 'dOP[Y/M/D]', OP is <, <=, =, >=, >)"),
Option ['E'] ["empty"] (NoArg Empty) "balance report: show accounts with zero balance", Option ['E'] ["empty"] (NoArg Empty) "balance report: show accounts with zero balance",
Option ['R'] ["real"] (NoArg Real) "report only on real (non-virtual) transactions", Option ['R'] ["real"] (NoArg Real) "report only on real (non-virtual) transactions",
Option ['n'] ["collapse"] (NoArg Collapse) "balance report: no grand total", Option ['n'] ["collapse"] (NoArg Collapse) "balance report: no grand total",

20
Tests.hs
View File

@ -318,13 +318,21 @@ registercommand_tests = TestList [
, ,
"register report with display expression" ~: "register report with display expression" ~:
do do
l <- ledgerfromfile [] "sample.ledger" "d<[2008/6/2]" `displayexprgivestxns` ["2008/01/01","2008/06/01"]
assertequal ( "d<=[2008/6/2]" `displayexprgivestxns` ["2008/01/01","2008/06/01","2008/06/02"]
"2008/01/01 pay off liabilities:debts $1 $1\n" ++ "d=[2008/6/2]" `displayexprgivestxns` ["2008/06/02"]
" assets:checking $-1 0\n" ++ "d>=[2008/6/2]" `displayexprgivestxns` ["2008/06/02","2008/06/03","2008/12/31"]
"") "d>[2008/6/2]" `displayexprgivestxns` ["2008/06/03","2008/12/31"]
$ showRegisterReport [Display "d>[2007/12]"] [] l
] ]
where
expr `displayexprgivestxns` dates =
assertequal dates (datesfromregister r)
where
r = showRegisterReport [Display expr] [] l
l = ledgerfromstring [] sample_ledger_str
datesfromregister = filter (not . null) . map (strip . take 10) . lines
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- test data -- test data