From 65e65302bffae9fa2a85542a9ee00e4d5efdfdf4 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 3 May 2018 09:35:02 -0700 Subject: [PATCH] starting to add relationships. --- src/clj/auto_ap/db/vendors.clj | 1 + src/cljs/auto_ap/subs.cljs | 6 ++++++ src/cljs/auto_ap/views/pages/admin/vendors.cljs | 12 +++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/clj/auto_ap/db/vendors.clj b/src/clj/auto_ap/db/vendors.clj index 0824c8c1..91807b96 100644 --- a/src/clj/auto_ap/db/vendors.clj +++ b/src/clj/auto_ap/db/vendors.clj @@ -24,6 +24,7 @@ (helpers/merge-where [:= :id id]))))) (defn upsert [id data] + (println data) (-> (sql/build :update :vendors :set (unparse data) diff --git a/src/cljs/auto_ap/subs.cljs b/src/cljs/auto_ap/subs.cljs index a1909f50..55dd17ba 100644 --- a/src/cljs/auto_ap/subs.cljs +++ b/src/cljs/auto_ap/subs.cljs @@ -14,6 +14,12 @@ (when (:user db) (vals (:companies db))))) +(re-frame/reg-sub + ::companies-by-id + (fn [db] + (when (:user db) + (:companies db)))) + (re-frame/reg-sub ::menu (fn [db] diff --git a/src/cljs/auto_ap/views/pages/admin/vendors.cljs b/src/cljs/auto_ap/views/pages/admin/vendors.cljs index bef7112a..c0fbd6ec 100644 --- a/src/cljs/auto_ap/views/pages/admin/vendors.cljs +++ b/src/cljs/auto_ap/views/pages/admin/vendors.cljs @@ -51,7 +51,9 @@ (defn edit-dialog [] - (let [editing-vendor (:vendor @(re-frame/subscribe [::subs/admin]))] + (let [editing-vendor (:vendor @(re-frame/subscribe [::subs/admin])) + companies-by-id @(re-frame/subscribe [::subs/companies-by-id])] + [:div.modal.is-active [:div.modal-background {:on-click (fn [] (re-frame/dispatch [::events/edit nil]))}] @@ -262,13 +264,13 @@ [:ul (for [[i r] (map vector (range) (:relationships editing-vendor))] ^{:key i} - [:li (:account-number r) - (:company-id r) + [:li + (:name (companies-by-id (js/parseInt (:company-id r)))) ": " + (:account-number r) [:a {:on-click (dispatch-event [::events/remove-relationship i])} [:span.icon - [:i.fa.fa-times]]]] - )]] + [:i.fa.fa-times]]]])]] (when (:saving? editing-vendor) [:div.is-overlay {:style {"backgroundColor" "rgba(150,150,150, 0.5)"}}])]