This commit is contained in:
Bryce Covert
2018-09-03 13:12:20 -07:00
parent da97d730ad
commit fe5d09c02b
8 changed files with 29 additions and 13 deletions

View File

@@ -41,7 +41,8 @@
:status
:description_original
[:payment [:check_number :s3_url]]
[:client [:name :id]]]]
[:client [:name :id]]
[:bank-account [:name :yodlee-account-id]]]]
:total
:start
:end]]]}
@@ -68,7 +69,7 @@
(let [{:keys [sort-by asc]} @state
{:keys [transactions start end count total]} @transaction-page
selected-company @(re-frame/subscribe [::subs/company])
percentage-size (if selected-company "100%" "50%")]
percentage-size (if selected-company "25%" "33%")]
[:div
[paginator {:start start :end end :count count :total total
:on-change (fn [p ]
@@ -111,6 +112,8 @@
:sort-by sort-by
:asc asc}
"Status"]
[:th {:width percentage-size} "Bank account"]
[:th {:width percentage-size} "Yodlee bank account"]
[:th {:style {:width "10em"}} "" ]]]
@@ -119,7 +122,7 @@
[:tr
[:td {:col-span 5}
[:i.fa.fa-spin.fa-spinner]]]
(for [{:keys [client check status description-original date amount id ] :as i} (:transactions @transaction-page)]
(for [{:keys [client check status bank-account description-original date amount id ] :as i} (:transactions @transaction-page)]
^{:key id}
[:tr {:class (:class i)}
@@ -129,6 +132,8 @@
[:td (date->str date) ]
[:td (gstring/format "$%.2f" amount )]
[:td status]
[:td (:name bank-account )]
[:td (:yodlee-account-id bank-account )]
[:td