notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

added description

Browse Source
This commit is contained in:
Bryce Covert
2021-10-11 18:36:58 -07:00
parent d20ae49e39
commit 20c2181770
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/clj/auto_ap/datomic/transaction_rules.clj
View File

@@ -59,6 +59,13 @@
'[(re-find ?note-pattern ?n)]]} '[(re-find ?note-pattern ?n)]]}
:args [(re-pattern (str "(?i)" (:note args)))]}) :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 true
(merge-query {:query {:find ['?e] (merge-query {:query {:find ['?e]
:where ['[?e :transaction-rule/transaction-approval-status]]}}))] :where ['[?e :transaction-rule/transaction-approval-status]]}}))]

3
src/clj/auto_ap/graphql.clj
View File

@@ -627,7 +627,8 @@
:per_page {:type 'Int} :per_page {:type 'Int}
:sort {:type '(list :sort_item)} :sort {:type '(list :sort_item)}
:asc {:type 'Boolean} :asc {:type 'Boolean}
:note {:type 'String}} :note {:type 'String}
:description {:type 'String}}
:resolve :get-transaction-rule-page} :resolve :get-transaction-rule-page}
:ledger_page {:type :ledger_page :ledger_page {:type :ledger_page

3
src/cljs/auto_ap/views/pages/admin/rules.cljs
View File

@@ -38,7 +38,8 @@
:per-page (:per-page params) :per-page (:per-page params)
:vendor-id (:id (:vendor params)) :vendor-id (:id (:vendor params))
:client-id (:id @(re-frame/subscribe [::subs/client])) :client-id (:id @(re-frame/subscribe [::subs/client]))
:note (:note params)} :note (:note params)
:description (:description params)}
[[:transaction-rules default-read] [[:transaction-rules default-read]
:total :total
:start :start

8
src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs
View File

@@ -23,5 +23,11 @@
[:div.field [:div.field
[:div.control [:input.input {:placeholder "HOME DEPOT" [:div.control [:input.input {:placeholder "HOME DEPOT"
:value @(re-frame/subscribe [::data-page/filter data-page :note]) :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])} ]]]]])