report updates for nick the greek.

This commit is contained in:
2022-05-12 16:34:07 -07:00
parent e8f1a0d734
commit 11722415fc
6 changed files with 29 additions and 20 deletions

View File

@@ -150,7 +150,7 @@
args (assoc args
:periods (filter identity (cond-> [(:date args)]
(:include-comparison args) (conj (:comparison-date args)))))
clients (d/pull-many (d/db conn) '[:client/name :db/id] [(:client-id args)])
clients (d/pull-many (d/db conn) '[:client/code :client/name :db/id] [(:client-id args)])
data (concat (->> (:balance-sheet-accounts data)
(map (fn [b]
(assoc b
@@ -159,7 +159,7 @@
(map (fn [b]
(assoc b
:period (:comparison-date args))))))
pnl-data (l-reports/->PNLData args data (by :db/id clients))
pnl-data (l-reports/->PNLData args data (by :db/id :client/code clients))
report (l-reports/summarize-balance-sheet pnl-data)
output-stream (ByteArrayOutputStream.)]
(log/info report)
@@ -181,7 +181,7 @@
(let [data (<-graphql data)
args (<-graphql args)
clients (d/pull-many (d/db conn) '[:client/name :db/id] (:client-ids args))
clients (d/pull-many (d/db conn) '[:client/code :client/name :db/id] (:client-ids args))
data (->> data
:periods
(mapcat (fn [p1 p2]
@@ -192,7 +192,7 @@
(:accounts p2))
)
(:periods args)))
pnl-data (l-reports/->PNLData args data (by :db/id clients))
pnl-data (l-reports/->PNLData args data (by :db/id :client/code clients))
report (l-reports/summarize-pnl pnl-data)
output-stream (ByteArrayOutputStream.)]
(pdf/pdf