fixed warnings.
This commit is contained in:
@@ -1,31 +1,27 @@
|
||||
(ns auto-ap.views.pages.ledger.balance-sheet
|
||||
(:require
|
||||
[auto-ap.forms :as forms]
|
||||
[auto-ap.forms.builder :as form-builder]
|
||||
[auto-ap.ledger.reports :as l-reports]
|
||||
[auto-ap.status :as status]
|
||||
[clojure.string :as str]
|
||||
[auto-ap.subs :as subs]
|
||||
[auto-ap.views.components.modal :as modal]
|
||||
[auto-ap.views.components :as com]
|
||||
[auto-ap.views.components.layouts
|
||||
:refer [appearing-side-bar side-bar-layout]]
|
||||
[auto-ap.views.components.switch-field :refer [switch-field]]
|
||||
[auto-ap.views.components.modal :as modal]
|
||||
[auto-ap.views.pages.data-page :as data-page]
|
||||
[auto-ap.views.pages.ledger.report-table :as rtable]
|
||||
[auto-ap.views.pages.ledger.side-bar :refer [ledger-side-bar]]
|
||||
[auto-ap.views.pages.ledger.table :as ledger-table]
|
||||
[auto-ap.views.utils
|
||||
:refer [date-picker
|
||||
dispatch-event
|
||||
local-now
|
||||
with-user]]
|
||||
:refer [date-picker dispatch-event local-now with-user]]
|
||||
[cljs-time.core :as t]
|
||||
[clojure.set :as set]
|
||||
[clojure.string :as str]
|
||||
[re-frame.core :as re-frame]
|
||||
[reagent.core :as reagent]
|
||||
[vimsical.re-frame.fx.track :as track]
|
||||
[vimsical.re-frame.cofx.inject :as inject]
|
||||
[auto-ap.views.pages.ledger.report-table :as rtable]
|
||||
[auto-ap.forms.builder :as form-builder]
|
||||
[auto-ap.views.components :as com]))
|
||||
[vimsical.re-frame.fx.track :as track]))
|
||||
|
||||
(defn data-params->query-params [params]
|
||||
(when params
|
||||
|
||||
@@ -119,10 +119,9 @@
|
||||
|
||||
;; COMPONENTS
|
||||
|
||||
(defn textarea->table [{:keys [headings value on-change read-only-headings]} & children]
|
||||
(defn textarea->table [{:keys [read-only-headings]} & children]
|
||||
(let [text-form (r/atom "")
|
||||
include-headers (r/atom true)
|
||||
table-form (r/atom nil)]
|
||||
include-headers (r/atom true)]
|
||||
(fn [{:keys [headings value on-change row-filter]}]
|
||||
[:div
|
||||
(when (> (count value) 2000)
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
(re-frame/reg-event-fx
|
||||
::params-change
|
||||
[with-user]
|
||||
(fn [{:keys [user db]} [_ params]]
|
||||
(fn [{:keys [user]} [_ params]]
|
||||
{:graphql {:token user
|
||||
:owns-state {:single [::data-page/page ::page]}
|
||||
:query-obj {:venia/queries [[:ledger-page
|
||||
@@ -63,21 +63,21 @@
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::unmounted
|
||||
(fn [{:keys [db]} _]
|
||||
(fn [_ _]
|
||||
{:dispatch-n [[::data-page/dispose ::page]
|
||||
[::status/dispose-single ::delete-selected]]
|
||||
::track/dispose {:id ::params}}))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::mounted
|
||||
(fn [{:keys [db]} _]
|
||||
(fn [_ _]
|
||||
{::track/register {:id ::params
|
||||
:subscription [::data-page/params ::page]
|
||||
:event-fn (fn [params] [::params-change params])}}))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::delete-successful
|
||||
(fn [cofx [_ result params]]
|
||||
(fn [_ [_ result params]]
|
||||
{:dispatch-n [[::params-change params]
|
||||
[::status/info ::delete-selected (:message (:delete-external-ledger result))]]}))
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
[::delete-successful result params])}})))
|
||||
|
||||
(defn ledger-content []
|
||||
(let [current-client @(re-frame/subscribe [::subs/client])
|
||||
(let [_ @(re-frame/subscribe [::subs/client])
|
||||
params @(re-frame/subscribe [::data-page/params ::page])
|
||||
checked @(re-frame/subscribe [::data-page/checked ::page])]
|
||||
[:div
|
||||
|
||||
@@ -1,16 +1,12 @@
|
||||
(ns auto-ap.views.pages.ledger.external-ledger-table
|
||||
(:require [auto-ap.subs :as subs]
|
||||
[auto-ap.views.components.paginator :refer [paginator]]
|
||||
[auto-ap.views.components.sorter :refer [sorted-column]]
|
||||
[auto-ap.views.components.sort-by-list :refer [sort-by-list]]
|
||||
[auto-ap.views.utils :refer [date->str dispatch-event nf]]
|
||||
[goog.string :as gstring]
|
||||
[re-frame.core :as re-frame]
|
||||
[auto-ap.views.components.grid :as grid]
|
||||
[auto-ap.views.pages.data-page :as data-page]))
|
||||
(:require
|
||||
[auto-ap.subs :as subs]
|
||||
[auto-ap.views.components.grid :as grid]
|
||||
[auto-ap.views.pages.data-page :as data-page]
|
||||
[auto-ap.views.utils :refer [date->str nf]]
|
||||
[re-frame.core :as re-frame]))
|
||||
|
||||
|
||||
(defn external-ledger-row [{{:keys [client vendor alternate-description status date amount id source external-id line-items] :as i} :row
|
||||
(defn external-ledger-row [{{:keys [client vendor alternate-description date amount id source external-id line-items] :as i} :row
|
||||
:keys [selected-client bank-accounts-by-id]}]
|
||||
[:<>
|
||||
[grid/row {:class (:class i) :id id :checkable? true :entity i}
|
||||
@@ -46,8 +42,8 @@
|
||||
[grid/cell {:class "has-text-right"} (when debit (nf debit ))]
|
||||
[grid/cell {:class "has-text-right"} (when credit (nf credit ))]])]])
|
||||
|
||||
(defn table [{:keys [id data-page status vendors on-check-changed expense-event]}]
|
||||
(let [{:keys [data status params]} @(re-frame/subscribe [::data-page/page data-page])
|
||||
(defn table [{:keys [data-page]}]
|
||||
(let [{:keys [data params]} @(re-frame/subscribe [::data-page/page data-page])
|
||||
selected-client @(re-frame/subscribe [::subs/client])
|
||||
bank-accounts-by-id @(re-frame/subscribe [::subs/bank-accounts-by-id])]
|
||||
[grid/grid {:data-page data-page
|
||||
@@ -68,7 +64,7 @@
|
||||
[grid/sortable-header-cell {:sort-key "amount" :sort-name "Amount" :class "has-text-right" :style {:width "7em"}} "Debit"]
|
||||
[grid/sortable-header-cell {:sort-key "amount" :sort-name "Amount" :class "has-text-right" :style {:width "7em"}} "Credit"]]]
|
||||
[grid/body
|
||||
(for [{:keys [client vendor status date amount id line-items] :as i} (:data data)]
|
||||
(for [{:keys [id] :as i} (:data data)]
|
||||
^{:key id}
|
||||
[external-ledger-row {:row i
|
||||
:selected-client selected-client
|
||||
|
||||
@@ -254,7 +254,7 @@ NOTE: Please review the transactions we may have question for you here: https://
|
||||
active (reagent/atom nil)]
|
||||
(fn []
|
||||
(let [{:keys [data]} @(re-frame/subscribe [::forms/form ::form])
|
||||
{:keys [periods selected-preset include-deltas column-per-location]} data]
|
||||
{:keys [selected-preset include-deltas column-per-location]} data]
|
||||
[form-builder/builder {:can-submit [::can-submit]
|
||||
:change-event [::change]
|
||||
:submit-event [::report-requested]
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
(ns auto-ap.views.pages.ledger.report-table
|
||||
(:require
|
||||
[auto-ap.utils :refer [dollars-0?]]
|
||||
[clojure.string :as str]
|
||||
[auto-ap.views.utils :refer [->$ ->% dispatch-event]]))
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
:refer [bank-account-filter]]
|
||||
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
|
||||
[auto-ap.views.components.number-filter :refer [number-filter]]
|
||||
[auto-ap.views.components.typeahead :refer [typeahead-v3]]
|
||||
[auto-ap.views.components.typeahead.vendor
|
||||
:refer [search-backed-typeahead]]
|
||||
[auto-ap.views.pages.data-page :as data-page]
|
||||
|
||||
Reference in New Issue
Block a user