Adds support for transaction rules case insensitive search
This commit is contained in:
2134
package-lock.json
generated
2134
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -3,7 +3,8 @@
|
|||||||
[auto-ap.datomic :refer [uri merge-query apply-sort-3 apply-pagination add-sorter-fields]]
|
[auto-ap.datomic :refer [uri merge-query apply-sort-3 apply-pagination add-sorter-fields]]
|
||||||
[auto-ap.graphql.utils :refer [limited-clients]]
|
[auto-ap.graphql.utils :refer [limited-clients]]
|
||||||
[clojure.set :refer [rename-keys]]
|
[clojure.set :refer [rename-keys]]
|
||||||
[clj-time.coerce :as c]))
|
[clj-time.coerce :as c]
|
||||||
|
[clojure.string :as str]))
|
||||||
|
|
||||||
(defn <-datomic [result]
|
(defn <-datomic [result]
|
||||||
result)
|
result)
|
||||||
@@ -52,6 +53,12 @@
|
|||||||
:where ['[?e :transaction-rule/vendor ?vendor-id]]}
|
:where ['[?e :transaction-rule/vendor ?vendor-id]]}
|
||||||
:args [(:vendor-id args)]})
|
:args [(:vendor-id args)]})
|
||||||
|
|
||||||
|
(not (str/blank? (:note args)))
|
||||||
|
(merge-query {:query {:in ['?note-pattern]
|
||||||
|
:where ['[?e :transaction-rule/note ?n]
|
||||||
|
'[(re-find ?note-pattern ?n)]]}
|
||||||
|
:args [(re-pattern (str "(?i)" (:note 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]]}}))]
|
||||||
|
|||||||
@@ -626,7 +626,8 @@
|
|||||||
:start {:type 'Int}
|
:start {:type 'Int}
|
||||||
: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}}
|
||||||
:resolve :get-transaction-rule-page}
|
:resolve :get-transaction-rule-page}
|
||||||
|
|
||||||
:ledger_page {:type :ledger_page
|
:ledger_page {:type :ledger_page
|
||||||
|
|||||||
@@ -6,7 +6,8 @@
|
|||||||
[minisearch :as ms]))
|
[minisearch :as ms]))
|
||||||
(set! *warn-on-infer* true)
|
(set! *warn-on-infer* true)
|
||||||
|
|
||||||
(def MiniSearch (aget ms "default"))
|
(def MiniSearch (if ms (aget ms "default")
|
||||||
|
nil))
|
||||||
|
|
||||||
(re-frame/reg-sub
|
(re-frame/reg-sub
|
||||||
::client
|
::client
|
||||||
|
|||||||
@@ -37,7 +37,8 @@
|
|||||||
:start (:start params 0)
|
:start (:start params 0)
|
||||||
: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)}
|
||||||
[[:transaction-rules default-read]
|
[[:transaction-rules default-read]
|
||||||
:total
|
:total
|
||||||
:start
|
:start
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
(:require
|
(:require
|
||||||
[re-frame.core :as re-frame]
|
[re-frame.core :as re-frame]
|
||||||
[auto-ap.subs :as subs]
|
[auto-ap.subs :as subs]
|
||||||
|
[auto-ap.views.utils :refer [dispatch-value-change]]
|
||||||
[auto-ap.views.components.typeahead :refer [typeahead-v3]]
|
[auto-ap.views.components.typeahead :refer [typeahead-v3]]
|
||||||
[auto-ap.views.pages.data-page :as data-page]))
|
[auto-ap.views.pages.data-page :as data-page]))
|
||||||
|
|
||||||
@@ -15,5 +16,12 @@
|
|||||||
:on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor (some-> % (select-keys [:name :id]))])
|
:on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor (some-> % (select-keys [:name :id]))])
|
||||||
:entity->text :name
|
:entity->text :name
|
||||||
:type "typeahead-v3"
|
:type "typeahead-v3"
|
||||||
:value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]]])
|
:value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]]
|
||||||
|
|
||||||
|
[:p.menu-label "Note"]
|
||||||
|
[:div
|
||||||
|
[: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])} ]]]]])
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user