lots of QOL improvements.

This commit is contained in:
Bryce Covert
2020-07-31 18:26:57 -07:00
parent 98f0d40313
commit be9c789003
15 changed files with 302 additions and 282 deletions

View File

@@ -13,6 +13,11 @@
(fn [db ]
(::filters db {})))
(re-frame/reg-sub
::settled-filters
(fn [db ]
(::settled-filters db)))
(re-frame/reg-sub
::filters
:<- [::specific-filters]
@@ -38,7 +43,6 @@
:numeric-code (get-in accounts-by-id [(str account-id) :numeric-code] "Loading...")
:name (get-in accounts-by-id [(str account-id) :name] "Loading...")})
:date-range (:date-range url-filters)}]
(println url-filters specific-filters)
(merge url-filters specific-filters ))))
(re-frame/reg-sub
@@ -49,13 +53,19 @@
(re-frame/reg-sub
::filter-params
:<- [::settled-filters]
:<- [::filters]
(fn [filters]
{:vendor-id (:id (:vendor filters))
:account-id (:id (:account filters))
:date-range (:date-range filters)
:bank-account-id (:id (:bank-account filters))}))
(fn [[settled-filters filters]]
(let [filters (or settled-filters filters)]
{:vendor-id (:id (:vendor filters))
:account-id (:id (:account filters))
:date-range (:date-range filters)
:bank-account-id (:id (:bank-account filters))})))
(re-frame/reg-event-fx
::filters-settled
(fn [{:keys [db]} [_ & params]]
{:db (assoc db ::settled-filters @(re-frame/subscribe [::filters]))}))
(re-frame/reg-event-fx
::filter-changed
@@ -64,7 +74,11 @@
[which val] (if (= 3 (count params))
[(into [a] b) c]
[[a] b])]
{:db (assoc-in db (into [::filters] which) val)})))
{:db (assoc-in db (into [::filters] which) val)
:dispatch-debounce
{:event [::filters-settled]
:time 800
:key ::filters}})))
(defn ledger-side-bar []
(let [ap @(re-frame/subscribe [::subs/active-page])