From ac35b406ae89ff92c6c8419068483d2b50be0fab Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 30 Jul 2019 22:45:26 -0700 Subject: [PATCH] minor fixes --- project.clj | 41 +++++++++++++++++-- src/clj/auto_ap/graphql/checks.clj | 2 +- .../views/pages/ledger/external_import.cljs | 4 +- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/project.clj b/project.clj index 10500705..1275e808 100644 --- a/project.clj +++ b/project.clj @@ -13,7 +13,15 @@ [kibu/pushy "0.3.8"] [bidi "2.1.2"] [ring/ring-defaults "0.2.1"] - [ring "1.6.3" :exclusions [clj-time]] + [ring "1.6.3" :exclusions [commons-codec + commons-io + clj-time + ring/ring-core + ring/ring-codec + org.eclipse.jetty/jetty-http + org.eclipse.jetty/jetty-util + org.eclipse.jetty/jetty-server + org.clojure/tools.namespace]] [yogthos/config "0.8"] [dk.ative/docjure "1.12.0"] [org.clojure/java.jdbc "0.7.3"] @@ -47,6 +55,11 @@ [com.amazonaws/aws-java-sdk-ses "1.11.282"] [com.amazonaws/aws-java-sdk-sqs "1.11.282"] [com.amazonaws/aws-java-sdk-s3 "1.11.282"] + [org.eclipse.jetty/jetty-http "9.4.17.v20190418"] + [org.eclipse.jetty/jetty-util "9.4.17.v20190418"] + [org.eclipse.jetty/jetty-server "9.4.17.v20190418"] + [org.eclipse.jetty.websocket/websocket-server "9.4.17.v20190418"] + [org.eclipse.jetty.websocket/websocket-servlet "9.4.17.v20190418"] [org.clojure/data.json "0.2.6"] [org.clojure/data.csv "0.1.4"] [io.rkn/conformity "0.5.1"] @@ -67,14 +80,36 @@ {:resource-paths ["resources" "target"] :dependencies [[binaryage/devtools "0.9.4"] - [com.bhauman/figwheel-main "0.1.9" :exclusions [org.clojure/clojurescript]] + [com.bhauman/figwheel-main "0.2.3" :exclusions [org.clojure/clojurescript + ring/ring-core + ring/ring-codec + ring.adapter.jetty + binaryage/devtools + commons-io + commons-codec + com.fasterxml.jackson.core/jackson-core + org.clojure/tools.namespace + org.eclipse.jetty.websocket/websocket-server + org.eclipse.jetty.websocket/websocket-servlet + args4j]] [com.bhauman/rebel-readline-cljs "0.1.4"] [javax.servlet/servlet-api "2.5"]] :plugins [ [lein-pdo "0.1.1"]] :jvm-opts ["-Dconfig=config/dev.edn" "--add-modules" "java.xml.bind"]} :uberjar {:prep-tasks ["fig:min" ] - :dependencies [[com.bhauman/figwheel-main "0.1.9" :exclusions [org.clojure/clojurescript]]]} + :dependencies [[com.bhauman/figwheel-main "0.2.3" :exclusions [org.clojure/clojurescript + ring/ring-core + ring/ring-codec + ring.adapter.jetty + binaryage/devtools + commons-io + commons-codec + com.fasterxml.jackson.core/jackson-core + org.clojure/tools.namespace + org.eclipse.jetty.websocket/websocket-server + org.eclipse.jetty.websocket/websocket-servlet + args4j]]]} :provided {:dependencies [[org.clojure/clojurescript "1.10.339"] [reagent "0.7.0" ] [cljsjs/react-datepicker "2.1.0-0"] diff --git a/src/clj/auto_ap/graphql/checks.clj b/src/clj/auto_ap/graphql/checks.clj index 7d4aa306..4a8d974a 100644 --- a/src/clj/auto_ap/graphql/checks.clj +++ b/src/clj/auto_ap/graphql/checks.clj @@ -86,7 +86,7 @@ [[:cell {}] [:cell {:colspan 8} (str " -- " word-amount " " (str/join "" (take (max 2 - (- 97 + (- 95 (count word-amount))) (repeat "-")))) [:line {:line-width 0.15 :color [50 50 50]}]] diff --git a/src/cljs/auto_ap/views/pages/ledger/external_import.cljs b/src/cljs/auto_ap/views/pages/ledger/external_import.cljs index b87aca9e..7172c281 100644 --- a/src/cljs/auto_ap/views/pages/ledger/external_import.cljs +++ b/src/cljs/auto_ap/views/pages/ledger/external_import.cljs @@ -43,7 +43,8 @@ :amount (reduce + 0 (->> lines (map :debit) - (map js/parseFloat))) + (map js/parseFloat) + (map #(if (js/isNaN %) 0 %)))) :line-items (map (fn [{:keys [debit credit account-identifier location]}] {:account-identifier account-identifier :location location @@ -51,6 +52,7 @@ :credit credit}) lines)})))) + ;; EVENTS (re-frame/reg-event-fx