Fix for sysco
This commit is contained in:
@@ -17,30 +17,40 @@
|
||||
(java.util UUID)))
|
||||
|
||||
(defn cell->pdf [cell]
|
||||
[:pdf-cell
|
||||
(cond-> {}
|
||||
(let [cell-contents (cond
|
||||
(and (= :dollar (:format cell))
|
||||
(dollars-0? (:value cell)))
|
||||
"-"
|
||||
|
||||
(:border cell) (assoc :border true
|
||||
:set-border (:border cell))
|
||||
(:colspan cell) (assoc :colspan (:colspan cell))
|
||||
(:align cell) (assoc :align (:align cell))
|
||||
(= :dollar (:format cell)) (assoc :align :right)
|
||||
(= :percent (:format cell)) (assoc :align :right)
|
||||
(:bold cell) (assoc-in [:ttf-name] "fonts/calibri-bold.ttf")
|
||||
(:color cell) (assoc :color (:color cell)))
|
||||
(cond
|
||||
(and (= :dollar (:format cell))
|
||||
(dollars-0? (:value cell)))
|
||||
"-"
|
||||
(= :dollar (:format cell))
|
||||
(.format (DecimalFormat. "$###,##0.00") (:value cell))
|
||||
|
||||
(= :dollar (:format cell))
|
||||
(.format (DecimalFormat. "$###,##0.00") (:value cell))
|
||||
(= :percent (:format cell))
|
||||
(.format (DecimalFormat. "0%") (:value cell))
|
||||
|
||||
(= :percent (:format cell))
|
||||
(.format (DecimalFormat. "0%") (:value cell))
|
||||
:else
|
||||
(str (:value cell)))
|
||||
cell-contents (if (:filters cell)
|
||||
(do
|
||||
(println (:filters cell))
|
||||
cell-contents)
|
||||
|
||||
|
||||
:else
|
||||
(str (:value cell)))])
|
||||
cell-contents)]
|
||||
[:pdf-cell
|
||||
(cond-> {}
|
||||
|
||||
(:border cell) (assoc :border true
|
||||
:set-border (:border cell))
|
||||
(:colspan cell) (assoc :colspan (:colspan cell))
|
||||
(:align cell) (assoc :align (:align cell))
|
||||
(= :dollar (:format cell)) (assoc :align :right)
|
||||
(= :percent (:format cell)) (assoc :align :right)
|
||||
(:bold cell) (assoc-in [:ttf-name] "fonts/calibri-bold.ttf")
|
||||
(:color cell) (assoc :color (:color cell)))
|
||||
|
||||
cell-contents
|
||||
]))
|
||||
|
||||
(defn cell-count [table]
|
||||
(let [counts (map count (:rows table))]
|
||||
@@ -212,5 +222,4 @@
|
||||
:report/key key
|
||||
:report/url url
|
||||
:report/created (java.util.Date.)}])
|
||||
url
|
||||
))
|
||||
url))
|
||||
|
||||
Reference in New Issue
Block a user