IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-trep-case-insensitive' PR #719

Browse Source
This commit is contained in:
Christopher Lam
2020-05-12 21:47:36 +08:00
parent ebd9db8921 b4d7386d44
commit 57fe051565
2 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gnucash/report/reports/standard/test/test-transaction.scm
View File

@@ -355,6 +355,22 @@
'("$24.00")
(get-row-col sxml -1 -1)))
(set-option! options "Filter" "Transaction Filter excludes matched strings" #f)
(set-option! options "Filter" "Use regular expressions for transaction filter" #f)
(set-option! options "Filter" "Transaction Filter is case insensitive" #t)
(set-option! options "Filter" "Transaction Filter" "dEsC-3")
(let ((sxml (options->sxml options "transaction filter insensitive")))
(test-equal "transaction filter case insensitive"
'("$29.00")
(get-row-col sxml -1 -1)))
(set-option! options "Filter" "Use regular expressions for transaction filter" #t)
(set-option! options "Filter" "Transaction Filter" "NoT.S?")
(let ((sxml (options->sxml options "transaction filter regex case insensitive")))
(test-equal "transaction filter regex case insensitive"
'("-$23.00")
(get-row-col sxml -1 -1)))
;; Test Reconcile Status Filters
(set! options (default-testing-options))
(set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969)))

29
gnucash/report/trep-engine.scm
View File

@@ -92,6 +92,8 @@
(N_ "Use regular expressions for transaction filter"))
(define optname-transaction-matcher-exclude
(N_ "Transaction Filter excludes matched strings"))
(define optname-transaction-matcher-caseinsensitive
(N_ "Transaction Filter is case insensitive"))
(define optname-reconcile-status (N_ "Reconcile Status"))
(define optname-void-transactions (N_ "Void Transactions"))
(define optname-closing-transactions (N_ "Closing transactions"))
@@ -614,6 +616,13 @@ tags within description, notes or memo. ")
(_ "If this option is selected, transactions matching filter are excluded.")
#f))
(gnc:register-trep-option
(gnc:make-simple-boolean-option
pagename-filter optname-transaction-matcher-caseinsensitive
"i4"
(_ "If this option is selected, transactions matching filter is not case sensitive.")
#f))
(gnc:register-trep-option
(gnc:make-multichoice-option
pagename-filter optname-reconcile-status
@@ -1985,11 +1994,16 @@ be excluded from periodic reporting.")
(gnc:date-option-absolute-time
(opt-val gnc:pagename-general optname-enddate))))
(transaction-matcher (opt-val pagename-filter optname-transaction-matcher))
(transaction-filter-case-insensitive?
(opt-val pagename-filter optname-transaction-matcher-caseinsensitive))
(transaction-matcher-regexp
(and (opt-val pagename-filter optname-transaction-matcher-regex)
(if (defined? 'make-regexp)
(catch 'regular-expression-syntax
(lambda () (make-regexp transaction-matcher))
(lambda ()
(if transaction-filter-case-insensitive?
(make-regexp transaction-matcher regexp/icase)
(make-regexp transaction-matcher)))
(const 'invalid-transaction-regex))
'no-guile-regex-support)))
(transaction-filter-exclude?
@@ -2025,12 +2039,17 @@ be excluded from periodic reporting.")
(eq? (opt-val gnc:pagename-display (N_ "Amount"))
'single)))
(infobox-display (opt-val gnc:pagename-general optname-infobox-display))
(match? (lambda (str)
(if transaction-matcher-regexp
(regexp-exec transaction-matcher-regexp str)
(string-contains str transaction-matcher))))
(query (qof-query-create-for-splits)))
(define (match? str)
(cond
(transaction-matcher-regexp
(regexp-exec transaction-matcher-regexp str))
(transaction-filter-case-insensitive?
(string-contains-ci str transaction-matcher))
(else
(string-contains str transaction-matcher))))
(define (generic-less? split-X split-Y sortkey date-subtotal-key ascend?)
;; compare splits X and Y, whereby
;; sortkey and date-subtotal-key specify the options used