hides company when you've selected one.

This commit is contained in:
BC
2018-07-06 17:43:43 -07:00
parent f232ca264c
commit bf7d0698d4
3 changed files with 43 additions and 32 deletions

View File

@@ -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)))]