remove excluded from ledger.

This commit is contained in:
Bryce Covert
2019-05-19 08:06:21 -07:00
parent 9396bbb7eb
commit cf2319b681
19 changed files with 3508 additions and 144 deletions

View File

@@ -2,6 +2,8 @@
(:require [auto-ap.events :as events]
[auto-ap.forms :as forms]
[auto-ap.subs :as subs]
[bidi.bidi :as bidi]
[auto-ap.routes :as routes]
[auto-ap.views.components.bank-account-filter :refer [bank-account-filter]]
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
[auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]]
@@ -13,7 +15,7 @@
[auto-ap.views.pages.transactions.common :refer [transaction-read]]
[auto-ap.utils :refer [replace-by]]
[auto-ap.views.pages.transactions.manual :as manual]
[auto-ap.views.utils :refer [bind-field date->str dispatch-event nf date-picker]]
[auto-ap.views.utils :refer [bind-field date->str dispatch-event nf date-picker active-when]]
[goog.string :as gstring]
[re-frame.core :as re-frame]))
@@ -95,7 +97,7 @@
(fn [db]
(-> db ::notification)))
(def transactions-content
(defn content [{:keys [approval-status]}]
(with-meta
(fn []
(let [notification (re-frame/subscribe [::notification])
@@ -127,24 +129,68 @@
:on-params-change (fn [params]
(re-frame/dispatch [::params-change params]))}]
]))
{:component-will-mount #(re-frame/dispatch-sync [::params-change {}]) }))
{:component-will-mount #(re-frame/dispatch-sync [::params-change {:approval-status approval-status}]) }))
(defn transactions-page []
(let [{transaction-bar-active? :active?} @(re-frame/subscribe [::forms/form ::edit/form])]
(def main-content {nil (content {:approval-status nil})
:unapproved (content {:approval-status :unapproved})
:requires-feedback (content {:approval-status :requires-feedback})
:approved (content {:approval-status :approved})
:excluded (content {:approval-status :excluded})})
(defn transactions-page [{:keys [approval-status]}]
(let [{transaction-bar-active? :active?} @(re-frame/subscribe [::forms/form ::edit/form])
ap @(re-frame/subscribe [::subs/active-page])]
[side-bar-layout
{:side-bar [:div
[:p.menu-label "Bank Account"]
[:div
[bank-account-filter
{:on-change-event [::change-selected-bank-account]
:value (:bank-acount-filter @(re-frame/subscribe [::transaction-page]))
:bank-accounts @(re-frame/subscribe [::subs/bank-accounts])}]]
[:p.menu-label "Date Range"]
[:div
[date-range-filter
{:on-change-event [::change-selected-date-range]
:value (:date-range-filter @(re-frame/subscribe [::transaction-page]))}]]]
:main [transactions-content]
{:side-bar
[:div
[:div [:p.menu-label "Type"]
[:ul.menu-list
[:li.menu-item
[:a.item {:href (bidi/path-for routes/routes :transactions)
:class [(active-when ap = :transactions)]}
[:span {:class "icon" :style {:font-size "25px"}}]
[:span {:class "name"} "All"]]]
[:li.menu-item
[:a.item {:href (bidi/path-for routes/routes :unapproved-transactions)
:class [(active-when ap = :unapproved-transactions)]}
[:span {:class "icon icon-task-list-text-1" :style {:font-size "25px"}}]
[:span {:class "name"} "Unapproved"]]]
[:li.menu-item
[:a.item {:href (bidi/path-for routes/routes :requires-feedback-transactions)
:class [(active-when ap = :requires-feedback-transactions)]}
[:span {:class "icon icon-task-list-question" :style {:font-size "25px"}}]
[:span {:class "name"} "Client Review"]]]
[:li.menu-item
[:a.item {:href (bidi/path-for routes/routes :approved-transactions)
:class [(active-when ap = :approved-transactions)]}
[:span {:class "icon icon-task-list-check-1" :style {:font-size "25px"}}]
[:span {:class "name"} "Approved"]]]
[:li.menu-item
[:a.item {:href (bidi/path-for routes/routes :excluded-transactions)
:class [(active-when ap = :excluded-transactions)]}
[:span {:class "icon icon-task-list-disable" :style {:font-size "25px"}}]
[:span {:class "name"} "Excluded"]]]
]]
[:p.menu-label "Bank Account"]
[:div
[bank-account-filter
{:on-change-event [::change-selected-bank-account]
:value (:bank-acount-filter @(re-frame/subscribe [::transaction-page]))
:bank-accounts @(re-frame/subscribe [::subs/bank-accounts])}]]
[:p.menu-label "Date Range"]
[:div
[date-range-filter
{:on-change-event [::change-selected-date-range]
:value (:date-range-filter @(re-frame/subscribe [::transaction-page]))}]]]
:main [(get main-content approval-status)]
:bottom [:div
[manual/modal {:import-completed [::manual-import-completed ]}]]