From eda61593d839d1d0e78ec89294932715eb34703b Mon Sep 17 00:00:00 2001 From: Bryce Date: Fri, 8 Nov 2024 12:42:53 -0800 Subject: [PATCH] other query fix --- iol_ion/src/iol_ion/query.clj | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/iol_ion/src/iol_ion/query.clj b/iol_ion/src/iol_ion/query.clj index e02495b1..58a04c32 100644 --- a/iol_ion/src/iol_ion/query.clj +++ b/iol_ion/src/iol_ion/query.clj @@ -196,9 +196,35 @@ (let [^java.util.Date d (.-date l)] (<= (.compareTo ^java.util.Date d end) 0)))) last) ] - :when (.-id z)] + :when (and z (.-id z))] [(.-client-id z) (.-account-id z) (.-location z) (.-date z) (.-running-balance z)])) +#_(doseq [[ n] (dc/q '[:find ?cd :where [?c :client/code ?cd] [?c :client/groups "NTG"]] (dc/db auto-ap.datomic/conn))] + (println n) + (dc/q '[:find ?code ?name ?afc ?an ?l ?d2 ?balance + :in $ ?end ?group + :where + [(clj-time.coerce/to-date-time ?end) ?end2] + [(iol-ion.query/localize ?end2) ?end3] + [(clj-time.coerce/to-date ?end3) ?end4] + (or + [?c :client/groups ?group] + [?c :client/code ?group]) + [?c :client/name ?name] + [?c :client/code ?code] + [?c :client/bank-accounts ?b] + [(iol-ion.query/account-snapshot $ ?c ?end4) [?x ...]] + [(untuple ?x) [_ ?a ?l ?date ?balance]] + [(not= nil ?a)] + [(iol-ion.query/excel-date ?date) ?d2] + (or-join [?a ?afc ?an] + (and [?a :account/name ?an] + [?a :account/numeric-code ?afc]) + (and [?a :bank-account/name ?an] + [?a :bank-account/numeric-code ?afc]))] + (dc/db auto-ap.datomic/conn) + #inst "2024-10-10" n)) + (defn detailed-account-snapshot [db client-id ^java.util.Date end] (for [running-balance-set (account-sets db client-id) :let [{:keys [account-id client-id location current-balance debits credits count]}