fixes broken query
This commit is contained in:
@@ -668,6 +668,10 @@
|
||||
(with-precision 2
|
||||
(double (.setScale (bigdec d) 2 java.math.RoundingMode/HALF_UP))))
|
||||
|
||||
(defn or-0 [x]
|
||||
(if (nil? x)
|
||||
0.0
|
||||
x))
|
||||
|
||||
(defn wrap-implied-route-param [handler & {:as route-params}]
|
||||
(fn [request]
|
||||
|
||||
@@ -4,14 +4,13 @@
|
||||
[(:require
|
||||
[auto-ap.time :as atime]
|
||||
[auto-ap.time-utils :refer [user-friendly-date]]
|
||||
[auto-ap.utils :refer [dollars-0? dollars=]]
|
||||
[clojure.string :as str]
|
||||
[clj-time.coerce :as coerce]
|
||||
[auto-ap.time-utils :refer [user-friendly-date]]
|
||||
)]
|
||||
[auto-ap.utils :refer [dollars-0? dollars= or-0]]
|
||||
[clj-time.coerce :as coerce]
|
||||
[clojure.string :as str])]
|
||||
:cljs
|
||||
[(:require
|
||||
[auto-ap.utils :refer [dollars-0? dollars=]]
|
||||
[auto-ap.utils :refer [dollars-0? dollars= or-0]]
|
||||
[auto-ap.views.utils :as au]
|
||||
[clojure.string :as str]
|
||||
[auto-ap.time-utils :refer [user-friendly-date]])]))
|
||||
@@ -168,7 +167,7 @@
|
||||
(filter #(not= "A" (:location %)))
|
||||
(group-by (juxt :client-id :location))
|
||||
(filter (fn [[_ as]]
|
||||
(not (dollars-0? (reduce + 0 (map :amount as))))))
|
||||
(not (dollars-0? (reduce + 0 (map (comp or-0 :amount) as))))))
|
||||
(mapcat second)
|
||||
(map (fn [a]
|
||||
(if (or (not (:client-id a))
|
||||
|
||||
@@ -81,3 +81,8 @@
|
||||
|
||||
:cljs (do (println "Heartbeat for " id)
|
||||
(f)))))
|
||||
|
||||
(defn or-0 [x]
|
||||
(if (nil? x)
|
||||
0.0
|
||||
x))
|
||||
Reference in New Issue
Block a user