notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

finally sunset old binding

Browse Source
This commit is contained in:
Bryce Covert
2022-07-23 10:17:41 -07:00
parent 03b5846d82
commit 3628f1e018
12 changed files with 159 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/cljs/auto_ap/views/components/date_range_filter.cljs
View File

@@ -1,55 +1,51 @@
(ns auto-ap.views.components.date-range-filter
(:require
[auto-ap.views.utils :refer [bind-field date-picker date->str local-now standard]]
[auto-ap.views.utils :refer [date-picker date->str local-now standard]]
[cljs-time.core :as t]
[re-frame.core :as re-frame]))
[re-frame.core :as re-frame]
[auto-ap.forms.builder :as form-builder]))
(defn dispatch-change [on-change-event start end]
(fn [_]
(re-frame/dispatch (into on-change-event [[:start] start]) )
(re-frame/dispatch (into on-change-event [[:end] end]))))
(defn set-value [on-change-event v]
(re-frame/dispatch (conj on-change-event v)))
(defn date-range-filter [{:keys [value on-change-event]}]
[:div
[:div.field.has-addons
[:p.control [:a.button.is-small {:on-click
(dispatch-change on-change-event
(date->str (t/minus (local-now) (t/period :days 7)) standard)
(date->str (local-now) standard))}
"Week" ]]
[:p.control [:a.button.is-small {:on-click
(dispatch-change on-change-event
(date->str (t/minus (local-now) (t/period :months 1)) standard)
(date->str (local-now) standard))}
"Month" ]]
[:p.control [:a.button.is-small {:on-click
(dispatch-change on-change-event
(date->str (t/minus (local-now) (t/period :years 1)) standard)
(date->str (local-now) standard))}
"Year"]]
[:p.control [:a.button.is-small {:on-click
(dispatch-change on-change-event
nil
nil)}
"All"]]]
[:div.field.has-addons
[:div.control
[bind-field
[date-picker
{:event on-change-event
:type "date"
:placeholder "Start"
:class "is-small"
:field [:start]
:subscription value
:output :text}]]]
[:div.control
[bind-field
[date-picker
{:event on-change-event
:type "date"
:class "is-small"
:placeholder "End"
:field [:end]
:subscription value
:output :text}]]]]])
[form-builder/virtual-builder {:value (or value {})
:on-change (fn [v]
(set-value on-change-event v))}
[:div
[:div.field.has-addons
[:p.control [:a.button.is-small {:on-click
#(set-value on-change-event
{:start (date->str (t/minus (local-now) (t/period :days 7)) standard)
:end (date->str (local-now) standard)})}
"Week" ]]
[:p.control [:a.button.is-small {:on-click
#(set-value on-change-event
{:start (date->str (t/minus (local-now) (t/period :months 1)) standard)
:end (date->str (local-now) standard)})}
"Month" ]]
[:p.control [:a.button.is-small {:on-click
#(set-value on-change-event
{:start (date->str (t/minus (local-now) (t/period :years 1)) standard)
:end (date->str (local-now) standard)})}
"Year"]]
[:p.control [:a.button.is-small {:on-click
#(set-value on-change-event nil)}
"All"]]]
[:div.field.has-addons
[:div.control
[form-builder/raw-field-v2 {:field :start}
[date-picker
{:placeholder "Start"
:class "is-small"
:output :text}]]]
[:div.control
[form-builder/raw-field-v2 {:field :end}
[date-picker
{:class "is-small"
:placeholder "End"
:output :text}]]]]]])

38
src/cljs/auto_ap/views/components/number_filter.cljs
View File

@@ -1,25 +1,21 @@
(ns auto-ap.views.components.number-filter
(:require
[auto-ap.views.utils :refer [bind-field]]
[re-frame.core :as re-frame]))
[re-frame.core :as re-frame]
[auto-ap.forms.builder :as form-builder]
[auto-ap.views.components :as com]))
(defn number-filter [{:keys [value on-change-event]}]
[:div.field
[:div.control
[:div.columns
[:div.column
[bind-field
[:input.input {:type "number"
:placeholder ">="
:field [:amount-gte]
:step "0.01"
:event on-change-event
:subscription value}]]]
[:div.column
[bind-field
[:input.input {:type "number"
:placeholder "<="
:field [:amount-lte]
:event on-change-event
:step "0.01"
:subscription value}]]]]]])
[form-builder/virtual-builder {:value (or value {})
:on-change (fn [v]
(re-frame/dispatch (conj on-change-event v)))}
[:div.columns
[:div.column
[:div.control
[form-builder/raw-field-v2 {:field :amount-gte}
[com/money-input {:placeholder ">="}]]]]
[:div.column
[:div.control
[form-builder/raw-field-v2 {:field :amount-lte}
[com/money-input {:placeholder "<="}]]]]]]
)

16
src/cljs/auto_ap/views/components/vendor_dialog.cljs
View File

@@ -1,29 +1,25 @@
(ns auto-ap.views.components.vendor-dialog
(:require
[auto-ap.entities.contact :as contact]
[auto-ap.entities.vendors :as entity]
[auto-ap.forms :as forms]
[auto-ap.forms.builder :as form-builder]
[auto-ap.schema :as schema]
[auto-ap.status :as status]
[auto-ap.views.components.level :refer [left-stack]]
[auto-ap.subs :as subs]
[auto-ap.views.components :as com]
[auto-ap.views.components.address :refer [address2-field]]
[auto-ap.views.components.level :refer [left-stack]]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.components.multi :refer [multi-field-v2]]
[auto-ap.views.components.number :refer [number-input]]
[auto-ap.views.components.typeahead :refer [typeahead-v3]]
[auto-ap.views.components.typeahead.vendor
:refer [search-backed-typeahead]]
[auto-ap.views.pages.admin.vendors.common :as common]
[auto-ap.views.components.multi :refer [multi-field-v2]]
[auto-ap.views.utils
:refer [dispatch-event multi-field str->int with-is-admin? with-user]]
[clojure.spec.alpha :as s]
[re-frame.core :as re-frame]
[reagent.core :as r]
:refer [dispatch-event str->int with-is-admin? with-user]]
[malli.core :as m]
[auto-ap.schema :as schema]
[malli.error :as me]))
[re-frame.core :as re-frame]
[reagent.core :as r]))
;; Remaining cleanup todos:
;; test minification