everything except pagination
This commit is contained in:
7
resources/public/css/bulma.min.css
vendored
7
resources/public/css/bulma.min.css
vendored
@@ -9511,9 +9511,12 @@ tbody tr.live-added {
|
|||||||
animation-fill-mode: forwards;
|
animation-fill-mode: forwards;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button.is-outlined {
|
.button {
|
||||||
border-width: 1.75px;
|
|
||||||
font-weight: 800;
|
font-weight: 800;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.button.is-outlined {
|
||||||
|
border-width: 2.5px;
|
||||||
|
}
|
||||||
|
|
||||||
/*# sourceMappingURL=bulma.min.css.map */
|
/*# sourceMappingURL=bulma.min.css.map */
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
9
resources/sass/bulma.scss
vendored
9
resources/sass/bulma.scss
vendored
@@ -163,10 +163,9 @@ tbody tr.live-added {
|
|||||||
animation: flashPrimary 1.0s ease both;
|
animation: flashPrimary 1.0s ease both;
|
||||||
animation-fill-mode: forwards;
|
animation-fill-mode: forwards;
|
||||||
}
|
}
|
||||||
|
.button {
|
||||||
.button.is-outlined {
|
|
||||||
border-width: 1.75px;
|
|
||||||
font-weight: 800;
|
font-weight: 800;
|
||||||
|
}
|
||||||
|
.button.is-outlined {
|
||||||
|
border-width: 2.5px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,7 @@
|
|||||||
(ns auto-ap.datomic
|
(ns auto-ap.datomic
|
||||||
(:require [datomic.api :as d]
|
(:require [auto-ap.utils :refer [default-pagination-size]]
|
||||||
[auto-ap.db.vendors :as v]
|
|
||||||
[auto-ap.db.companies :as c]
|
|
||||||
[auto-ap.db.invoices :as i]
|
|
||||||
[auto-ap.db.checks :as checks]
|
|
||||||
[auto-ap.db.users :as users]
|
|
||||||
[auto-ap.db.invoices-expense-accounts :as iea]
|
|
||||||
[auto-ap.db.invoices-checks :as ic]
|
|
||||||
[auto-ap.db.transactions :as transactions]
|
|
||||||
[clojure.string :as str]
|
|
||||||
[clj-time.core :as time]
|
|
||||||
[clj-time.coerce :as coerce]
|
[clj-time.coerce :as coerce]
|
||||||
|
[datomic.api :as d]
|
||||||
[mount.core :as mount]))
|
[mount.core :as mount]))
|
||||||
|
|
||||||
(def uri "datomic:sql://invoices?jdbc:postgresql://database:5432/datomic?user=datomic&password=datomic")
|
(def uri "datomic:sql://invoices?jdbc:postgresql://database:5432/datomic?user=datomic&password=datomic")
|
||||||
@@ -815,6 +806,6 @@
|
|||||||
|
|
||||||
{:ids (->> results
|
{:ids (->> results
|
||||||
(drop (:start args 0))
|
(drop (:start args 0))
|
||||||
(take (:count args 100))
|
(take (:count args default-pagination-size))
|
||||||
(map last))
|
(map last))
|
||||||
:count (count results)})
|
:count (count results)})
|
||||||
|
|||||||
@@ -67,3 +67,5 @@
|
|||||||
(if (some identity vs)
|
(if (some identity vs)
|
||||||
(reduce #(rec-merge %1 %2) v vs)
|
(reduce #(rec-merge %1 %2) v vs)
|
||||||
(last vs))))
|
(last vs))))
|
||||||
|
|
||||||
|
(def default-pagination-size 20)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
(ns auto-ap.views.components.grid
|
(ns auto-ap.views.components.grid
|
||||||
(:require [reagent.core :as r]
|
(:require [reagent.core :as r]
|
||||||
[auto-ap.views.utils :refer [appearing]]
|
[auto-ap.views.utils :refer [appearing]]
|
||||||
|
[auto-ap.utils :refer [default-pagination-size]]
|
||||||
[react :as react]
|
[react :as react]
|
||||||
[re-frame.core :as re-frame]
|
[re-frame.core :as re-frame]
|
||||||
[auto-ap.views.pages.data-page :as data-page]))
|
[auto-ap.views.pages.data-page :as data-page]))
|
||||||
@@ -54,7 +55,7 @@
|
|||||||
y))
|
y))
|
||||||
|
|
||||||
(defn paginator [{:keys [start end count total on-change]}]
|
(defn paginator [{:keys [start end count total on-change]}]
|
||||||
(let [per-page 100
|
(let [per-page default-pagination-size
|
||||||
max-buttons 5
|
max-buttons 5
|
||||||
buttons-before (Math/floor (/ max-buttons 2))
|
buttons-before (Math/floor (/ max-buttons 2))
|
||||||
total-pages (Math/max 1 (Math/ceil (/ total per-page)))
|
total-pages (Math/max 1 (Math/ceil (/ total per-page)))
|
||||||
@@ -189,7 +190,7 @@
|
|||||||
(cond (= :loading (:state status))
|
(cond (= :loading (:state status))
|
||||||
^{:key "loading-body"}
|
^{:key "loading-body"}
|
||||||
[:tbody.test
|
[:tbody.test
|
||||||
(for [i (range 20)]
|
(for [i (range default-pagination-size)]
|
||||||
^{:key i}
|
^{:key i}
|
||||||
[:tr
|
[:tr
|
||||||
(for [x (range column-count)]
|
(for [x (range column-count)]
|
||||||
@@ -258,9 +259,9 @@
|
|||||||
(r/children (r/current-component)))))))
|
(r/children (r/current-component)))))))
|
||||||
|
|
||||||
(defn virtual-paginate [start xs ]
|
(defn virtual-paginate [start xs ]
|
||||||
(take 100 (drop (or start 0) xs)))
|
(take default-pagination-size (drop (or start 0) xs)))
|
||||||
|
|
||||||
(defn virtual-paginate-controls [start xs]
|
(defn virtual-paginate-controls [start xs]
|
||||||
{:start (or start 0) :end (min (+ (or start 0) 100)
|
{:start (or start 0) :end (min (+ (or start 0) default-pagination-size)
|
||||||
(count xs))
|
(count xs))
|
||||||
:total (count xs)})
|
:total (count xs)})
|
||||||
|
|||||||
@@ -23,8 +23,8 @@
|
|||||||
(def cell (r/adapt-react-class js/Recharts.Cell))
|
(def cell (r/adapt-react-class js/Recharts.Cell))
|
||||||
(def tool-tip (r/adapt-react-class js/Recharts.Tooltip))
|
(def tool-tip (r/adapt-react-class js/Recharts.Tooltip))
|
||||||
|
|
||||||
(def colors ["hsl(171, 100%, 41%)" "hsl(217, 71%, 53%)" "hsl(141, 71%, 48%)" "hsl(48, 100%, 67%)" "hsl(348, 100%, 61%)" "hsl(217, 71%, 53%)" "hsl(141, 53%, 53%)"])
|
(def colors ["#79b52e" "#009cea" "#209b1c" "#f48017" " #ff0303" "hsl(217, 71%, 53%)" "hsl(141, 53%, 53%)"])
|
||||||
(def light-colors ["hsl(171, 60%, 80%)" "hsl(217, 71%, 53%)" "hsl(141, 71%, 48%)" "hsl(48, 100%, 67%)" "hsl(348, 100%, 61%)" "hsl(217, 71%, 53%)"])
|
(def light-colors ["#a6d869" "#8ad8ff" "#2cd327" "#fac899" "#ff6b6b" "hsl(217, 71%, 53%)"])
|
||||||
|
|
||||||
(defn make-pie-chart
|
(defn make-pie-chart
|
||||||
[{:keys [width height data]}]
|
[{:keys [width height data]}]
|
||||||
@@ -278,8 +278,8 @@
|
|||||||
[grid/header-cell {} "Name"]
|
[grid/header-cell {} "Name"]
|
||||||
[grid/header-cell {:class "has-text-right"} "Amount"]]]
|
[grid/header-cell {:class "has-text-right"} "Amount"]]]
|
||||||
[grid/body
|
[grid/body
|
||||||
(for [{:keys [date days-until type name amount] } (:data page)]
|
(for [[i {:keys [date days-until type name amount] }] (map vector (range) (:data page))]
|
||||||
^{:key date}
|
^{:key i}
|
||||||
[grid/row {}
|
[grid/row {}
|
||||||
[grid/cell {}
|
[grid/cell {}
|
||||||
(if (> days-until 0)
|
(if (> days-until 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user