From bf7d0698d43d4e2dac1e8041334b3bb732f11582 Mon Sep 17 00:00:00 2001 From: BC Date: Fri, 6 Jul 2018 17:43:43 -0700 Subject: [PATCH] hides company when you've selected one. --- .../views/components/invoice_table.cljs | 25 +++++++++++------- src/cljs/auto_ap/views/pages/checks.cljs | 26 +++++++++++-------- .../auto_ap/views/pages/transactions.cljs | 24 +++++++++-------- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/src/cljs/auto_ap/views/components/invoice_table.cljs b/src/cljs/auto_ap/views/components/invoice_table.cljs index 496e46d3..0ded844d 100644 --- a/src/cljs/auto_ap/views/components/invoice_table.cljs +++ b/src/cljs/auto_ap/views/components/invoice_table.cljs @@ -59,6 +59,7 @@ (let [state (reagent/atom (or @params {})) visible-checks @(re-frame/subscribe [::visible-checks]) visible-expense-accounts @(re-frame/subscribe [::visible-expense-accounts]) + selected-company @(re-frame/subscribe [::subs/company]) opc (fn [p] (swap! state merge p) (on-params-change p))] @@ -66,8 +67,9 @@ (let [{:keys [sort-by asc]} @state {:keys [invoices start end count total]} @invoice-page visible-checks @(re-frame/subscribe [::visible-checks]) - visible-expense-accounts @(re-frame/subscribe [::visible-expense-accounts]) + selected-company @(re-frame/subscribe [::subs/company]) + percentage-size (if selected-company "%50%" "33%") ] [:div [paginator {:start start :end end :count count :total total @@ -80,20 +82,22 @@ [:tr (when check-boxes [:th {:style {"width" "20px"}}]) + + (when-not selected-company + [sorted-column {:on-sort opc + :style {:width percentage-size :cursor "pointer"} + :sort-key "company" + :sort-by sort-by + :asc asc} + "Company"]) [sorted-column {:on-sort opc - :style {:width "33%" :cursor "pointer"} + :style {:width percentage-size :cursor "pointer"} :sort-key "vendor" :sort-by sort-by :asc asc} "Vendor"] [sorted-column {:on-sort opc - :style {:width "33%" :cursor "pointer"} - :sort-key "company" - :sort-by sort-by - :asc asc} - "Company"] - [sorted-column {:on-sort opc - :style {:width "33%" :cursor "pointer"} + :style {:width percentage-size :cursor "pointer"} :sort-key "invoice-number" :sort-by sort-by :asc asc} @@ -145,8 +149,9 @@ "") :on-change (fn [x e] (when on-check-changed (on-check-changed id)))} ]]) + (when-not selected-company + [:td (:name company)]) [:td (:name vendor)] - [:td (:name company)] [:td invoice-number] [:td (date->str date) ] [:td (str/join ", " (set (map :location expense-accounts)))] diff --git a/src/cljs/auto_ap/views/pages/checks.cljs b/src/cljs/auto_ap/views/pages/checks.cljs index 532ddae8..f46a43e7 100644 --- a/src/cljs/auto_ap/views/pages/checks.cljs +++ b/src/cljs/auto_ap/views/pages/checks.cljs @@ -56,13 +56,15 @@ (defn check-table [{:keys [id check-page status on-params-change vendors params check-boxes checked on-check-changed expense-event]}] (let [state (reagent/atom (or @params {})) + selected-company @(re-frame/subscribe [::subs/company]) opc (fn [p] (swap! state merge p) (on-params-change p))] (fn [{:keys [id check-page status on-params-change vendors checked]}] - (println @check-page) (let [{:keys [sort-by asc]} @state - {:keys [checks start end count total]} @check-page] + {:keys [checks start end count total]} @check-page + selected-company @(re-frame/subscribe [::subs/company]) + percentage-size (if selected-company "50%" "33%")] [:div [paginator {:start start :end end :count count :total total :on-change (fn [p ] @@ -74,20 +76,21 @@ [:tr + (when-not selected-company + [sorted-column {:on-sort opc + :style {:width percentage-size :cursor "pointer"} + :sort-key "company" + :sort-by sort-by + :asc asc} + "Company"]) [sorted-column {:on-sort opc - :style {:width "33%" :cursor "pointer"} - :sort-key "company" - :sort-by sort-by - :asc asc} - "Company"] - [sorted-column {:on-sort opc - :style {:width "33%" :cursor "pointer"} + :style {:width percentage-size :cursor "pointer"} :sort-key "vendor" :sort-by sort-by :asc asc} "Vendor"] [sorted-column {:on-sort opc - :style {:width "33%" :cursor "pointer"} + :style {:width percentage-size :cursor "pointer"} :sort-key "invoice-number" :sort-by sort-by :asc asc} @@ -123,7 +126,8 @@ ^{:key id} [:tr {:class (:class i)} - [:td (:name company)] + (when-not selected-company + [:td (:name company)]) [:td (:name vendor)] [:td check-number] [:td (date->str date) ] diff --git a/src/cljs/auto_ap/views/pages/transactions.cljs b/src/cljs/auto_ap/views/pages/transactions.cljs index 27061e48..d58646dc 100644 --- a/src/cljs/auto_ap/views/pages/transactions.cljs +++ b/src/cljs/auto_ap/views/pages/transactions.cljs @@ -49,7 +49,6 @@ (re-frame/reg-event-db ::received (fn [db [_ data]] - (println data) (-> db (assoc ::transaction-page (first (:transaction-page data))) (assoc-in [:status :loading] false)))) @@ -65,9 +64,10 @@ (swap! state merge p) (on-params-change p))] (fn [{:keys [id transaction-page status on-params-change vendors checked]}] - (println @transaction-page) (let [{:keys [sort-by asc]} @state - {:keys [transactions start end count total]} @transaction-page] + {:keys [transactions start end count total]} @transaction-page + selected-company @(re-frame/subscribe [::subs/company]) + percentage-size (if selected-company "100%" "50%")] [:div [paginator {:start start :end end :count count :total total :on-change (fn [p ] @@ -77,15 +77,16 @@ [:table.table.is-fullwidth [:thead [:tr - [sorted-column {:on-sort opc - :style {:width "33%" :cursor "pointer"} - :sort-key "company" - :sort-by sort-by - :asc asc} - "Company"] + (when-not selected-company + [sorted-column {:on-sort opc + :style {:width percentage-size :cursor "pointer"} + :sort-key "company" + :sort-by sort-by + :asc asc} + "Company"]) [sorted-column {:on-sort opc - :style {:width "33%" :cursor "pointer"} + :style {:width percentage-size :cursor "pointer"} :sort-key "description-original" :sort-by sort-by :asc asc} @@ -121,7 +122,8 @@ ^{:key id} [:tr {:class (:class i)} - [:td (:name company)] + (when-not selected-company + [:td (:name company)]) [:td description-original] [:td (date->str date) ] [:td (gstring/format "$%.2f" amount )]