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

Adds default filtering and sorting

Browse Source
This commit is contained in:
Bryce Covert
2022-07-11 08:13:15 -07:00
parent d132599567
commit 6ae5e624d8
7 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/clj/auto_ap/datomic.clj
View File

@@ -790,9 +790,10 @@
(:sort args)))
(defn apply-sort-3 [args results]
(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)
comparator (fn [xs ys]
(reduce

2
src/clj/auto_ap/datomic/sales_orders.clj
View File

@@ -95,7 +95,7 @@
(cond->> query
true (d/query)
true (apply-sort-3 args)
true (apply-sort-3 (assoc args :default-asc? false))
true (apply-pagination args))))
(defn graphql-results [ids db args]

2
src/clj/auto_ap/datomic/transactions.clj
View File

@@ -180,7 +180,7 @@
(log/info "query is" query)
(cond->> query
true (d/query)
true (apply-sort-3 args)
true (apply-sort-3 (assoc args :default-asc? false))
true (apply-pagination args)))))
(defn graphql-results [ids db args]

9
src/cljs/auto_ap/views/pages/ledger.cljs
View File

@@ -7,7 +7,8 @@
:as side-bar
:refer [ledger-side-bar]]
[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]
[re-frame.core :as re-frame]
[reagent.core :as reagent]
@@ -65,8 +66,10 @@
(re-frame/reg-event-fx
::mounted
(fn [_ _]
{::track/register {:id ::params
(fn [{:keys [db]} _]
{: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]
:event-fn (fn [params] [::params-change params])}}))

9
src/cljs/auto_ap/views/pages/payments.cljs
View File

@@ -8,7 +8,8 @@
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.pages.payments.side-bar :as side-bar]
[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]
[goog.string :as gstring]
[re-frame.core :as re-frame]
@@ -63,8 +64,10 @@
(re-frame/reg-event-fx
::mounted
(fn [_ _]
{::track/register {:id ::params
(fn [{:keys [db]} _]
{: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]
:event-fn (fn [params]
[::params-change params])}

33
src/cljs/auto_ap/views/pages/pos/sales_orders.cljs
View File

@@ -1,16 +1,19 @@
(ns auto-ap.views.pages.pos.sales-orders
(:require [auto-ap.forms :as forms]
[auto-ap.subs :as subs]
[auto-ap.views.components.layouts :refer [side-bar-layout appearing-side-bar]]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.pages.pos.form :as form]
[auto-ap.views.pages.pos.side-bar :as side-bar]
[auto-ap.views.pages.pos.table :as table]
[auto-ap.views.utils :refer [with-user]]
[clojure.set :as set]
[re-frame.core :as re-frame]
[reagent.core :as reagent]
[vimsical.re-frame.fx.track :as track]))
(:require
[auto-ap.forms :as forms]
[auto-ap.subs :as subs]
[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.pos.form :as form]
[auto-ap.views.pages.pos.side-bar :as side-bar]
[auto-ap.views.pages.pos.table :as table]
[auto-ap.views.utils :refer [with-user standard date->str]]
[cljs-time.core :as time]
[clojure.set :as set]
[re-frame.core :as re-frame]
[reagent.core :as reagent]
[vimsical.re-frame.fx.track :as track]))
(re-frame/reg-event-fx
::params-change
@@ -44,14 +47,16 @@
(re-frame/reg-event-fx
::unmounted
(fn [{:keys [db]} _]
(fn [_ _]
{:dispatch [::data-page/dispose ::page]
::track/dispose {:id ::params}}))
(re-frame/reg-event-fx
::mounted
(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]
:event-fn (fn [params]
[::params-change params])}}))

9
src/cljs/auto_ap/views/pages/transactions.cljs
View File

@@ -13,7 +13,8 @@
[auto-ap.views.pages.transactions.bulk-updates :as bulk]
[auto-ap.views.pages.transactions.side-bar :as side-bar]
[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]
[reagent.core :as reagent]
[vimsical.re-frame.fx.track :as track]
@@ -97,8 +98,10 @@
(re-frame/reg-event-fx
::mounted
(fn [{:keys []} _]
{::track/register {:id ::params
(fn [{:keys [db]} _]
{: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]
:event-fn (fn [params]
[::params-change params])}