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

simplify sorting

Browse Source
This commit is contained in:
Bryce
2024-04-10 14:48:47 -07:00
parent 1493b03ba3
commit 65be50cf9f
7 changed files with 104 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/clj/auto_ap/query_params.clj
View File

@@ -4,6 +4,9 @@
[clj-time.core :as time]
[clojure.string :as str]))
(defn wrap-copy-qp-pqp [handler]
(fn [request]
(handler (assoc request :parsed-query-params (:query-params request)))))
(defn wrap-parse-query-params [handler parser]
(fn parsed-handler [request]
@@ -42,13 +45,13 @@
[]))
(defn parse-long [l]
(try
(try
(Long/parseLong l)
(catch Exception e
nil)))
(defn parse-double [l]
(try
(try
(Double/parseDouble l)
(catch Exception e
nil)))
@@ -74,7 +77,7 @@
"all"
(assoc query-params
start-date-key (time/plus (time/now) (time/years -3))
start-date-key (time/plus (time/now) (time/years -6))
end-date-key (time/now))
query-params)
@@ -88,18 +91,18 @@
presently-sorted? ((set (map :sort-key current-sort)) key-to-toggle)
new-sort (if presently-sorted?
(mapv
(fn [s]
(if (= (:sort-key s)
key-to-toggle)
(-> s
(update :asc
#(boolean (not %)))
(update :sort-icon (fn [x]
(if (= x svg/sort-down)
svg/sort-up
svg/sort-down))))
s))
current-sort)
(fn [s]
(if (= (:sort-key s)
key-to-toggle)
(-> s
(update :asc
#(boolean (not %)))
(update :sort-icon (fn [x]
(if (= x svg/sort-down)
svg/sort-up
svg/sort-down))))
s))
current-sort)
(conj current-sort {:sort-key key-to-toggle
:asc true
:name (:name (first (filter #(= (str key-to-toggle) (:sort-key %)) (:headers grid-spec))))