Add vendor pre-population for bulk code and individual edit forms
- Add vendor-changed HTMX handlers for both bulk code and individual edit - Pre-populate default account at 100% when vendor is selected and no accounts exist - Fix render-accounts-section to render from step-params correctly - Change bulk code vendor-changed from hx-get to hx-post to include form data - Add routes for vendor-changed endpoints - Update e2e tests to cover vendor pre-population - Run lein cljfmt fix across codebase
This commit is contained in:
@@ -6,42 +6,38 @@
|
||||
[clojure.data.json :as json]
|
||||
[config.core :refer [env]]
|
||||
[clojure.java.io :as io]
|
||||
[amazonica.aws.s3 :as s3])
|
||||
)
|
||||
|
||||
|
||||
[amazonica.aws.s3 :as s3]))
|
||||
|
||||
(defn template-applies? [text {:keys [keywords]}]
|
||||
|
||||
|
||||
(every? #(re-find % text) keywords))
|
||||
|
||||
(defn extract [wb {:keys [extract vendor parser]}]
|
||||
(if (fn? extract)
|
||||
(extract wb vendor)
|
||||
#_[(reduce-kv
|
||||
(fn [invoice k [regex offset-row offset-column extract-regex]]
|
||||
(assoc invoice k
|
||||
(->> wb
|
||||
(d/sheet-seq)
|
||||
first
|
||||
(d/cell-seq)
|
||||
(filter (fn [cell]
|
||||
(re-find regex (str (d/read-cell cell)))))
|
||||
(map (fn [cell]
|
||||
(let [address (.getAddress cell)
|
||||
cell-value (str (d/read-cell (d/select-cell (.toString (CellAddress. (+ offset-row (.getRow address)) (+ offset-column (.getColumn address)) ))
|
||||
(first (d/sheet-seq wb)))))
|
||||
raw-result (if extract-regex
|
||||
(second (re-find extract-regex cell-value))
|
||||
|
||||
cell-value)]
|
||||
(if (get parser k)
|
||||
(u/parse-value (first (get parser k) ) (second (get parser k) ) raw-result)
|
||||
raw-result
|
||||
))))
|
||||
first)))
|
||||
{:vendor-code vendor}
|
||||
extract)]))
|
||||
(fn [invoice k [regex offset-row offset-column extract-regex]]
|
||||
(assoc invoice k
|
||||
(->> wb
|
||||
(d/sheet-seq)
|
||||
first
|
||||
(d/cell-seq)
|
||||
(filter (fn [cell]
|
||||
(re-find regex (str (d/read-cell cell)))))
|
||||
(map (fn [cell]
|
||||
(let [address (.getAddress cell)
|
||||
cell-value (str (d/read-cell (d/select-cell (.toString (CellAddress. (+ offset-row (.getRow address)) (+ offset-column (.getColumn address))))
|
||||
(first (d/sheet-seq wb)))))
|
||||
raw-result (if extract-regex
|
||||
(second (re-find extract-regex cell-value))
|
||||
|
||||
cell-value)]
|
||||
(if (get parser k)
|
||||
(u/parse-value (first (get parser k)) (second (get parser k)) raw-result)
|
||||
raw-result))))
|
||||
first)))
|
||||
{:vendor-code vendor}
|
||||
extract)]))
|
||||
|
||||
(defn extract-sheet-details [bucket object]
|
||||
(doto
|
||||
@@ -57,7 +53,7 @@
|
||||
[file _]
|
||||
(let [tmp-key (str "xls-invoice/import/" (java.util.UUID/randomUUID))
|
||||
_ (with-open [f (io/input-stream file)]
|
||||
(s3/put-object {:bucket-name (:data-bucket env)
|
||||
(s3/put-object {:bucket-name (:data-bucket env)
|
||||
:key tmp-key
|
||||
:input-stream f}))
|
||||
sheet (extract-sheet-details (:data-bucket env) tmp-key)
|
||||
@@ -67,9 +63,6 @@
|
||||
first
|
||||
(extract sheet))))
|
||||
|
||||
|
||||
|
||||
|
||||
(defn xls-date->date [f]
|
||||
(when (not-empty f)
|
||||
(let [f (Double/parseDouble f)
|
||||
|
||||
Reference in New Issue
Block a user