From e217bad88e03e64b4813e5cafbb0be0a7d263e4f Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 11 Apr 2019 15:13:53 -0700 Subject: [PATCH] cleanup. --- src/clj/auto_ap/datomic/transactions.clj | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/clj/auto_ap/datomic/transactions.clj b/src/clj/auto_ap/datomic/transactions.clj index 9962037d..fa164f12 100644 --- a/src/clj/auto_ap/datomic/transactions.clj +++ b/src/clj/auto_ap/datomic/transactions.clj @@ -28,7 +28,6 @@ (= (:asc args) false) (reverse))) (defn apply-sort-2 [args results ] - (let [comparator (if (= (:asc args) false) (fn [x y] (compare y x)) (fn [x y] (compare x y)))] @@ -50,14 +49,13 @@ (:sort-by args) (add-sorter-field {"client" ['[?e :transaction/client ?c] '[?c :client/name ?sorter]] - "account" #_['[(get-else $ ?e :transaction/account 0) ?sorter]] - ['[?e :transaction/date] - '(or-join [?e ?sorter] - (and [?e :transaction/account ?c] - [?c :account/name ?sorter]) - (and - (not [?e :transaction/account]) - [(ground "") ?sorter]))] + "account" ['[?e :transaction/date] + '(or-join [?e ?sorter] + (and [?e :transaction/account ?c] + [?c :account/name ?sorter]) + (and + (not [?e :transaction/account]) + [(ground "") ?sorter]))] "description-original" ['[?e :transaction/description-original ?sorter]] "date" ['[?e :transaction/date ?sorter]] "amount" ['[?e :transaction/amount ?sorter]]