Fixing minor bugs.

This commit is contained in:
Bryce Covert
2020-08-13 18:09:13 -07:00
parent 54d5de6d33
commit 0c87309c34
7 changed files with 134 additions and 80 deletions

View File

@@ -166,12 +166,14 @@
[:div.column.is-1
[:a.button {:on-click (dispatch-event [::removed-override override-key i])} [:span.icon [:span.icon-remove]]]]]))])))
(defn default-with-overrides [{:keys [override-key override-value-key change-event default-key data]} template]
(defn default-with-overrides [{:keys [override-key override-value-key change-event default-key data mandatory?]} template]
(let [clients @(re-frame/subscribe [::subs/clients])
is-admin? @(re-frame/subscribe [::subs/is-admin?])]
[:div
[horizontal-field
[:label.label "Default"]
[:label.label [:span "Default"
(when mandatory?
[:span.has-text-danger " *"])]]
[bind-field
(template default-key nil)
#_(assoc-in template [1 :field ] default-key)]]
@@ -207,7 +209,8 @@
is-admin? @(re-frame/subscribe [::subs/is-admin?])]
[:div
[horizontal-field
[:label.label "Name"]
[:label.label [:span "Name "
[:span.has-text-danger "*"]]]
[:div.control
[bind-field
[:input.input {:type "text"
@@ -258,6 +261,7 @@
[:h2.subtitle "Expense Accounts"]
[default-with-overrides {:data data :change-event change-event
:mandatory? true
:default-key :default-account
:override-key :account-overrides}
(fn [field client]