fixes
This commit is contained in:
@@ -13,40 +13,73 @@
|
||||
|
||||
(defn- page-contents [request]
|
||||
[:div
|
||||
[:div {:class "grid grid-cols-1 lg:grid-cols-2 2xl:grid-cols-3 gap-4 overflow-scroll"}
|
||||
[:div.bg-blue-300.p-4.flex.flex-grow-0 "report-1"]
|
||||
[:div.bg-red-300.p-4.flex.flex-grow-0 "hi"]
|
||||
[:div.row-span-2
|
||||
(com/card {:class "inline-block"}
|
||||
[:div.p-4
|
||||
|
||||
[:h1.text-2xl.font-bold "Bank Accounts"]
|
||||
(com/card {:class "inline-block"}
|
||||
[:div.inline-flex.flex-wrap
|
||||
(for [c (:clients request)
|
||||
b (:client/bank-accounts (dc/pull (dc/db conn) '[{ :client/bank-accounts
|
||||
[:bank-account/current-balance
|
||||
[ :bank-account/current-balance-synced :xform clj-time.coerce/from-date]
|
||||
:bank-account/name
|
||||
{:bank-account/intuit-bank-account [:intuit-bank-account/current-balance
|
||||
[ :intuit-bank-account/last-synced :xform clj-time.coerce/from-date]]}
|
||||
{:bank-account/yodlee-account [:yodlee-account/available-balance
|
||||
[:yodlee-account/last-synced :xform clj-time.coerce/from-date]]}
|
||||
{:bank-account/plaid-account [:plaid-account/balance
|
||||
#_[:yodlee-account/last-synced :xform clj-time.coerce/from-date]]}]}]
|
||||
(:db/id c)))]
|
||||
[:div.flex.flex-col.p-4.border-l-2
|
||||
[:div (:client/name c)]
|
||||
[:div (:bank-account/name b)]
|
||||
[:div.inline-flex.justify-between [:div "Ledger Balance"] (format "$%,.2f" (or (:bank-account/current-balance b) 0.0)) ]
|
||||
[:div.inline-flex.justify-end.text-xs.text-gray-400.it (some-> (:bank-account/current-balance-synced b)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %))) ]
|
||||
[:div.inline-flex.justify-between [:div "Source Balance"] (format "$%,.2f" (or (-> b :bank-account/intuit-bank-account :intuit-bank-account/current-balance)
|
||||
(-> b :bank-account/yodlee-account :yodlee-account/available-balance)
|
||||
(-> b :bank-account/plaid-account :plaid-account/balance)
|
||||
0.0))]
|
||||
[:div.inline-flex.justify-end.text-xs.text-gray-400.it (or (some-> (:bank-account/intuit-bank-account b)
|
||||
(:intuit-bank-account/last-synced)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %)))
|
||||
(some-> (:bank-account/yodlee-account b)
|
||||
(:yodlee-account/last-synced)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %))))]])]) ])
|
||||
[:div {:class "max-h-[800px] overflow-scroll"}
|
||||
(for [c (:clients request)
|
||||
b (:client/bank-accounts (dc/pull (dc/db conn) '[{ :client/bank-accounts
|
||||
|
||||
[:bank-account/current-balance
|
||||
{[:bank-account/type :xform iol-ion.query/ident] [:db/ident]}
|
||||
|
||||
[:bank-account/current-balance-synced :xform clj-time.coerce/from-date]
|
||||
:bank-account/name
|
||||
{:bank-account/intuit-bank-account [:intuit-bank-account/current-balance
|
||||
[:intuit-bank-account/last-synced :xform clj-time.coerce/from-date]]}
|
||||
{:bank-account/yodlee-account [:yodlee-account/available-balance
|
||||
[:yodlee-account/last-synced :xform clj-time.coerce/from-date]]}
|
||||
{:bank-account/plaid-account [:plaid-account/balance
|
||||
[:plaid-account/last-synced :xform clj-time.coerce/from-date]]}]}]
|
||||
(:db/id c)))
|
||||
:when (not= :bank-account-type/cash (:bank-account/type b))]
|
||||
[:div.flex.flex-col.p-4.border-b-2.border-gray-200
|
||||
[:div.font-bold.text-gray-700 (:client/name c)]
|
||||
[:div (:bank-account/name b)]
|
||||
[:div.grid.grid-cols-3.gap-x-2.items-baseline
|
||||
[:div "Ledger Balance"]
|
||||
[:div.text-right (format "$%,.2f" (or (:bank-account/current-balance b) 0.0))]
|
||||
[:div.text-xs.text-gray-400.text-right (some-> (:bank-account/current-balance-synced b)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %)))]
|
||||
|
||||
(when-let [n (cond (-> b :bank-account/intuit-bank-account)
|
||||
"Intuit"
|
||||
(-> b :bank-account/yodlee-account)
|
||||
"Yodlee"
|
||||
(-> b :bank-account/plaid-account)
|
||||
"Plaid"
|
||||
:else
|
||||
nil)]
|
||||
(list
|
||||
[:div (str n " Balance")]
|
||||
[:div.text-right (format "$%,.2f" (or (-> b :bank-account/intuit-bank-account :intuit-bank-account/current-balance)
|
||||
(-> b :bank-account/yodlee-account :yodlee-account/available-balance)
|
||||
(-> b :bank-account/plaid-account :plaid-account/balance)
|
||||
0.0))]
|
||||
[:div.text-xs.text-gray-400.text-right (or (some-> (:bank-account/intuit-bank-account b)
|
||||
(:intuit-bank-account/last-synced)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %)))
|
||||
(some-> (:bank-account/yodlee-account b)
|
||||
(:yodlee-account/last-synced)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %)))
|
||||
(some-> (:bank-account/plaid-account b)
|
||||
(:plaid-account/last-synced)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %))))]
|
||||
[:div.inline-flex.justify-end.text-xs.text-gray-400.it ]))
|
||||
#_[:div.inline-flex.justify-between.items-baseline]]])]])]
|
||||
|
||||
[:div.bg-purple-300.p-4 "hi"]
|
||||
[:div.bg-slate-300.p-4 "hi"]
|
||||
] ])
|
||||
|
||||
(defn page [request]
|
||||
(base-page
|
||||
|
||||
Reference in New Issue
Block a user