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

Better UX for bank account balances

Browse Source
This commit is contained in:
Bryce Covert
2021-01-30 08:38:30 -08:00
parent 776f38ddd6
commit 650cf37fa1
8 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/cljs/auto_ap/views/pages/ledger/side_bar.cljs
View File

@@ -3,6 +3,7 @@
[auto-ap.subs :as subs]
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
[auto-ap.views.components.number-filter :refer [number-filter]]
[auto-ap.views.components.bank-account-filter :refer [bank-account-filter]]
[auto-ap.views.components.typeahead :refer [typeahead-entity]]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [active-when dispatch-value-change]]
@@ -43,17 +44,13 @@
[:a.item {:href (bidi/path-for routes/routes :external-import-ledger)
:class [(active-when ap = :external-import-ledger)]}
[:span.icon [:i {:class "fa fa-download"}]]
[:span {:class "name"} "External Ledger Import"]]])
(when (#{ :ledger :external-ledger} ap)
[:span {:class "name"} "External Ledger Import"]]])]
(when (#{ :ledger :external-ledger} ap)
[:div
[:p.menu-label "Bank Account"]
[:div
[typeahead-entity {:matches @(re-frame/subscribe [::subs/bank-accounts])
:match->text :name
:include-keys [:name :id]
:type "typeahead-entity"
:on-change #(re-frame/dispatch [::data-page/filter-changed data-page :bank-account %])
:value @(re-frame/subscribe [::data-page/filter data-page :bank-account])}]]
[bank-account-filter {:value @(re-frame/subscribe [::data-page/filter data-page :bank-account])
:bank-accounts @(re-frame/subscribe [::subs/bank-accounts])
:on-change-event [::data-page/filter-changed data-page :bank-account]}]
@@ -102,4 +99,4 @@
[:div.field
[:div.control [:input.input {:placeholder "External id"
:value @(re-frame/subscribe [::data-page/filter data-page :external-id])
:on-change (dispatch-value-change [::data-page/filter-changed data-page :external-id])} ]]]]])])]]))
:on-change (dispatch-value-change [::data-page/filter-changed data-page :external-id])} ]]]]])])]))

7
src/cljs/auto_ap/views/pages/transactions/side_bar.cljs
View File

@@ -9,14 +9,16 @@
[auto-ap.views.components.switch-field :refer [switch-field]]
[auto-ap.views.components.typeahead :refer [typeahead-entity]]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [active-when dispatch-event dispatch-value-change]]
[auto-ap.views.utils :refer [active-when dispatch-event dispatch-value-change ->$]]
[bidi.bidi :as bidi]
[re-frame.core :as re-frame]))
(defn side-bar [{:keys [data-page]}]
(let [ap @(re-frame/subscribe [::subs/active-page])
user @(re-frame/subscribe [::subs/user])
accounts @(re-frame/subscribe [::subs/accounts])]
accounts @(re-frame/subscribe [::subs/accounts])
]
[:div
[:div [:p.menu-label "Type"]
[:ul.menu-list
@@ -58,6 +60,7 @@
{:on-change-event [::data-page/filter-changed data-page :bank-account]
:value @(re-frame/subscribe [::data-page/filter data-page :bank-account])
:bank-accounts @(re-frame/subscribe [::subs/bank-accounts])}]]
[:p.menu-label "Financial Account"]
[:div

7
src/cljs/auto_ap/views/pages/transactions/table.cljs
View File

@@ -95,12 +95,7 @@
#_[:td description-original]
[grid/cell {}
(if (and (:current-balance bank-account)
(or is-power-user?
is-admin?))
[:span.has-tooltip-arrow.has-tooltip-right {:data-tooltip (str "Current Balance: " (nf (:current-balance bank-account) ))}
(:name bank-account ) ]
(:name bank-account ))]
(:name bank-account )]
[grid/cell {} (cond vendor
(:name vendor)
yodlee-merchant