Adds default filtering and sorting
This commit is contained in:
@@ -790,9 +790,10 @@
|
|||||||
(:sort args)))
|
(:sort args)))
|
||||||
|
|
||||||
(defn apply-sort-3 [args results]
|
(defn apply-sort-3 [args results]
|
||||||
|
|
||||||
(let [sort-bys (conj (:sort args)
|
(let [sort-bys (conj (:sort args)
|
||||||
{:sort-key "default" :asc true})
|
{:sort-key "default" :asc (if (contains? args :default-asc?)
|
||||||
|
(:default-asc? args)
|
||||||
|
true)})
|
||||||
length (count sort-bys)
|
length (count sort-bys)
|
||||||
comparator (fn [xs ys]
|
comparator (fn [xs ys]
|
||||||
(reduce
|
(reduce
|
||||||
|
|||||||
@@ -95,7 +95,7 @@
|
|||||||
|
|
||||||
(cond->> query
|
(cond->> query
|
||||||
true (d/query)
|
true (d/query)
|
||||||
true (apply-sort-3 args)
|
true (apply-sort-3 (assoc args :default-asc? false))
|
||||||
true (apply-pagination args))))
|
true (apply-pagination args))))
|
||||||
|
|
||||||
(defn graphql-results [ids db args]
|
(defn graphql-results [ids db args]
|
||||||
|
|||||||
@@ -180,7 +180,7 @@
|
|||||||
(log/info "query is" query)
|
(log/info "query is" query)
|
||||||
(cond->> query
|
(cond->> query
|
||||||
true (d/query)
|
true (d/query)
|
||||||
true (apply-sort-3 args)
|
true (apply-sort-3 (assoc args :default-asc? false))
|
||||||
true (apply-pagination args)))))
|
true (apply-pagination args)))))
|
||||||
|
|
||||||
(defn graphql-results [ids db args]
|
(defn graphql-results [ids db args]
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
:as side-bar
|
:as side-bar
|
||||||
:refer [ledger-side-bar]]
|
:refer [ledger-side-bar]]
|
||||||
[auto-ap.views.pages.ledger.table :as table]
|
[auto-ap.views.pages.ledger.table :as table]
|
||||||
[auto-ap.views.utils :refer [with-user]]
|
[auto-ap.views.utils :refer [with-user date->str standard]]
|
||||||
|
[cljs-time.core :as time]
|
||||||
[clojure.set :as set]
|
[clojure.set :as set]
|
||||||
[re-frame.core :as re-frame]
|
[re-frame.core :as re-frame]
|
||||||
[reagent.core :as reagent]
|
[reagent.core :as reagent]
|
||||||
@@ -65,8 +66,10 @@
|
|||||||
|
|
||||||
(re-frame/reg-event-fx
|
(re-frame/reg-event-fx
|
||||||
::mounted
|
::mounted
|
||||||
(fn [_ _]
|
(fn [{:keys [db]} _]
|
||||||
{::track/register {:id ::params
|
{:db (assoc-in db [::data-page/settled-filters ::page :date-range] {:start (date->str (time/plus (time/now) (time/months -1))
|
||||||
|
standard)})
|
||||||
|
::track/register {:id ::params
|
||||||
:subscription [::data-page/params ::page]
|
:subscription [::data-page/params ::page]
|
||||||
:event-fn (fn [params] [::params-change params])}}))
|
:event-fn (fn [params] [::params-change params])}}))
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,8 @@
|
|||||||
[auto-ap.views.pages.data-page :as data-page]
|
[auto-ap.views.pages.data-page :as data-page]
|
||||||
[auto-ap.views.pages.payments.side-bar :as side-bar]
|
[auto-ap.views.pages.payments.side-bar :as side-bar]
|
||||||
[auto-ap.views.pages.payments.table :as table]
|
[auto-ap.views.pages.payments.table :as table]
|
||||||
[auto-ap.views.utils :refer [dispatch-event nf with-user]]
|
[auto-ap.views.utils :refer [dispatch-event nf with-user date->str standard]]
|
||||||
|
[cljs-time.core :as time]
|
||||||
[clojure.set :as set]
|
[clojure.set :as set]
|
||||||
[goog.string :as gstring]
|
[goog.string :as gstring]
|
||||||
[re-frame.core :as re-frame]
|
[re-frame.core :as re-frame]
|
||||||
@@ -63,8 +64,10 @@
|
|||||||
|
|
||||||
(re-frame/reg-event-fx
|
(re-frame/reg-event-fx
|
||||||
::mounted
|
::mounted
|
||||||
(fn [_ _]
|
(fn [{:keys [db]} _]
|
||||||
{::track/register {:id ::params
|
{:db (assoc-in db [::data-page/settled-filters ::page :date-range] {:start (date->str (time/plus (time/now) (time/months -1))
|
||||||
|
standard)})
|
||||||
|
::track/register {:id ::params
|
||||||
:subscription [::data-page/params ::page]
|
:subscription [::data-page/params ::page]
|
||||||
:event-fn (fn [params]
|
:event-fn (fn [params]
|
||||||
[::params-change params])}
|
[::params-change params])}
|
||||||
|
|||||||
@@ -1,12 +1,15 @@
|
|||||||
(ns auto-ap.views.pages.pos.sales-orders
|
(ns auto-ap.views.pages.pos.sales-orders
|
||||||
(:require [auto-ap.forms :as forms]
|
(:require
|
||||||
|
[auto-ap.forms :as forms]
|
||||||
[auto-ap.subs :as subs]
|
[auto-ap.subs :as subs]
|
||||||
[auto-ap.views.components.layouts :refer [side-bar-layout appearing-side-bar]]
|
[auto-ap.views.components.layouts
|
||||||
|
:refer [appearing-side-bar side-bar-layout]]
|
||||||
[auto-ap.views.pages.data-page :as data-page]
|
[auto-ap.views.pages.data-page :as data-page]
|
||||||
[auto-ap.views.pages.pos.form :as form]
|
[auto-ap.views.pages.pos.form :as form]
|
||||||
[auto-ap.views.pages.pos.side-bar :as side-bar]
|
[auto-ap.views.pages.pos.side-bar :as side-bar]
|
||||||
[auto-ap.views.pages.pos.table :as table]
|
[auto-ap.views.pages.pos.table :as table]
|
||||||
[auto-ap.views.utils :refer [with-user]]
|
[auto-ap.views.utils :refer [with-user standard date->str]]
|
||||||
|
[cljs-time.core :as time]
|
||||||
[clojure.set :as set]
|
[clojure.set :as set]
|
||||||
[re-frame.core :as re-frame]
|
[re-frame.core :as re-frame]
|
||||||
[reagent.core :as reagent]
|
[reagent.core :as reagent]
|
||||||
@@ -44,14 +47,16 @@
|
|||||||
|
|
||||||
(re-frame/reg-event-fx
|
(re-frame/reg-event-fx
|
||||||
::unmounted
|
::unmounted
|
||||||
(fn [{:keys [db]} _]
|
(fn [_ _]
|
||||||
{:dispatch [::data-page/dispose ::page]
|
{:dispatch [::data-page/dispose ::page]
|
||||||
::track/dispose {:id ::params}}))
|
::track/dispose {:id ::params}}))
|
||||||
|
|
||||||
(re-frame/reg-event-fx
|
(re-frame/reg-event-fx
|
||||||
::mounted
|
::mounted
|
||||||
(fn [{:keys [db]} _]
|
(fn [{:keys [db]} _]
|
||||||
{::track/register {:id ::params
|
{:db (assoc-in db [::data-page/settled-filters ::page :date-range] {:start (date->str (time/plus (time/now) (time/months -1))
|
||||||
|
standard)})
|
||||||
|
::track/register {:id ::params
|
||||||
:subscription [::data-page/params ::page]
|
:subscription [::data-page/params ::page]
|
||||||
:event-fn (fn [params]
|
:event-fn (fn [params]
|
||||||
[::params-change params])}}))
|
[::params-change params])}}))
|
||||||
|
|||||||
@@ -13,7 +13,8 @@
|
|||||||
[auto-ap.views.pages.transactions.bulk-updates :as bulk]
|
[auto-ap.views.pages.transactions.bulk-updates :as bulk]
|
||||||
[auto-ap.views.pages.transactions.side-bar :as side-bar]
|
[auto-ap.views.pages.transactions.side-bar :as side-bar]
|
||||||
[auto-ap.views.pages.transactions.table :as table]
|
[auto-ap.views.pages.transactions.table :as table]
|
||||||
[auto-ap.views.utils :refer [dispatch-event with-user]]
|
[auto-ap.views.utils :refer [dispatch-event with-user date->str standard]]
|
||||||
|
[cljs-time.core :as time]
|
||||||
[re-frame.core :as re-frame]
|
[re-frame.core :as re-frame]
|
||||||
[reagent.core :as reagent]
|
[reagent.core :as reagent]
|
||||||
[vimsical.re-frame.fx.track :as track]
|
[vimsical.re-frame.fx.track :as track]
|
||||||
@@ -97,8 +98,10 @@
|
|||||||
|
|
||||||
(re-frame/reg-event-fx
|
(re-frame/reg-event-fx
|
||||||
::mounted
|
::mounted
|
||||||
(fn [{:keys []} _]
|
(fn [{:keys [db]} _]
|
||||||
{::track/register {:id ::params
|
{:db (assoc-in db [::data-page/settled-filters ::page :date-range] {:start (date->str (time/plus (time/now) (time/months -1))
|
||||||
|
standard)})
|
||||||
|
::track/register {:id ::params
|
||||||
:subscription [::data-page/params ::page]
|
:subscription [::data-page/params ::page]
|
||||||
:event-fn (fn [params]
|
:event-fn (fn [params]
|
||||||
[::params-change params])}
|
[::params-change params])}
|
||||||
|
|||||||
Reference in New Issue
Block a user