From 20c218177046eb019f938ab57f10349b1b64c448 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 11 Oct 2021 18:36:58 -0700 Subject: [PATCH] added description --- src/clj/auto_ap/datomic/transaction_rules.clj | 7 +++++++ src/clj/auto_ap/graphql.clj | 3 ++- src/cljs/auto_ap/views/pages/admin/rules.cljs | 3 ++- src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs | 8 +++++++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/clj/auto_ap/datomic/transaction_rules.clj b/src/clj/auto_ap/datomic/transaction_rules.clj index 133f8dca..56ceb8f8 100644 --- a/src/clj/auto_ap/datomic/transaction_rules.clj +++ b/src/clj/auto_ap/datomic/transaction_rules.clj @@ -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]]}}))] diff --git a/src/clj/auto_ap/graphql.clj b/src/clj/auto_ap/graphql.clj index 30efa191..0f52157a 100644 --- a/src/clj/auto_ap/graphql.clj +++ b/src/clj/auto_ap/graphql.clj @@ -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 diff --git a/src/cljs/auto_ap/views/pages/admin/rules.cljs b/src/cljs/auto_ap/views/pages/admin/rules.cljs index 5afba55b..e2081d54 100644 --- a/src/cljs/auto_ap/views/pages/admin/rules.cljs +++ b/src/cljs/auto_ap/views/pages/admin/rules.cljs @@ -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 diff --git a/src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs b/src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs index 63cea31a..c16556ac 100644 --- a/src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs +++ b/src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs @@ -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])} ]]]]])