supports validation and multiple account entering.

This commit is contained in:
Bryce Covert
2019-04-17 18:35:41 -07:00
parent a4eea929e5
commit 4fe52cad5a
10 changed files with 156 additions and 87 deletions

View File

@@ -76,10 +76,26 @@
]
)
(def add-transaction-account
[[{:db/ident :transaction/account
[[{:db/ident :transaction/accounts
:db/valueType :db.type/ref
:db/cardinality :db.cardinality/many
:db/isComponent true
:db/doc "The debit(s)/credit(s) for this transaction"}
{:db/ident :transaction-account/account
:db/valueType :db.type/ref
:db/cardinality :db.cardinality/one
:db/doc "The debit/credit for this transaction"}]])
:db/doc "Which account to debit/credit for this transaction"}
{:db/ident :transaction-account/location
:db/valueType :db.type/string
:db/cardinality :db.cardinality/one
:db/doc "Location for this expense account"}
{:db/ident :transaction-account/amount
:db/valueType :db.type/double
:db/cardinality :db.cardinality/one
:db/doc "How much to debit/credit - must be positive"}]])
(def add-yodlee-merchant
[[{:db/ident :yodlee-merchant/name

View File

@@ -75,7 +75,10 @@
(->> (d/pull-many db '[* {:transaction/client [:client/name :db/id :client/code]
:transaction/bank-account [:bank-account/name :bank-account/code :bank-account/yodlee-account-id :db/id]
:transaction/vendor [:db/id :vendor/name]
:transaction/account [:db/id :account/name :account/numeric-code]
:transaction/accounts [:transaction-account/amount
:db/id
:transaction-account/location
{:transaction-account/account [:db/id :account/name :account/numeric-code]}]
:transaction/yodlee-merchant [:db/id :yodlee-merchant/yodlee-id :yodlee-merchant/name]}]
ids)
(map #(update % :transaction/date c/from-date))
@@ -96,7 +99,10 @@
'[* {:transaction/client [:client/name :db/id :client/code :client/locations]
:transaction/bank-account [:bank-account/name :bank-account/code :bank-account/yodlee-account-id :db/id]
:transaction/vendor [:db/id :vendor/name]
:transaction/account [:db/id :account/name :account/numeric-code]
:transaction/accounts [:transaction-account/amount
:db/id
:transaction-account/location
{ :transaction-account/account [:db/id :account/name :account/numeric-code]}]
:transaction/yodlee-merchant [:db/id :yodlee-merchant/yodlee-id :yodlee-merchant/name]}]
id)
(update :transaction/date c/from-date)