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

lots of QOL improvements.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

114
src/cljs/auto_ap/views/pages/payments/side_bar.cljs
View File

@@ -1,7 +1,7 @@
(ns auto-ap.views.pages.payments.side-bar
(:require [auto-ap.routes :as routes]
[auto-ap.subs :as subs]
[auto-ap.views.utils :refer [active-when]]
[auto-ap.views.utils :refer [active-when dispatch-value-change]]
[auto-ap.views.components.vendor-filter :refer [vendor-filter]]
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
[auto-ap.views.components.number-filter :refer [number-filter]]
@@ -15,6 +15,11 @@
(fn [db ]
(::filters db {})))
(re-frame/reg-sub
::settled-filters
(fn [db ]
(::settled-filters db)))
(re-frame/reg-sub
::filters
:<- [::specific-filters]
@@ -32,15 +37,11 @@
{:id (str vendor-id)
:name (get-in vendors-by-id [(str vendor-id) :name] "Loading...")})
:date-range (:date-range url-filters)
:amount-range {:raw {:amount-gte (:amount-gte url-filters)
:amount-lte (:amount-lte url-filters)}
:settled {:amount-gte (:amount-gte url-filters)
:amount-lte (:amount-lte url-filters)}}
:check-number-like {:raw (:check-number-like url-filters)
:settled (:check-number-like url-filters)}
:invoice-number {:raw (:invoice-number url-filters)
:settled (:invoice-number url-filters)}}]
(println "URL filters" url-filters)
:amount-range {:amount-gte (:amount-gte url-filters)
:amount-lte (:amount-lte url-filters)}
:check-number-like (:check-number-like url-filters)
:invoice-number (:invoice-number url-filters)}]
(merge url-filters specific-filters ))))
(re-frame/reg-sub
@@ -51,15 +52,22 @@
(re-frame/reg-sub
::filter-params
:<- [::settled-filters]
:<- [::filters]
(fn [filters]
{:vendor-id (:id (:vendor filters))
:date-range (:date-range filters)
:amount-gte (:amount-gte (:settled (:amount-range filters)))
:amount-lte (:amount-lte (:settled (:amount-range filters)))
:check-number-like (:settled (:check-number-like filters))
:invoice-number (:settled (:invoice-number filters))}))
(fn [[settled-filters filters]]
(let [filters (or settled-filters filters)]
{:vendor-id (:id (:vendor filters))
:date-range (:date-range filters)
:amount-gte (:amount-gte (:amount-range filters))
:amount-lte (:amount-lte (:amount-range filters))
:check-number-like (:check-number-like filters)
:invoice-number (:invoice-number 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
@@ -68,72 +76,23 @@
[which val] (if (= 3 (count params))
[(into [a] b) c]
[[a] b])]
{:db (assoc-in db (into [::filters] which) val)})))
(re-frame/reg-event-fx
::check-number-like-settled
[(re-frame/path [::filters :check-number-like])]
(fn [{:keys [db]} [_ description]]
{:db (assoc db :settled description)
:dispatch [::filter-changed :check-number-like [:settled] description]}))
(re-frame/reg-event-fx
::invoice-number-settled
[(re-frame/path [::filters :invoice-number])]
(fn [{:keys [db]} [_ description]]
{:db (assoc db :settled description)
:dispatch [::filter-changed :invoice-number [:settled] description]}))
(re-frame/reg-event-fx
::amount-range-settled
[(re-frame/path [::filters :amount-range])]
(fn [{:keys [db]} [_ which value]]
{:db (assoc-in db [:settled which] value)
:dispatch [::filter-changed :amount-range [:settled] (assoc (:settled db) which value)]}))
(re-frame/reg-event-fx
::check-number-like-changed
[(re-frame/path [::filters :check-number-like])]
(fn [{:keys [db]} [_ description]]
{:dispatch-debounce
{:event [::check-number-like-settled description]
:time 500
:key ::check-number-like}
:db (assoc db :raw description)}))
(re-frame/reg-event-fx
::invoice-number-changed
[(re-frame/path [::filters :invoice-number])]
(fn [{:keys [db]} [_ description]]
{:dispatch-debounce
{:event [::invoice-number-settled description]
:time 500
:key ::invoice-number}
:db (assoc db :raw description)}))
(re-frame/reg-event-fx
::amount-range-changed
[(re-frame/path [::filters :amount-range])]
(fn [{:keys [db]} [_ [which] value]]
{:dispatch-debounce
{:event [::amount-range-settled which value]
:time 500
:key ::amount-range}
:db (assoc-in db [:raw which] value)}))
{:db (assoc-in db (into [::filters] which) val)
:dispatch-debounce
{:event [::filters-settled]
:time 800
:key ::filters}})))
(defn check-number-filter []
[:div.field
[:div.control [:input.input {:placeholder "10001"
:value (:raw @(re-frame/subscribe [::filter :check-number-like]))
:on-change (fn [x]
(re-frame/dispatch [::check-number-like-changed (.. x -target -value) ]))} ]]])
:value @(re-frame/subscribe [::filter :check-number-like])
:on-change (dispatch-value-change [::filter-changed :check-number-like])} ]]])
(defn invoice-number-filter []
[:div.field
[:div.control [:input.input {:placeholder "SJ-12345"
:value (:raw @(re-frame/subscribe [::filter :invoice-number]))
:on-change (fn [x]
(re-frame/dispatch [::invoice-number-changed (.. x -target -value) ]))} ]]])
:value @(re-frame/subscribe [::filter :invoice-number])
:on-change (dispatch-value-change [::filter-changed :invoice-number])} ]]])
(defn side-bar []
(let [ap @(re-frame/subscribe [::subs/active-page])
@@ -156,10 +115,9 @@
[:p.menu-label "Amount"]
[:div
(println (:raw @(re-frame/subscribe [::filter :amount-range])))
[number-filter
{:on-change-event [::amount-range-changed]
:value (:raw @(re-frame/subscribe [::filter :amount-range]))}]]
{:on-change-event [::filter-changed :amount-range]
:value @(re-frame/subscribe [::filter :amount-range])}]]
[:p.menu-label "Check #"]
[:div [check-number-filter]]