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

a bunch of filtering fixes.

Browse Source
This commit is contained in:
Bryce Covert
2020-05-20 07:51:07 -07:00
parent 3678997013
commit d30dfb5e34
8 changed files with 125 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/cljs/auto_ap/views/components/invoices/side_bar.cljs
View File

@@ -8,6 +8,7 @@
[bidi.bidi :as bidi]
[auto-ap.routes :as routes]
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
[auto-ap.views.components.number-filter :refer [number-filter]]
[auto-ap.views.components.typeahead :refer [typeahead-entity]]
[auto-ap.views.utils :refer [active-when dispatch-event bind-field horizontal-field date->str str->date pretty standard query-params]]
[auto-ap.subs :as subs]
@@ -29,12 +30,18 @@
:date-range
:due-range
:invoice-number-like
:amount-gte
:amount-lte
:status}))
url-filters {:vendor (when-let [vendor-id (:vendor-id url-filters)]
{:id (str vendor-id)
:name (get-in vendors-by-id [(str vendor-id) :name] "Loading...")})
:date-range (:date-range url-filters)
:due-range (:due-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)}}
:invoice-number-like {:raw (:invoice-number-like url-filters)
:settled (:invoice-number-like url-filters)}}]
(merge url-filters specific-filters ))))
@@ -53,6 +60,8 @@
{:vendor-id (:id (:vendor filters))
:date-range (:date-range filters)
:due-range (:due-range filters)
:amount-gte (:amount-gte (:settled (:amount-range filters)))
:amount-lte (:amount-lte (:settled (:amount-range filters)))
:invoice-number-like (:settled (:invoice-number-like filters))
:status (condp = ap
:invoices nil
@@ -77,6 +86,12 @@
{:db (assoc db :settled invoice-number-like)
:dispatch [::filter-changed :invoice-number-like [:settled] invoice-number-like]}))
(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
::invoice-number-like-changed
@@ -87,6 +102,16 @@
:key ::invoice-number-like}
:db (assoc db :raw invoice-number-like)}))
(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)}))
(defn invoice-number-filter []
[:div.field
[:div.control [:input.input {:placeholder "AP-123"
@@ -153,6 +178,12 @@
{:on-change-event [::filter-changed :due-range]
:value @(re-frame/subscribe [::filter :due-range])}]]
[:p.menu-label "Amount"]
[:div
[number-filter
{:on-change-event [::amount-range-changed]
:value (:raw @(re-frame/subscribe [::filter :amount-range]))}]]
[:p.menu-label "Invoice #"]
[:div
[invoice-number-filter]]])]))