partway through transaction rules
This commit is contained in:
@@ -14,7 +14,8 @@
|
||||
[re-frame.core :as re-frame]
|
||||
[reagent.core :as reagent]
|
||||
[reagent.core :as r]
|
||||
[auto-ap.views.components.modal :as modal]))
|
||||
[auto-ap.views.components.modal :as modal]
|
||||
[auto-ap.views.pages.data-page :as data-page]))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::run-clicked
|
||||
@@ -100,17 +101,13 @@
|
||||
|
||||
|
||||
|
||||
(defn table* [{:keys [id rule-page params status]}]
|
||||
(let [{:keys [transaction-rules start end count total]} @rule-page
|
||||
(defn table* [{:keys [id data-page]}]
|
||||
(let [{:keys [data]} @(re-frame/subscribe [::data-page/page data-page])
|
||||
selected-client @(re-frame/subscribe [::subs/client])
|
||||
opc (fn [p]
|
||||
(re-frame/dispatch [::params-changed p]))
|
||||
states @(re-frame/subscribe [::status/multi ::run])]
|
||||
[grid/grid {:on-params-change opc
|
||||
:params @(re-frame/subscribe [::table-params])
|
||||
:status status
|
||||
[grid/grid {:data-page data-page
|
||||
:column-count 6}
|
||||
[grid/controls {:start start :end end :count count :total total}]
|
||||
[grid/controls data]
|
||||
[grid/table {:fullwidth true }
|
||||
[grid/header
|
||||
[grid/row {}
|
||||
@@ -134,7 +131,7 @@
|
||||
|
||||
[grid/header-cell {:style {:width (action-cell-width 3)}}]]]
|
||||
[grid/body
|
||||
(for [{:keys [client bank-account description amount-lte amount-gte note id] :as r} transaction-rules]
|
||||
(for [{:keys [client bank-account description amount-lte amount-gte note id] :as r} (:data data)]
|
||||
^{:key id}
|
||||
[grid/row {:class (:class r)}
|
||||
[grid/cell {} (:name client)]
|
||||
|
||||
Reference in New Issue
Block a user