filtering on ledger page.

This commit is contained in:
Bryce Covert
2020-04-28 07:49:53 -07:00
parent 1f649794eb
commit edc7d50661
10 changed files with 137 additions and 111 deletions

View File

@@ -17,7 +17,8 @@
[auto-ap.views.pages.transactions.manual :as manual]
[auto-ap.views.utils :refer [bind-field date->str dispatch-event nf active-when]]
[goog.string :as gstring]
[re-frame.core :as re-frame]))
[re-frame.core :as re-frame]
[reagent.core :as reagent]))
(re-frame/reg-sub
@@ -38,30 +39,38 @@
(re-frame/reg-event-fx
::params-change
(fn [cofx [_ params]]
{:db (-> (:db cofx)
(assoc-in [:status :loading] true))
:graphql {:token (-> cofx :db :user)
:query-obj {:venia/queries [[:ledger-page
@(re-frame/subscribe [::params])
[[:journal-entries [:id
:source
:amount
:note
:cleared-against
[:vendor
[:name :id]]
[:client
[:name :id]]
[:line-items
[:id :debit :credit :location
[:account [:id :name]]]]
:date]]
:total
:start
:end]]]}
:on-success [::received]}}))
(fn [cofx [_]]
(let [new-params @(re-frame/subscribe [::params])]
(when (not= (::last-params (:db cofx)) new-params)
{:db (-> (:db cofx)
(assoc-in [::last-params] new-params)
(assoc-in [:status :loading] true))
:graphql {:token (-> cofx :db :user)
:query-obj {:venia/queries [[:ledger-page
new-params
[[:journal-entries [:id
:source
:amount
:note
:cleared-against
[:vendor
[:name :id]]
[:client
[:name :id]]
[:line-items
[:id :debit :credit :location
[:account [:id :name]]]]
:date]]
:total
:start
:end]]]}
:on-success [::received]}}))))
(re-frame/reg-event-fx
::unmounted
(fn [{:keys [db]} _]
{:db (dissoc db ::last-params ::table/table-params ::side-bar/filters ::ledger-page)}))
(re-frame/reg-event-db
::received
@@ -70,37 +79,27 @@
(assoc ::ledger-page (:ledger-page data))
(assoc-in [:status :loading] false))))
#_(re-frame/reg-event-db
::change-selected-bank-account
(fn [db [_ key value]]
(let [[key] key
updated (assoc-in db [::ledger-page :bank-account-filter key] value)]
(if (and (= key :id)
(not= value (get-in db [::params :bank-account-id])))
(do
(re-frame/dispatch [::params-change (assoc (::params updated) :bank-account-id value)])
(assoc-in updated [::params :bank-account-id] value))
updated))))
(def ledger-content
(with-meta
(fn []
(let [current-client @(re-frame/subscribe [::subs/client])
user @(re-frame/subscribe [::subs/user])]
[:div
[:h1.title "Ledger"]
[table/table {:id :ledger
:params (re-frame/subscribe [::params])
:ledger-page (re-frame/subscribe [::ledger-page])
:status (re-frame/subscribe [::subs/status])
:on-params-change (fn [params]
(re-frame/dispatch [::params-change params]))}]
[manual/modal {:import-completed [::manual-import-completed ]}]]))
{:component-will-mount #(re-frame/dispatch-sync [::params-change {}]) }))
(defn ledger-content []
(let [current-client @(re-frame/subscribe [::subs/client])
user @(re-frame/subscribe [::subs/user])]
[:div
[:h1.title "Ledger"]
[table/table {:id :ledger
:params (re-frame/subscribe [::params])
:ledger-page (re-frame/subscribe [::ledger-page])
:status (re-frame/subscribe [::subs/status])
:on-params-change (fn [params]
(re-frame/dispatch [::params-change params]))}]
[manual/modal {:import-completed [::manual-import-completed ]}]]))
(defn ledger-page []
[side-bar-layout
{:side-bar [ledger-side-bar]
:main [ledger-content]}])
(reagent/create-class
{:display-name "ledger-page"
:component-did-mount #(re-frame/dispatch [::params-change {}])
:component-will-unmount #(re-frame/dispatch [::unmounted])
:reagent-render
(fn []
[side-bar-layout
{:side-bar [ledger-side-bar]
:main [ledger-content]}])}))