diff --git a/resources/public/css/main.css b/resources/public/css/main.css index a7b48b70..b13fa95d 100644 --- a/resources/public/css/main.css +++ b/resources/public/css/main.css @@ -524,24 +524,24 @@ table.balance-sheet th.total { /* Below here is recent re-styling */ -.table.table { +.table.table.grid { border: 1px solid rgba(34,36,38,.15) !important; /* border: 2px solid red; */ border-collapse: separate; border-radius: 4px !important; } -.table.table td.collapsing, .table.table th.collapsing { +.table.table.grid td.collapsing, .table.table th.collapsing { white-space: nowrap; vertical-align: middle; } -.table.table th { +.table.table.grid th { background-color: #f9fafb; /* border: 1px solid rgba(34,36,38,.15) !important; */ } -.table.table thead tr:first-child>th:first-child { +.table.table.grid thead tr:first-child>th:first-child { border-radius: 4px 0px 0px 0px !important; } -.table.table thead tr:first-child>th:last-child { +.table.table.grid thead tr:first-child>th:last-child { border-radius: 0px 4px 0px 0px !important; } diff --git a/src/cljs/auto_ap/views/components/grid.cljs b/src/cljs/auto_ap/views/components/grid.cljs index afe810d6..1a1a36dc 100644 --- a/src/cljs/auto_ap/views/components/grid.cljs +++ b/src/cljs/auto_ap/views/components/grid.cljs @@ -121,8 +121,8 @@ (r/create-class {:reagent-render (fn [{:keys [fullwidth]}] (into - [:table.table.compact {:class (if fullwidth - ["is-fullwidth"])}] + [:table.table.compact.grid {:class (if fullwidth + ["is-fullwidth"])}] (r/children (r/current-component))))})) (defn header [] diff --git a/src/cljs/auto_ap/views/pages/ledger/profit_and_loss.cljs b/src/cljs/auto_ap/views/pages/ledger/profit_and_loss.cljs index 04680067..b8b07db4 100644 --- a/src/cljs/auto_ap/views/pages/ledger/profit_and_loss.cljs +++ b/src/cljs/auto_ap/views/pages/ledger/profit_and_loss.cljs @@ -25,6 +25,10 @@ ::report :periods (mapcat :accounts) + (group-by :location) + (filter (fn [[k as]] + (not (dollars-0? (reduce + 0 (map :amount as)))))) + (mapcat second) (map :location) (map not-empty) (filter #(not= "A" %))