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

moved to new date picker.

Browse Source
This commit is contained in:
Bryce Covert
2022-07-17 08:28:35 -07:00
parent eba3a5dce3
commit d97d70e08f
14 changed files with 193 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/cljs/auto_ap/views/pages/ledger/balance_sheet.cljs
View File

@@ -13,11 +13,9 @@
[auto-ap.views.pages.ledger.side-bar :refer [ledger-side-bar]]
[auto-ap.views.pages.ledger.table :as ledger-table]
[auto-ap.views.utils
:refer [date->str
date-picker-friendly
:refer [date-picker
dispatch-event
local-now
standard
with-user]]
[cljs-time.core :as t]
[clojure.set :as set]
@@ -78,9 +76,7 @@
:graphql {:token user
:query-obj {:venia/queries [[:balance-sheet
(-> (:data db)
(assoc :client-id (:id client))
(update :date (fnil #(date->str % standard) nil))
(update :comparison-date (fnil #(date->str % standard) nil)))
(assoc :client-id (:id client)))
[[:balance-sheet-accounts [:name :amount :account-type :id :numeric-code]]
[:comparable-balance-sheet-accounts [:name :amount :account-type :id :numeric-code]]]]]}
@@ -122,9 +118,7 @@ NOTE: Please review the transactions we may have question for you here: https://
:graphql {:token user
:query-obj {:venia/queries [[:balance-sheet-pdf
(-> (:data db)
(assoc :client-id (:id client))
(update :date (fnil #(date->str % standard) nil))
(update :comparison-date (fnil #(date->str % standard) nil)))
(assoc :client-id (:id client)))
[:url :name]]]}
:owns-state {:single ::page}
@@ -139,7 +133,7 @@ NOTE: Please review the transactions we may have question for you here: https://
:from-numeric-code from-numeric-code
:to-numeric-code to-numeric-code
:date-range {:start "2000-01-01"
:end (date->str date-range standard)}}]}))
:end date-range}}]}))
(re-frame/reg-event-fx
::ledger-params-change
@@ -206,9 +200,9 @@ NOTE: Please review the transactions we may have question for you here: https://
[:div.control
[:p.help "Date"]
(raw-field
[date-picker-friendly {:cljs-date? true
:type "date"
:field [:date]}])]]
[date-picker {:output :cljs-date
:type "date"
:field [:date]}])]]
[:div.level-item
[:div.control
[:div.mt-3]
@@ -224,9 +218,9 @@ NOTE: Please review the transactions we may have question for you here: https://
[:div.control
[:p.help "Comparison Date"]
(raw-field
[date-picker-friendly {:cljs-date? true
:type "date"
:field [:comparison-date]}])])]]
[date-picker {:output :cljs-date
:type "date"
:field [:comparison-date]}])])]]
[:div.level-right
[:div.buttons

29
src/cljs/auto_ap/views/pages/ledger/external_import.cljs
View File

@@ -1,20 +1,17 @@
(ns auto-ap.views.pages.ledger.external-import
(:require [auto-ap.subs :as subs]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[goog.string :as gstring]
[auto-ap.forms :as forms]
[auto-ap.utils :refer [by]]
[auto-ap.events :as events]
[auto-ap.views.pages.ledger.side-bar :refer [ledger-side-bar]]
[auto-ap.views.utils :refer [date->str date-picker bind-field local-now standard ->$ str->date dispatch-event]]
[auto-ap.views.components.dropdown :refer [drop-down drop-down-contents]]
[cljs-time.core :as t]
[re-frame.core :as re-frame]
[reagent.core :as r]
[clojure.string :as str]
[auto-ap.status :as status]))
(:require
[auto-ap.events :as events]
[auto-ap.forms :as forms]
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.views.components.dropdown
:refer [drop-down drop-down-contents]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.views.pages.ledger.side-bar :refer [ledger-side-bar]]
[auto-ap.views.utils :refer [bind-field dispatch-event]]
[clojure.string :as str]
[re-frame.core :as re-frame]
[reagent.core :as r]))
(re-frame/reg-sub
::loading

26
src/cljs/auto_ap/views/pages/ledger/profit_and_loss.cljs
View File

@@ -16,7 +16,7 @@
[auto-ap.views.pages.ledger.table :as ledger-table]
[auto-ap.views.utils
:refer [date->str
date-picker-friendly
date-picker
dispatch-event
local-today
multi-field
@@ -73,7 +73,7 @@
:owns-state {:single ::page}
:query-obj {:venia/queries [[:profit-and-loss
{:client-ids (map :id (:clients (:data db)))
:periods (mapv encode-period (:periods (:data db)))
:periods (mapv #(select-keys % #{:start :end} ) (:periods (:data db)))
:include-deltas (:include-deltas (:data db))
:column-per-location (:column-per-location (:data db))}
[[:periods [[:accounts [:name :amount :client_id :account-type :id :count :numeric-code :location]]]]]]]}
@@ -129,7 +129,7 @@ NOTE: Please review the transactions we may have question for you here: https://
{:client-ids (map :id (:clients (:data db)))
:include-deltas (:include-deltas (:data db))
:column-per-location (:column-per-location (:data db))
:periods (mapv encode-period (:periods (:data db)))}
:periods (mapv #(select-keys % #{:start :end}) (:periods (:data db)))}
[:url :name]]]}
:on-success [::received-pdf]}
:set-uri-params {:periods (mapv encode-period (:periods (:data db)))
@@ -288,10 +288,10 @@ NOTE: Please review the transactions we may have question for you here: https://
[:div.field.has-addons
[:div.control
(raw-field
[date-picker-friendly {:placeholder "End date"
:type "date"
:cljs-date? true
:field [:thirteen-periods-end]}])]
[date-picker {:placeholder "End date"
:type "date"
:output :cljs-date
:field [:thirteen-periods-end]}])]
[period-preset-button {:title "13 periods"
:periods (let [today (or (some-> (:thirteen-periods-end data))
(local-today))]
@@ -309,8 +309,8 @@ NOTE: Please review the transactions we may have question for you here: https://
[:div.field.has-addons
[:div.control
(raw-field
[date-picker-friendly {:placeholder "End date"
:cljs-date? true
[date-picker {:placeholder "End date"
:output :cljs-date
:type "date"
:field [:twelve-periods-end]}])]
[period-preset-button {:title "12 months"
@@ -388,15 +388,15 @@ NOTE: Please review the transactions we may have question for you here: https://
[:div.control
[:p.help "From"]
(raw-field
[date-picker-friendly {:type "date"
:cljs-date? true
[date-picker {:type "date"
:output :cljs-date
:field [:periods i :start]}])]
[:div.control
[:p.help "To"]
(raw-field
[date-picker-friendly {:type "date"
:cljs-date? true
[date-picker {:type "date"
:output :cljs-date
:field [:periods i :end]}])]])))]]]
[:div.level-item