From 5445d550630f314ca61ce4979dfd70d70210d1da Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 1 Oct 2020 07:41:57 -0700 Subject: [PATCH] improvements to rule gen to make it so you can't set account incorrectly. --- .../auto_ap/views/components/expense_accounts_field.cljs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/cljs/auto_ap/views/components/expense_accounts_field.cljs b/src/cljs/auto_ap/views/components/expense_accounts_field.cljs index e2b95314..483a8d18 100644 --- a/src/cljs/auto_ap/views/components/expense_accounts_field.cljs +++ b/src/cljs/auto_ap/views/components/expense_accounts_field.cljs @@ -95,9 +95,14 @@ (re-frame/reg-event-fx ::expense-account-changed (fn [_ [_ event expense-accounts max-value field value]] + (println field value) (let [updated-accounts (cond-> expense-accounts true (assoc-in field value) - (= (list :account :id) (drop 1 field)) (assoc-in [(first field) :account] @(re-frame/subscribe [::subs/account nil value])) + (= (list :account) (drop 1 field)) (assoc-in [(first field) :location] nil) + + (= (list :account :id) (drop 1 field)) (-> (assoc-in [(first field) :account] @(re-frame/subscribe [::subs/account nil value])) + (assoc-in [(first field) :location] nil)) + (= (list :amount-percentage) (drop 1 field)) (assoc-in [(first field) :amount] (js/parseFloat (goog.string/format "%.2f" @@ -108,6 +113,7 @@ updated-accounts (if-let [location (get-in updated-accounts [(first field) :account :location])] (assoc-in updated-accounts [(first field) :location] location) updated-accounts)] + (println updated-accounts) {:dispatch (into event [updated-accounts])})))