ui fixes for client screen.
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
audit-transact conn merge-query pull-attr pull-id
|
||||
pull-many query2]]
|
||||
[auto-ap.graphql.utils :refer [extract-client-ids]]
|
||||
[auto-ap.logging :as alog]
|
||||
[auto-ap.routes.admin.clients :as route]
|
||||
[auto-ap.routes.queries :as q]
|
||||
[auto-ap.routes.utils
|
||||
@@ -279,9 +280,9 @@
|
||||
[:client/locations [:vector {:decode/arbitrary (fn [m] (if (map? m)
|
||||
(vals m)
|
||||
m))} :string]]
|
||||
[:client/groups [:vector {:decode/arbitrary (fn [m] (if (map? m)
|
||||
(vals m)
|
||||
m))} :string]]
|
||||
[:client/groups {:optional true :default []} [:maybe [:vector {:decode/arbitrary (fn [m] (if (map? m)
|
||||
(vals m)
|
||||
m))} :string]]]
|
||||
[:client/emails {:optional true} [:maybe (many-entity {}
|
||||
[:db/id [:or entity-id temp-id]]
|
||||
[:email-contact/description :string]
|
||||
@@ -332,10 +333,10 @@
|
||||
(clj-time.coerce/to-date (auto-ap.time/parse m atime/normal-date))
|
||||
m))}
|
||||
inst?]])]]
|
||||
[:client/matches [:vector {:decode/arbitrary (fn [m] (if (map? m)
|
||||
(vals m)
|
||||
m))}
|
||||
:string]]
|
||||
[:client/matches {:optional true :default []} [:vector {:decode/arbitrary (fn [m] (if (map? m)
|
||||
(vals m)
|
||||
m))}
|
||||
:string]]
|
||||
[:client/address {:optional true}
|
||||
[:maybe
|
||||
[:map
|
||||
@@ -786,7 +787,12 @@
|
||||
:value (some-> (fc/field-value)
|
||||
|
||||
(clj-time.coerce/to-date-time)
|
||||
(atime/unparse-local atime/normal-date))})]))])
|
||||
(atime/unparse-local atime/normal-date))})]))
|
||||
(fc/with-field :bank-account/include-in-reports
|
||||
(com/checkbox {:name (fc/field-name)
|
||||
:value (boolean (fc/field-value))
|
||||
:checked (fc/field-value)}
|
||||
"Include in reports"))])
|
||||
|
||||
|
||||
|
||||
@@ -1434,6 +1440,7 @@
|
||||
(-> bank-account
|
||||
(update :bank-account/start-date #(when % (clj-time.coerce/to-date %)))))
|
||||
bank-accounts))))
|
||||
_ (alog/info ::peeker :entity (:client/bank-accounts entity))
|
||||
_ (when (and (:client/code entity) (pull-id (dc/db conn) [:client/code (:client/code entity)]))
|
||||
(form-validation-error (format "The code '%s' is already in use" (:client/code entity))
|
||||
:code (:client/code entity)))
|
||||
|
||||
Reference in New Issue
Block a user