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

refactor(charts): unify on Chart.js, remove Chartist #10

Closed
notid wants to merge 139 commits from integreat-unify-charts into master
pull from: integreat-unify-charts
merge into: notid:master
Conversation 0 Commits 139 Files Changed 414 +49 -47
1 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5b2aba561c - Show all commits

12
src/clj/auto_ap/ssr/company_dropdown.clj
View File

@@ -61,15 +61,17 @@
:name (str "All clients matching " (subs query 2))}] :name (str "All clients matching " (subs query 2))}]
raw-query raw-query
(let [code-matches (for [n (pull-many (dc/db conn) [:client/name :db/id] (let [exact-code-matches (for [n (pull-many (dc/db conn) [:client/name :db/id]
(for [{:keys [id name]} (solr/query solr/impl "clients" {"query" (format "code:\"%s\"" raw-query) (for [client-id (map first (dc/q '[:find ?e
"fields" "id, name"}) :in $ ?code
:let [client-id (Long/parseLong id)] :where [?e :client/code ?code]]
(dc/db conn)
query))
:when (can-see-client? identity client-id)] :when (can-see-client? identity client-id)]
client-id))] client-id))]
{:id (:db/id n) {:id (:db/id n)
:name (:client/name n)})] :name (:client/name n)})]
(or (seq code-matches) (exec-search))) (or (seq exact-code-matches) (exec-search)))
cleansed-query cleansed-query
(exec-search)))) (exec-search))))