progress on new report
This commit is contained in:
@@ -3,13 +3,17 @@
|
||||
(:clj
|
||||
[(:require
|
||||
[auto-ap.time :as atime]
|
||||
[auto-ap.time-utils :refer [user-friendly-date]]
|
||||
[auto-ap.utils :refer [dollars-0?]]
|
||||
[clojure.string :as str])]
|
||||
[clojure.string :as str]
|
||||
[auto-ap.time-utils :refer [user-friendly-date]]
|
||||
)]
|
||||
:cljs
|
||||
[(:require
|
||||
[auto-ap.utils :refer [dollars-0?]]
|
||||
[auto-ap.views.utils :as au]
|
||||
[clojure.string :as str])]))
|
||||
[clojure.string :as str]
|
||||
[auto-ap.time-utils :refer [user-friendly-date]])]))
|
||||
|
||||
(defn date->str [d]
|
||||
#?(:clj
|
||||
@@ -551,4 +555,35 @@
|
||||
:rows table}))
|
||||
|
||||
|
||||
(defn journal-detail-report [args data client-codes]
|
||||
{:header [[{:value "Date"}
|
||||
{:value "Description"}
|
||||
{:value "Debit"}
|
||||
{:value "Credit"}
|
||||
{:value "Running Balance"}]]
|
||||
:rows (reduce
|
||||
(fn [rows category]
|
||||
(into rows
|
||||
(cons [{:value (str (client-codes (:client-id category)) " - " (:location category) " - " (name (:category category)) " - " (:name (:account category)) )
|
||||
|
||||
:colspan 5}]
|
||||
(map
|
||||
(fn [je]
|
||||
[{:value (user-friendly-date (:date je))}
|
||||
{:value (or (:description je)
|
||||
(:name (:vendor je)))}
|
||||
{:value (get-in je [:line-items 0 :debit])
|
||||
:format :dollar}
|
||||
{:value (get-in je [:line-items 0 :credit])
|
||||
:format :dollar}
|
||||
{:value (get-in je [:line-items 0 :running-balance])
|
||||
:format :dollar}])
|
||||
(:journal-entries category))))
|
||||
|
||||
)
|
||||
[]
|
||||
(:categories data))}
|
||||
)
|
||||
|
||||
|
||||
(defrecord PNLData [args data client-codes])
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
(ns auto-ap.time-utils
|
||||
(:require #?(:clj [clj-time.core :as time]
|
||||
:cljs [cljs-time.core :as time])))
|
||||
:cljs [cljs-time.core :as time])
|
||||
#?(:cljs [cljs-time.format :as format]
|
||||
:clj [clj-time.format :as format])))
|
||||
|
||||
(def pretty (format/formatter "MM/dd/yyyy"))
|
||||
|
||||
(defn user-friendly-date [d]
|
||||
(some->> d (format/unparse pretty)))
|
||||
|
||||
(defn next-dom [date dom]
|
||||
(when date
|
||||
|
||||
Reference in New Issue
Block a user