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

print: tag queries will match transactions whose postings contain the tag

Browse Source
This commit is contained in:
Simon Michael 2014-03-01 17:42:13 -08:00
parent d89367d75e
commit 6f49263c9b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-lib/Hledger/Data/Posting.hs
View File

@ -147,9 +147,9 @@ postingCleared p = if pstatus p
postingAllTags :: Posting -> [Tag] postingAllTags :: Posting -> [Tag]
postingAllTags p = ptags p ++ maybe [] transactionAllTags (ptransaction p) postingAllTags p = ptags p ++ maybe [] transactionAllTags (ptransaction p)
-- | Tags for this transaction including any inherited from above, when that is implemented. -- | Tags for this transaction including any from its postings.
transactionAllTags :: Transaction -> [Tag] transactionAllTags :: Transaction -> [Tag]
transactionAllTags t = ttags t transactionAllTags t = ttags t ++ concatMap ptags (tpostings t)
-- Get the other postings from this posting's transaction. -- Get the other postings from this posting's transaction.
relatedPostings :: Posting -> [Posting] relatedPostings :: Posting -> [Posting]

4
hledger-lib/Hledger/Query.hs
View File

@ -631,8 +631,8 @@ tests_matchesTransaction = [
assertBool "" $ (Desc "x x") `matchesTransaction` nulltransaction{tdescription="x x"} assertBool "" $ (Desc "x x") `matchesTransaction` nulltransaction{tdescription="x x"}
-- see posting for more tag tests -- see posting for more tag tests
assertBool "" $ (Tag "foo" (Just "a")) `matchesTransaction` nulltransaction{ttags=[("foo","bar")]} assertBool "" $ (Tag "foo" (Just "a")) `matchesTransaction` nulltransaction{ttags=[("foo","bar")]}
-- a tag match on a transaction usually ignores posting tags -- a tag match on a transaction also matches posting tags
assertBool "" $ not $ (Tag "postingtag" Nothing) `matchesTransaction` nulltransaction{tpostings=[nullposting{ptags=[("postingtag","")]}]} assertBool "" $ (Tag "postingtag" Nothing) `matchesTransaction` nulltransaction{tpostings=[nullposting{ptags=[("postingtag","")]}]}
] ]
lookupTagByName :: String -> [Tag] -> Maybe Tag lookupTagByName :: String -> [Tag] -> Maybe Tag