notid/integreat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

investigate progress.

Browse Source
This commit is contained in:
Bryce
2024-10-14 23:21:48 -07:00
parent 502a05bdcd
commit ca5d90b17f
11 changed files with 119 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/clj/auto_ap/jobs/sysco.clj
View File

@@ -206,6 +206,14 @@
result)))
(with-bindings { #'bucket-name "data.prod.app.integreatconsult.com"}
(let [result (-> "sysco/error/SYSCO050_00175962_20241010122639019.csv"
read-sysco-csv
(extract-invoice-details (get-sysco-vendor))
)]
result))
)
(defn import-sysco []

127
src/clj/auto_ap/ssr/components/data_grid.clj
View File

@@ -41,21 +41,26 @@
[:input (merge {:id "checkbox-all", :type "checkbox", :class inputs/default-checkbox-classes :name (:name params) :value (:value params)} params)]
[:label {:for "checkbox-all", :class "sr-only"} "checkbox"]]])
(defn data-grid- [{:keys [headers thead-params id] :as params} & rest]
[:table (merge {:class "w-full text-sm text-left text-gray-500 dark:text-gray-400"}
(dissoc params :headers :thead-params))
[:thead (update thead-params :class #(-> "text-xs text-gray-800 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400"
(hh/add-class (or % ""))))
(defn data-grid-
[{:keys [headers thead-params id] :as params} & rest]
[:div.shrink.overflow-y-scroll
[:table (merge {:class "w-full text-sm text-left text-gray-500 dark:text-gray-400 shrink"}
(dissoc params :headers :thead-params))
[:thead (update thead-params :class #(-> "text-xs text-gray-800 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400 group-[.raw]:sticky group-[.raw]:top-0"
(hh/add-class (or % ""))))
(into
[:tr]
headers)]
(into
[:tr]
headers)]
(into
[:tbody]
rest)])
[:tbody {}]
rest)]])
;; needed for tailwind
;; lg:table-cell md:table-cell
(defn raw-table-card [params & children]
[:div params children])
(defn data-grid-card- [{:keys [id
route
title
@@ -68,64 +73,64 @@
per-page
flash-id
headers
raw?
rows] :as params} & children]
[:div (cond-> { :id id}
route (assoc
(let [card (if raw? raw-table-card content-card-)]
(card
(cond-> { :id id :class (cond-> "group" raw? (hh/add-class "raw h-full flex flex-col overflow-hidden"))}
route (assoc
:hx-get (bidi/path-for ssr-routes/only-routes
route
:request-method :get)
:hx-trigger "clientSelected from:body, invalidated from:body"
:hx-swap "outerHTML swap:300ms"))
(content-card-
{}
[:div {:class "flex flex-col px-4 py-3 space-y-3 lg:flex-row lg:items-center lg:justify-between lg:space-y-0 lg:space-x-4 text-gray-800 dark:text-gray-100"}
[:div
[:h1.text-2xl.mb-3.font-bold title]
[:div {:class "flex items-center flex-1 space-x-4"}
[:h5
(when subtitle
[:span subtitle])]]]
(into [:div {:class "flex flex-col flex-shrink-0 space-y-3 md:flex-row md:items-center lg:justify-end md:space-y-0 md:space-x-3"}]
action-buttons)]
[:div {:class "overflow-x-auto"}
(data-grid- {:headers headers
:thead-params thead-params}
rows)]
[:div {:class " group-[.raw]:hidden flex flex-col px-4 py-3 space-y-3 lg:flex-row lg:items-center lg:justify-between lg:space-y-0 lg:space-x-4 text-gray-800 dark:text-gray-100"}
[:h1.text-2xl.mb-3.font-bold title]
[:div {:class "flex items-center flex-1 space-x-4"}
[:h5
(when subtitle
[:span subtitle])]]
(into [:div {:class "flex flex-col flex-shrink-0 space-y-3 md:flex-row md:items-center lg:justify-end md:space-y-0 md:space-x-3"}]
action-buttons)]
[:div {:class "overflow-x-auto contents"}
(data-grid- {:headers headers
:thead-params thead-params}
rows)]
(when (or paginate?
(nil? paginate?))
(paginator- {:start start
:end (Math/min (+ start per-page) total)
:per-page per-page
:total total
:a-params (fn [page]
;; TODO it might be good to have a more global form defined in the specific page
;; with elements that are part of item
;; that way this is not deeply coupled
;; for example, including filters and pagination is awkward
;; TODO the other way to think about this is that we want the request to include
;; all of the correct parameters, not parameters to merge with the current ones.
;; think sorting, filters, pagination
{:hx-get (hu/url (bidi/path-for ssr-routes/only-routes
route
:request-method :get)
{:start (* page per-page)})
:hx-target (str "#" id)
:hx-swap "outerHTML show:#app:top"
:hx-indicator (str "#" id)})
:per-page-params {:hx-get (hu/url (bidi/path-for ssr-routes/only-routes
route
:request-method :get))
:hx-trigger "change"
:hx-include "this"
:hx-target (str "#" id) ;
:hx-swap "outerHTML show:#app:top"
:hx-indicator (str "#" id)}}))
children
[:div {:class "htmx-indicator absolute -translate-x-1/2 -translate-y-1/2 top-2/4 left-1/2 overflow-hidden w-full h-full"}
[:div {:class "flex items-center justify-center w-full h-full border border-gray-200 rounded-lg bg-gray-50 dark:bg-gray-800 dark:border-gray-700 bg-opacity-50" }
[:div {:class "px-3 py-1 text-xs font-medium leading-none text-center text-blue-800 bg-blue-200 rounded-full animate-pulse dark:bg-blue-900 dark:text-blue-200"} "loading..."]]])])
(when (or paginate?
(nil? paginate?))
[:div {:class "contents group-[.raw]:block"}
(paginator- {:start start
:end (Math/min (+ start per-page) total)
:per-page per-page
:total total
:a-params (fn [page]
;; TODO it might be good to have a more global form defined in the specific page
;; with elements that are part of item
;; that way this is not deeply coupled
;; for example, including filters and pagination is awkward
;; TODO the other way to think about this is that we want the request to include
;; all of the correct parameters, not parameters to merge with the current ones.
;; think sorting, filters, pagination
{:hx-get (hu/url (bidi/path-for ssr-routes/only-routes
route
:request-method :get)
{:start (* page per-page)})
:hx-target (str "#" id)
:hx-swap "outerHTML show:#app:top"
:hx-indicator (str "#" id)})
:per-page-params {:hx-get (hu/url (bidi/path-for ssr-routes/only-routes
route
:request-method :get))
:hx-trigger "change"
:hx-include "this"
:hx-target (str "#" id) ;
:hx-swap "outerHTML show:#app:top"
:hx-indicator (str "#" id)}})])
children
[:div {:class "htmx-indicator absolute -translate-x-1/2 -translate-y-1/2 top-2/4 left-1/2 overflow-hidden w-full h-full"}
[:div {:class "flex items-center justify-center w-full h-full border border-gray-200 rounded-lg bg-gray-50 dark:bg-gray-800 dark:border-gray-700 bg-opacity-50" }
[:div {:class "px-3 py-1 text-xs font-medium leading-none text-center text-blue-800 bg-blue-200 rounded-full animate-pulse dark:bg-blue-900 dark:text-blue-200"} "loading..."]]])))
(defn new-row- [{:keys [index colspan tr-params row-offset] :as params} & content]
(row-

6
src/clj/auto_ap/ssr/components/dialog.clj
View File

@@ -23,10 +23,10 @@
[:div (update params
:class (fn [c] (-> c
(or "")
(hh/add-class "w-full p-4 h-full modal-card"))))
[:div {:class "bg-white rounded-lg shadow dark:bg-gray-700 dark:text-white modal-content w-full flex flex-col h-full"}
(hh/add-class "w-full p-4 modal-card flex max-h-[inherit]"))))
[:div {:class "bg-white rounded-lg shadow dark:bg-gray-700 dark:text-white modal-content w-full flex flex-col max-h-full overflow-hidden"}
[:div {:class "flex items-start justify-between p-4 border-b rounded-t dark:border-gray-600 shrink-0"} header]
[:div {:class "px-6 py-2 space-y-6 overflow-y-scroll w-full shrink"}
[:div {:class "px-6 py-2 space-y-6 overflow-y-scroll w-full contents"}
#_[:div.bg-green-300.w-full.h-64
"hello"]
content]

1
src/clj/auto_ap/ssr/grid_page_helper.clj
View File

@@ -109,6 +109,7 @@
request (assoc request :page-results page-results)]
(com/data-grid-card {:id (:id grid-spec)
:raw? (:raw? grid-spec)
:title (if (string? (:title grid-spec))
(:title grid-spec)
((:title grid-spec) request))

1
src/clj/auto_ap/ssr/ledger/balance_sheet.clj
View File

@@ -407,6 +407,7 @@
{:report/name name
:report/url url }))
;; TODO PRINT WARNING
(defn export [request]
(modal-response
(com/modal {}

3
src/clj/auto_ap/ssr/ledger/common.clj
View File

@@ -148,7 +148,6 @@
(when (:client-code request)
[:client/code (:client-code request)]))
args query-params
#_#__ (clojure.pprint/pprint query-params)
query
(if (:exact-match-id args)
{:query {:find '[?e]
@@ -384,7 +383,7 @@
[:amount-gte {:optional true} [:maybe :double]]
[:amount-lte {:optional true} [:maybe :double]]
[:client-id {:optional true} [:maybe entity-id]]
[:numeric-code {:optional true :decode/string clojure.edn/read-string}
[:numeric-code {:optional true :decode/string clojure.edn/read-string }
[:maybe [:vector [:map [:from nat-int?]
[:to nat-int?]]] ]]
[:numeric-code-gte {:optional true} [:maybe nat-int?]]

40
src/clj/auto_ap/ssr/ledger/investigate.clj
View File

@@ -5,33 +5,51 @@
[auto-ap.routes.utils :refer [wrap-client-redirect-unauthenticated]]
[auto-ap.ssr.components :as com]
[auto-ap.ssr.grid-page-helper :refer [table*]]
[auto-ap.ssr.hx :as hx]
[auto-ap.ssr.ledger.common :refer [grid-page query-schema]]
[auto-ap.ssr.utils :refer [apply-middleware-to-all-handlers
modal-response wrap-merge-prior-hx
wrap-schema-enforce]]))
html-response modal-response
wrap-merge-prior-hx wrap-schema-enforce]]))
(def altered-grid-page
(assoc grid-page
:id "yoho"
:raw? true
:check-boxes? false
:route ::route/investigate-results))
(defn investigate-results [request]
(html-response
(table*
altered-grid-page
identity
(assoc-in request [:query-params :sort] [{:sort-key "date" :asc? false}]))))
(defn investigate [request]
(modal-response
(com/modal {:class "h-[600px]"}
(com/modal-card {}
(com/modal {:class "max-h-[600px]"}
(com/modal-card {:hx-vals (hx/json (update (:query-params request)
:numeric-code pr-str))
}
[:div "Ledger entries"]
[:div
(table*
grid-page
identity
request)]
(table*
altered-grid-page
identity
(assoc-in request [:query-params :sort] [{:sort-key "date" :asc? false}]))
nil)
)))
(def key->handler
(apply-middleware-to-all-handlers
(->
{::route/investigate investigate }
{::route/investigate investigate
::route/investigate-results investigate-results}
)
(fn [h]
(-> h
(wrap-copy-qp-pqp)
(wrap-merge-prior-hx)
(wrap-schema-enforce :query-schema query-schema)
(wrap-schema-enforce :hx-schema query-schema)
(wrap-must {:activity :read :subject :ledger})
(wrap-client-redirect-unauthenticated)))))
(wrap-client-redirect-unauthenticated)))))

3
src/cljc/auto_ap/routes/ledger.cljc
View File

@@ -5,7 +5,8 @@
"/external-import-new" {"" ::external-import-page
"/parse" ::external-import-parse
"/import" ::external-import-import}
"/investigate" ::investigate
"/investigate" {"" ::investigate
"/results" ::investigate-results}
"/table" ::table
"/bank-account-filter" ::bank-account-filter
"/reports/balance-sheet" {"" ::balance-sheet