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

brutal process of getting sorting to not mess stuff up.

Browse Source
This commit is contained in:
Bryce Covert
2019-04-11 15:00:34 -07:00
parent 0eedc8908d
commit 5d93e3a5a3
3 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/clj/auto_ap/datomic/transactions.clj
View File

@@ -10,28 +10,11 @@
#(-> % :transaction/client :client/name) #(-> % :transaction/client :client/name)
(= "account" sort-by) (= "account" sort-by)
#(-> % :transaction/account :account/name) #(vector (-> % :transaction/account :account/name) (-> % :db/id))
:else :else
(keyword "transaction" sort-by))) (keyword "transaction" sort-by)))
;; TODO - unneeeded with merge-query
(defn add-where [query & wheres]
(reduce #(update-in %1 [:query :where] conj %2) query wheres))
;; TODO - unneeeded with merge-query
(defn add-wheres [query wheres]
(apply add-where query wheres))
;; TODO - unneeeded with merge-query
(defn add-arg [query name value where & rest]
(let [query (-> query
(update :args conj value)
(update-in [:query :in] conj name)
(update-in [:query :where] conj where))]
(reduce #(update-in %1 [:query :where] conj %2) query rest)))
(defn add-sorter-field [q sort-map args] (defn add-sorter-field [q sort-map args]
(merge-query q (merge-query q
{:query {:find ['?sorter] {:query {:find ['?sorter]
@@ -68,11 +51,12 @@
(:sort-by args) (add-sorter-field {"client" ['[?e :transaction/client ?c] (:sort-by args) (add-sorter-field {"client" ['[?e :transaction/client ?c]
'[?c :client/name ?sorter]] '[?c :client/name ?sorter]]
"account" #_['[(get-else $ ?e :transaction/account 0) ?sorter]] "account" #_['[(get-else $ ?e :transaction/account 0) ?sorter]]
['(or (and [?e :transaction/account ?c] ['[?e :transaction/date]
'(or-join [?e ?sorter]
(and [?e :transaction/account ?c]
[?c :account/name ?sorter]) [?c :account/name ?sorter])
(and (and
[?e :transaction/client] (not [?e :transaction/account])
[(ground 0) ?c]
[(ground "") ?sorter]))] [(ground "") ?sorter]))]
"description-original" ['[?e :transaction/description-original ?sorter]] "description-original" ['[?e :transaction/description-original ?sorter]]
"date" ['[?e :transaction/date ?sorter]] "date" ['[?e :transaction/date ?sorter]]

1
src/clj/auto_ap/graphql/transactions.clj
View File

@@ -26,6 +26,7 @@
(defn edit-transaction [context {{:keys [id account_id vendor_id] :as transaction} :transaction} value] (defn edit-transaction [context {{:keys [id account_id vendor_id] :as transaction} :transaction} value]
(assert-can-see-client (:id context) (:db/id (d-transactions/get-by-id id))) (assert-can-see-client (:id context) (:db/id (d-transactions/get-by-id id)))
(println transaction)
@(d/transact (d/connect uri) @(d/transact (d/connect uri)
[{:db/id id [{:db/id id
:transaction/vendor vendor_id :transaction/vendor vendor_id

9
src/cljs/auto_ap/views/pages/transactions/table.cljs
View File

@@ -39,12 +39,7 @@
:asc asc} :asc asc}
"Vendor"] "Vendor"]
[sorted-column {:on-sort opc
:style {:width percentage-size :cursor "pointer"}
:sort-key "description-original"
:sort-by sort-by
:asc asc}
"Description"]
[sorted-column {:on-sort opc [sorted-column {:on-sort opc
@@ -90,7 +85,7 @@
[:td (if vendor [:td (if vendor
(:name vendor) (:name vendor)
(str "Merchant '" "Hello" "'"))] (str "Merchant '" "Hello" "'"))]
[:td description-original] #_[:td description-original]
[:td (date->str date) ] [:td (date->str date) ]
[:td.has-text-right (nf amount )] [:td.has-text-right (nf amount )]
[:td (:name account)] [:td (:name account)]