Makes pnl work for companies with parenthesis
This commit is contained in:
@@ -293,6 +293,9 @@
|
||||
output-stream)
|
||||
(.toByteArray output-stream)))
|
||||
|
||||
(defn join-names [client-ids]
|
||||
(str/replace (->> client-ids (pull-many (dc/db conn) [:client/name]) (map :client/name) (str/join "-")) #"[^\w]" "_" ))
|
||||
|
||||
(defn pnl-args->name [args]
|
||||
(let [min-date (atime/unparse-local
|
||||
(->> args :periods (map :start) first)
|
||||
@@ -300,7 +303,7 @@
|
||||
max-date (atime/unparse-local
|
||||
(->> args :periods (map :end) last)
|
||||
atime/iso-date)
|
||||
names (str/replace (->> args :client_ids (pull-many (dc/db conn) [:client/name]) (map :client/name) (str/join "-")) #" " "_" )]
|
||||
names (->> args :client_ids join-names)]
|
||||
(format "Profit-and-loss-%s-to-%s-for-%s" min-date max-date names)))
|
||||
|
||||
(defn cash-flows-args->name [args]
|
||||
@@ -310,7 +313,7 @@
|
||||
max-date (atime/unparse-local
|
||||
(->> args :periods (map :end) last)
|
||||
atime/iso-date)
|
||||
names (str/replace (->> args :client_ids (pull-many (dc/db conn) [:client/name]) (map :client/name) (str/join "-")) #" " "_" )]
|
||||
names (->> args :client_ids join-names)]
|
||||
(format "Cash-flows-%s-to-%s-for-%s" min-date max-date names)))
|
||||
|
||||
(defn journal-detail-args->name [args]
|
||||
@@ -320,14 +323,14 @@
|
||||
max-date (atime/unparse-local
|
||||
(->> args :date_range :end)
|
||||
atime/iso-date)
|
||||
names (str/replace (->> args :client_ids (pull-many (dc/db conn) [:client/name]) (map :client/name) (str/join "-")) #" " "_" )]
|
||||
names (->> args :client_ids join-names)]
|
||||
(format "Profit-and-loss-%s-to-%s-for-%s" min-date max-date names)))
|
||||
|
||||
(defn balance-sheet-args->name [args]
|
||||
(let [date (atime/unparse-local
|
||||
(:date args)
|
||||
atime/iso-date)
|
||||
name (str/replace (->> args :client_ids (pull-many (dc/db conn) [:client/name]) (map :client/name) (str/join "-")) #" " "_" )]
|
||||
name (->> args :client_ids join-names)]
|
||||
(format "Balance-sheet-%s-for-%s" date name)))
|
||||
|
||||
(defn print-pnl [user args data]
|
||||
|
||||
Reference in New Issue
Block a user