You can now see cash flow details
This commit is contained in:
Bryce Covert
@@ -1,15 +1,17 @@
|
||||
(ns auto-ap.views.pages.home
|
||||
(:require [auto-ap.views.components.layouts :refer [side-bar-layout]]
|
||||
[re-frame.core :as re-frame]
|
||||
[bidi.bidi :as bidi]
|
||||
[auto-ap.routes :as routes]
|
||||
(:require [auto-ap.routes :as routes]
|
||||
[auto-ap.subs :as subs]
|
||||
[auto-ap.views.components.grid :as grid]
|
||||
[auto-ap.views.components.layouts :refer [side-bar-layout]]
|
||||
[auto-ap.views.utils
|
||||
:refer
|
||||
[->$ date->str days-until dispatch-event local-now standard]]
|
||||
[bidi.bidi :as bidi]
|
||||
[cljs-time.coerce :as coerce]
|
||||
[cljs-time.core :as t]
|
||||
[auto-ap.views.utils :refer [local-now date->str standard dispatch-event]]
|
||||
[reagent.core :as r]
|
||||
[pushy.core :as pushy]
|
||||
))
|
||||
|
||||
[re-frame.core :as re-frame]
|
||||
[reagent.core :as r]))
|
||||
|
||||
(def pie-chart (r/adapt-react-class js/Recharts.PieChart))
|
||||
(def pie (r/adapt-react-class js/Recharts.Pie))
|
||||
@@ -129,6 +131,16 @@
|
||||
(fn [db]
|
||||
(::cash-flow db)))
|
||||
|
||||
(re-frame/reg-sub
|
||||
::cash-flow-table-params
|
||||
(fn [db]
|
||||
(::cash-flow-table-params db)))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::cash-flow-table-params-changed
|
||||
(fn [db [_ new]]
|
||||
(assoc db ::cash-flow-table-params new)))
|
||||
|
||||
(re-frame/reg-sub
|
||||
::cash-flow
|
||||
:<- [::chart-options]
|
||||
@@ -150,6 +162,7 @@
|
||||
(let [today (t/plus start-date (t/days day))]
|
||||
(conj acc
|
||||
{:name (date->str today)
|
||||
:date today
|
||||
:effective-balance (+ (- effective-balance invoices-due-today )
|
||||
debits-due-today
|
||||
credits-yesterday)
|
||||
@@ -160,6 +173,7 @@
|
||||
:query-params (cemerick.url/map->query {:due-range {:start (date->str today standard)
|
||||
:end (date->str today standard)}})}))))
|
||||
(list {:name (date->str start-date)
|
||||
:date start-date
|
||||
:effective-balance effective-balance
|
||||
:invoices (- (invoices-due-soon (date->str start-date) 0.0))
|
||||
:credits (upcoming-credits (date->str start-date) 0.0)
|
||||
@@ -188,6 +202,38 @@
|
||||
:one-hundred-eighty-days
|
||||
(range 1 181)))))))
|
||||
|
||||
|
||||
(re-frame/reg-sub
|
||||
::cash-flow-page
|
||||
:<- [::cash-flow-table-params]
|
||||
:<- [::cash-flow-data]
|
||||
:<- [::subs/vendors-by-id]
|
||||
(fn [[params cash-flow-data vendors-by-id]]
|
||||
(let [ {:keys [outstanding-payments invoices-due-soon upcoming-credits upcoming-debits]} cash-flow-data
|
||||
rows (concat (map (fn [c]
|
||||
{:date (:date c)
|
||||
:days-until (days-until (:date c))
|
||||
:name (or (:identifier c) "Bi-weekly Average")
|
||||
:amount (:amount c)
|
||||
:type "Debit"}) upcoming-debits)
|
||||
(map (fn [c]
|
||||
{:date (:date c)
|
||||
:days-until (days-until (:date c))
|
||||
:amount (:amount c)
|
||||
:name (or (:identifier c) "Bi-weekly Average")
|
||||
:type "Credit"})
|
||||
upcoming-credits)
|
||||
(map (fn [c]
|
||||
{:date (:due c)
|
||||
:days-until (days-until (:due c))
|
||||
:amount (:outstanding-balance c)
|
||||
:name (str (:name (get vendors-by-id (:id (:vendor c)))) " (" (:invoice-number c) ")")
|
||||
:type "Invoice"})
|
||||
invoices-due-soon))]
|
||||
(assoc (grid/virtual-paginate-controls (:start params ) rows)
|
||||
:data (grid/virtual-paginate (:start params)
|
||||
(sort-by (comp coerce/to-date :date) rows))))))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::mounted
|
||||
(fn [{:keys [db]} _]
|
||||
@@ -203,9 +249,9 @@
|
||||
{:client-id (:id @(re-frame/subscribe [::subs/client]))}
|
||||
[:beginning-balance
|
||||
:outstanding-payments
|
||||
[:invoices-due-soon [:due :outstanding-balance]]
|
||||
[:upcoming-credits [:date :amount]]
|
||||
[:upcoming-debits [:date :amount]]]]]}
|
||||
[:invoices-due-soon [:due :outstanding-balance [:vendor [:id]] :invoice-number]]
|
||||
[:upcoming-credits [:date :amount :identifier]]
|
||||
[:upcoming-debits [:date :amount :identifier]]]]]}
|
||||
:on-success [::received]}}))
|
||||
|
||||
(defn cash-flow-range-button [{:keys [name value chart-options]}]
|
||||
@@ -214,6 +260,40 @@
|
||||
:on-click (dispatch-event [::select-cash-flow-range value])}
|
||||
name])
|
||||
|
||||
(defn cash-flow-grid []
|
||||
(let [page @(re-frame/subscribe [::cash-flow-page])
|
||||
opc (fn [p]
|
||||
(re-frame/dispatch [::cash-flow-table-params-changed p]))
|
||||
params @(re-frame/subscribe [::cash-flow-table-params])]
|
||||
[grid/grid {:status {:state :complete}
|
||||
:on-params-change opc
|
||||
:params params
|
||||
:column-count 4}
|
||||
[grid/controls page]
|
||||
[grid/table {:style {:width "800px"}}
|
||||
[grid/header
|
||||
[grid/row {}
|
||||
[grid/header-cell {} "Date"]
|
||||
[grid/header-cell {} "Type"]
|
||||
[grid/header-cell {} "Name"]
|
||||
[grid/header-cell {:class "has-text-right"} "Amount"]]]
|
||||
[grid/body
|
||||
(for [{:keys [date days-until type name amount] } (:data page)]
|
||||
^{:key date}
|
||||
[grid/row {}
|
||||
[grid/cell {}
|
||||
(if (> days-until 0)
|
||||
[:span.has-text-success days-until " days"]
|
||||
[:span.has-text-danger days-until " days"])
|
||||
[:i.is-size-7 " (" (date->str date) ")"] ]
|
||||
[grid/cell {} (if (> date 0)
|
||||
"Upcoming "
|
||||
"Due ")
|
||||
type]
|
||||
[grid/cell {} name]
|
||||
[grid/cell {:class "has-text-right"} (->$ amount)]
|
||||
])]]]))
|
||||
|
||||
(defn home-content []
|
||||
(let [client-id (-> @(re-frame/subscribe [::subs/client]) :id)
|
||||
chart-options @(re-frame/subscribe [::chart-options])]
|
||||
@@ -256,7 +336,9 @@
|
||||
|
||||
|
||||
(make-cash-flow-chart {:width 800 :height 500
|
||||
:data (clj->js @(re-frame/subscribe [::cash-flow]))})]}]))
|
||||
:data (clj->js @(re-frame/subscribe [::cash-flow]))})
|
||||
|
||||
[cash-flow-grid]]}]))
|
||||
|
||||
|
||||
(defn home-page []
|
||||
|
||||
Reference in New Issue
Block a user