Resets selected on page change, adds account number to drop downs and makes missing emails less noisy
This commit is contained in:
@@ -50,7 +50,7 @@
|
||||
:bucket-name (-> r :s3 :bucket :name)}}
|
||||
(doseq [pdf-stream (->> (-> mail :body)
|
||||
(filter :content-type)
|
||||
#_(filter #(re-find #"application/pdf" (:content-type %))))
|
||||
(filter (complement #(re-find #"html" (:content-type % "")))))
|
||||
:let [filename (str "/tmp/" (UUID/randomUUID) ".pdf")]]
|
||||
(try
|
||||
(let [_ (io/copy (:body pdf-stream) (io/file filename))
|
||||
|
||||
@@ -261,8 +261,7 @@
|
||||
(defn client-override* [override]
|
||||
(com/data-grid-row (-> {:x-ref "p"
|
||||
:data-key "show"
|
||||
:x-data (hx/json {:show (boolean (doto (not (fc/field-value (:new? override)))
|
||||
println))})}
|
||||
:x-data (hx/json {:show (boolean (not (fc/field-value (:new? override))))})}
|
||||
hx/alpine-mount-then-appear)
|
||||
(fc/with-field :db/id
|
||||
(com/hidden {:name (fc/field-name)
|
||||
|
||||
@@ -369,7 +369,6 @@
|
||||
|
||||
true
|
||||
(merge-query {:query {:where ['[?e :transaction/id]]}}))
|
||||
_ (alog/peek query)
|
||||
results (->>
|
||||
(query2 query)
|
||||
(map first))]
|
||||
@@ -431,8 +430,13 @@
|
||||
:x-model x-model
|
||||
:value value
|
||||
:content-fn (fn [value]
|
||||
(:account/name (d-accounts/clientize (dc/pull (dc/db conn) d-accounts/default-read value)
|
||||
client-id)))})])
|
||||
(let [a (dc/pull (dc/db conn) d-accounts/default-read value)]
|
||||
(when value
|
||||
(str
|
||||
(:account/numeric-code a)
|
||||
" - "
|
||||
(:account/name (d-accounts/clientize a
|
||||
client-id))))))})])
|
||||
|
||||
(defn- transaction-rule-account-row*
|
||||
[account client-id client-locations]
|
||||
|
||||
@@ -294,6 +294,7 @@
|
||||
(when (:above-grid grid-spec)
|
||||
( (:above-grid grid-spec) request))
|
||||
[:div {:x-data (hx/json {:selected [] :all_selected false})
|
||||
"x-on:client-selected.document" "selected=[]; all_selected=false"
|
||||
"x-bind:hx-vals" "JSON.stringify({selected: $data.selected, 'all-selected': $data.all_selected})"
|
||||
:x-init "$watch('selected', s=> $dispatch('selectedChanged', {selected: s, all_selected: all_selected}) );
|
||||
$watch('all_selected', a=>$dispatch('selectedChanged', {selected: selected, all_selected: a}))"}
|
||||
|
||||
Reference in New Issue
Block a user