added description
This commit is contained in:
@@ -59,6 +59,13 @@
|
||||
'[(re-find ?note-pattern ?n)]]}
|
||||
:args [(re-pattern (str "(?i)" (:note args)))]})
|
||||
|
||||
(not (str/blank? (:description args)))
|
||||
(merge-query {:query {:in ['?description]
|
||||
:where ['[?e :transaction-rule/description ?d]
|
||||
'[(clojure.string/lower-case ?d) ?d2]
|
||||
'[(clojure.string/includes? ?d2 ?description)]]}
|
||||
:args [(clojure.string/lower-case (:description args))]})
|
||||
|
||||
true
|
||||
(merge-query {:query {:find ['?e]
|
||||
:where ['[?e :transaction-rule/transaction-approval-status]]}}))]
|
||||
|
||||
@@ -627,7 +627,8 @@
|
||||
:per_page {:type 'Int}
|
||||
:sort {:type '(list :sort_item)}
|
||||
:asc {:type 'Boolean}
|
||||
:note {:type 'String}}
|
||||
:note {:type 'String}
|
||||
:description {:type 'String}}
|
||||
:resolve :get-transaction-rule-page}
|
||||
|
||||
:ledger_page {:type :ledger_page
|
||||
|
||||
@@ -38,7 +38,8 @@
|
||||
:per-page (:per-page params)
|
||||
:vendor-id (:id (:vendor params))
|
||||
:client-id (:id @(re-frame/subscribe [::subs/client]))
|
||||
:note (:note params)}
|
||||
:note (:note params)
|
||||
:description (:description params)}
|
||||
[[:transaction-rules default-read]
|
||||
:total
|
||||
:start
|
||||
|
||||
@@ -23,5 +23,11 @@
|
||||
[:div.field
|
||||
[:div.control [:input.input {:placeholder "HOME DEPOT"
|
||||
:value @(re-frame/subscribe [::data-page/filter data-page :note])
|
||||
:on-change (dispatch-value-change [::data-page/filter-changed data-page :note])} ]]]]])
|
||||
:on-change (dispatch-value-change [::data-page/filter-changed data-page :note])} ]]]]
|
||||
[:p.menu-label "Description"]
|
||||
[:div
|
||||
[:div.field
|
||||
[:div.control [:input.input {:placeholder "HOME DEPOT"
|
||||
:value @(re-frame/subscribe [::data-page/filter data-page :description])
|
||||
:on-change (dispatch-value-change [::data-page/filter-changed data-page :description])} ]]]]])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user