date-choosing
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -333,7 +333,8 @@
|
|||||||
|
|
||||||
(iol-ion.tx.upsert-sales-summary-ledger/upsert-sales-summary (dc/db conn) {:db/id 17592314241429})
|
(iol-ion.tx.upsert-sales-summary-ledger/upsert-sales-summary (dc/db conn) {:db/id 17592314241429})
|
||||||
|
|
||||||
(mark-all-dirty 5)
|
(mark-all-dirty 14)
|
||||||
|
|
||||||
(delete-all)
|
(delete-all)
|
||||||
|
|
||||||
(sales-summaries-v2)
|
(sales-summaries-v2)
|
||||||
|
|||||||
@@ -11,10 +11,10 @@
|
|||||||
[auto-ap.routes.transactions :as transaction-routes]
|
[auto-ap.routes.transactions :as transaction-routes]
|
||||||
[auto-ap.ssr-routes :as ssr-routes]
|
[auto-ap.ssr-routes :as ssr-routes]
|
||||||
[auto-ap.ssr.components :as com]
|
[auto-ap.ssr.components :as com]
|
||||||
|
[auto-ap.ssr.components.date-range :as dr]
|
||||||
[auto-ap.ssr.components.link-dropdown :refer [link-dropdown]]
|
[auto-ap.ssr.components.link-dropdown :refer [link-dropdown]]
|
||||||
[auto-ap.ssr.grid-page-helper :as helper]
|
[auto-ap.ssr.grid-page-helper :as helper]
|
||||||
[auto-ap.ssr.hx :as hx]
|
[auto-ap.ssr.hx :as hx]
|
||||||
[auto-ap.ssr.pos.common :refer [date-range-field*]]
|
|
||||||
[auto-ap.ssr.svg :as svg]
|
[auto-ap.ssr.svg :as svg]
|
||||||
[auto-ap.ssr.utils
|
[auto-ap.ssr.utils
|
||||||
:refer [clj-date-schema entity-id html-response ref->enum-schema
|
:refer [clj-date-schema entity-id html-response ref->enum-schema
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
(defn exact-match-id* [request]
|
(defn exact-match-id* [request]
|
||||||
(if (nat-int? (:exact-match-id (:query-params request)))
|
(if (nat-int? (:exact-match-id (:query-params request)))
|
||||||
[:div {:x-data (hx/json {:exact_match (:exact-match-id (:query-params request))}) :id "exact-match-id-tag"}
|
[:div {:x-data (hx/json {:exact_match (:exact-match-id (:query-params request))}) :id "exact-match-id-tag" :class "filter-trigger"}
|
||||||
(com/hidden {:name "exact-match-id"
|
(com/hidden {:name "exact-match-id"
|
||||||
"x-model" "exact_match"})
|
"x-model" "exact_match"})
|
||||||
(com/pill {:color :primary}
|
(com/pill {:color :primary}
|
||||||
@@ -46,7 +46,8 @@
|
|||||||
[:div {:hx-trigger "clientSelected from:body"
|
[:div {:hx-trigger "clientSelected from:body"
|
||||||
:hx-get (bidi.bidi/path-for ssr-routes/only-routes ::route/bank-account-filter)
|
:hx-get (bidi.bidi/path-for ssr-routes/only-routes ::route/bank-account-filter)
|
||||||
:hx-target "this"
|
:hx-target "this"
|
||||||
:hx-swap "outerHTML"}
|
:hx-swap "outerHTML"
|
||||||
|
:class "filter-trigger"}
|
||||||
(when (:client request)
|
(when (:client request)
|
||||||
(let [bank-account-belongs-to-client? (get (set (map :db/id (:client/bank-accounts (:client request))))
|
(let [bank-account-belongs-to-client? (get (set (map :db/id (:client/bank-accounts (:client request))))
|
||||||
(:db/id (:bank-account (:query-params request))))]
|
(:db/id (:bank-account (:query-params request))))]
|
||||||
@@ -67,7 +68,7 @@
|
|||||||
(html-response (bank-account-filter* request)))
|
(html-response (bank-account-filter* request)))
|
||||||
|
|
||||||
(defn filters [request]
|
(defn filters [request]
|
||||||
[:form#ledger-filters {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
|
[:form#ledger-filters {"hx-trigger" "datesApplied, change delay:500ms from:.filter-trigger, keyup changed from:.hot-filter delay:1000ms"
|
||||||
"hx-get" (bidi/path-for ssr-routes/only-routes
|
"hx-get" (bidi/path-for ssr-routes/only-routes
|
||||||
::route/table)
|
::route/table)
|
||||||
"hx-target" "#entity-table"
|
"hx-target" "#entity-table"
|
||||||
@@ -82,7 +83,8 @@
|
|||||||
:url (bidi/path-for ssr-routes/only-routes :vendor-search)
|
:url (bidi/path-for ssr-routes/only-routes :vendor-search)
|
||||||
:value (:vendor (:query-params request))
|
:value (:vendor (:query-params request))
|
||||||
:value-fn :db/id
|
:value-fn :db/id
|
||||||
:content-fn :vendor/name}))
|
:content-fn :vendor/name
|
||||||
|
:class "filter-trigger"}))
|
||||||
(com/field {:label "Account"}
|
(com/field {:label "Account"}
|
||||||
(com/typeahead {:name "account"
|
(com/typeahead {:name "account"
|
||||||
:id "account"
|
:id "account"
|
||||||
@@ -90,11 +92,15 @@
|
|||||||
:value (:account (:query-params request))
|
:value (:account (:query-params request))
|
||||||
:value-fn :db/id
|
:value-fn :db/id
|
||||||
:content-fn #(:account/name (d-accounts/clientize (dc/pull (dc/db conn) d-accounts/default-read (:db/id %))
|
:content-fn #(:account/name (d-accounts/clientize (dc/pull (dc/db conn) d-accounts/default-read (:db/id %))
|
||||||
(:db/id (:client request))))}))
|
(:db/id (:client request))))
|
||||||
|
:class "filter-trigger"}))
|
||||||
|
|
||||||
(bank-account-filter* request)
|
(bank-account-filter* request)
|
||||||
|
|
||||||
(date-range-field* request)
|
(dr/date-range-field {:value {:start (:start-date (:query-params request))
|
||||||
|
:end (:end-date (:query-params request))}
|
||||||
|
:id "date-range"
|
||||||
|
:apply-button? true})
|
||||||
(com/field {:label "Invoice #"}
|
(com/field {:label "Invoice #"}
|
||||||
(com/text-input {:name "invoice-number"
|
(com/text-input {:name "invoice-number"
|
||||||
:id "invoice-number"
|
:id "invoice-number"
|
||||||
@@ -144,6 +150,7 @@
|
|||||||
(com/hidden {:name "only-unbalanced"
|
(com/hidden {:name "only-unbalanced"
|
||||||
":value" "onlyUnbalanced ? 'on' : ''"})
|
":value" "onlyUnbalanced ? 'on' : ''"})
|
||||||
(com/checkbox {:value (:only-unbalanced (:query-params request))
|
(com/checkbox {:value (:only-unbalanced (:query-params request))
|
||||||
|
:class "filter-trigger"
|
||||||
:x-model "onlyUnbalanced"}
|
:x-model "onlyUnbalanced"}
|
||||||
"Show unbalanced")]
|
"Show unbalanced")]
|
||||||
(exact-match-id* request)]])
|
(exact-match-id* request)]])
|
||||||
@@ -468,7 +475,10 @@
|
|||||||
:fetch-page fetch-page
|
:fetch-page fetch-page
|
||||||
:oob-render
|
:oob-render
|
||||||
(fn [request]
|
(fn [request]
|
||||||
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)
|
[(assoc-in (dr/date-range-field {:value {:start (:start-date (:query-params request))
|
||||||
|
:end (:end-date (:query-params request))}
|
||||||
|
:id "date-range"
|
||||||
|
:apply-button? true}) [1 :hx-swap-oob] true)
|
||||||
(assoc-in (exact-match-id* request) [1 :hx-swap-oob] true)])
|
(assoc-in (exact-match-id* request) [1 :hx-swap-oob] true)])
|
||||||
:query-schema query-schema
|
:query-schema query-schema
|
||||||
:action-buttons (fn [request]
|
:action-buttons (fn [request]
|
||||||
|
|||||||
Reference in New Issue
Block a user