idea for cash flow linkage. makes invoices use uri parameters.

This commit is contained in:
Bryce Covert
2020-05-17 07:41:27 -07:00
parent a7a3966f1b
commit 700d78fc75
10 changed files with 117 additions and 39 deletions

View File

@@ -59,10 +59,17 @@
:end]]]})
(re-frame/reg-sub
::table-params
::specific-table-params
(fn [db]
(::table-params db)))
(re-frame/reg-sub
::table-params
:<- [::specific-table-params]
:<- [::subs/query-params]
(fn [[specific-table-params query-params]]
(merge (select-keys query-params #{:start :sort}) specific-table-params )))
(re-frame/reg-event-fx
::params-changed
[(re-frame/path [::table-params])]

View File

@@ -9,21 +9,41 @@
[auto-ap.routes :as routes]
[auto-ap.views.components.date-range-filter :refer [date-range-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]]
[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]
[auto-ap.events :as events]))
(re-frame/reg-sub
::specific-filters
(fn [db ]
(::filters db nil)))
(re-frame/reg-sub
::filters
(fn [db ]
(::filters db {})))
:<- [::specific-filters]
:<- [::subs/vendors-by-id]
:<- [::subs/query-params]
(fn [[specific-filters vendors-by-id query-params] ]
(let [url-filters (-> query-params
(select-keys #{:vendor-id
:date-range
:due-range
:invoice-number-like
: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)
:invoice-number-like {:raw (:invoice-number-like url-filters)
:settled (:invoice-number-like url-filters)}}]
(merge url-filters specific-filters ))))
(re-frame/reg-sub
::filter
:<- [::filters]
(fn [filters [_ which]]
(filters which)))
(get filters which)))
(re-frame/reg-sub
::filter-params
@@ -32,12 +52,13 @@
(fn [[filters ap]]
{:vendor-id (:id (:vendor filters))
:date-range (:date-range filters)
:due-range (:due-range filters)
:invoice-number-like (:settled (:invoice-number-like filters))
:status (condp = ap
:invoices nil
:unpaid-invoices :unpaid
:paid-invoices :paid
:voided-invoices :voided)}))
:invoices nil
:unpaid-invoices :unpaid
:paid-invoices :paid
:voided-invoices :voided)}))
(re-frame/reg-event-fx
@@ -125,6 +146,13 @@
[date-range-filter
{:on-change-event [::filter-changed :date-range]
:value @(re-frame/subscribe [::filter :date-range])}]]
[:p.menu-label "Due Range"]
[:div
[date-range-filter
{:on-change-event [::filter-changed :due-range]
:value @(re-frame/subscribe [::filter :due-range])}]]
[:p.menu-label "Invoice #"]
[:div
[invoice-number-filter]]])]))