Improves IOL. Adds saved queries. Adds expected deposits in app.

2021-06-04 10:50:27 -07:00
parent 311b07543c
commit 922c449bb0
15 changed files with 256 additions and 82 deletions
--- a/src/cljs/auto_ap/views/components/layouts.cljs
+++ b/src/cljs/auto_ap/views/components/layouts.cljs
@@ -112,7 +112,7 @@
           (when (= "admin" (:user/role @user))
             [:a.navbar-item {:class [(active-when ap = :sales-orders)]
                              :href (bidi/path-for routes/routes :sales-orders)}
-              "Sales Orders" ])
+              "POS" ])
           [:a.navbar-item {:class [(active-when ap = :transactions)]
                            :href (bidi/path-for routes/routes :transactions)}
            "Transactions" ]
--- a/src/cljs/auto_ap/views/main.cljs
+++ b/src/cljs/auto_ap/views/main.cljs
@@ -19,7 +19,8 @@
   [auto-ap.views.pages.ledger.profit-and-loss :refer [profit-and-loss-page]]
   [auto-ap.views.pages.login :refer [login-page]]
   [auto-ap.views.pages.payments :refer [payments-page]]
-   [auto-ap.views.pages.sales-orders :refer [sales-orders-page]]
+   [auto-ap.views.pages.pos.sales-orders :refer [sales-orders-page]]
+   [auto-ap.views.pages.pos.expected-deposits :refer [expected-deposits-page]]
   [auto-ap.views.pages.admin :refer [admin-page]]
   [auto-ap.views.pages.home :refer [home-page]]
   [auto-ap.views.pages.admin.clients :refer [admin-clients-page]]
@@ -59,6 +60,9 @@
 (defmethod page :sales-orders [_]
  [sales-orders-page])

+(defmethod page :expected-deposits [_]
+  [expected-deposits-page])
+
 (defmethod page :transactions [_]
  (transactions-page {}))

--- a/src/cljs/auto_ap/views/pages/pos/expected_deposits.cljs
+++ b/src/cljs/auto_ap/views/pages/pos/expected_deposits.cljs
@@ -0,0 +1,72 @@
+(ns auto-ap.views.pages.pos.expected-deposits
+  (:require [auto-ap.forms :as forms]
+            [auto-ap.subs :as subs]
+            [auto-ap.views.components.layouts :refer [side-bar-layout appearing-side-bar]]
+            [auto-ap.views.pages.data-page :as data-page]
+            [auto-ap.views.pages.pos.form :as form]
+            [auto-ap.views.pages.pos.side-bar :as side-bar]
+            [auto-ap.views.pages.pos.expected-deposits.table :as table]
+            [auto-ap.views.utils :refer [with-user]]
+            [clojure.set :as set]
+            [re-frame.core :as re-frame]
+            [reagent.core :as reagent]
+            [vimsical.re-frame.fx.track :as track]))
+
+(re-frame/reg-event-fx
+ ::params-change
+ [with-user]
+ (fn [{:keys [user db ]}[_ params]]
+   {:graphql {:token user
+              :owns-state {:single [::data-page/page ::page]}
+              :query-obj {:venia/queries [[:expected_deposit_page
+                                           {:start (:start params 0)
+                                            :sort (:sort params)
+                                            :per-page (:per-page params)
+                                            :total-gte (:amount-gte (:total-range params))
+                                            :total-lte (:amount-lte (:total-range params))
+                                            :date-range (:date-range params)
+                                            :client-id (:id @(re-frame/subscribe [::subs/client]))}
+                                           [[:expected-deposits [:id :total :fee :location :date
+                                                            [:client [:name :id]]]]
+                                            :total
+                                            :start
+                                            :end]]]} 
+              :on-success (fn [result]
+                            (let [result (set/rename-keys (:expected-deposit-page result)
+                                                          {:expected-deposits :data})]
+                              [::data-page/received ::page result]))}}))
+
+
+(re-frame/reg-event-fx
+ ::unmounted
+ (fn [{:keys [db]} _]
+   {:dispatch [::data-page/dispose ::page]
+    ::track/dispose {:id ::params}}))
+
+(re-frame/reg-event-fx
+ ::mounted
+ (fn [{:keys [db]} _]
+   {::track/register {:id ::params
+                      :subscription [::data-page/params ::page]
+                      :event-fn (fn [params]
+                                  [::params-change params])}}))
+
+(defn content []
+  [:div
+   [:h1.title "Expected Deposits"]
+   [table/table {:id :expected-deposits
+                 :data-page ::page}]])
+
+(defn expected-deposits-page []
+  (reagent/create-class
+   {:display-name "expected-deposits-page"
+    :component-will-unmount #(re-frame/dispatch-sync [::unmounted])
+    :component-did-mount #(re-frame/dispatch [::mounted])
+    :reagent-render
+    (fn []
+      (let [{form-active? :active?} @(re-frame/subscribe [::forms/form ::form/form])]
+        [side-bar-layout {:side-bar [side-bar/side-bar {:data-page ::page}]
+                          :main [content]
+                          :right-side-bar [appearing-side-bar {:visible? form-active?}
+                                           [form/form {}]]}]))}))
+
--- a/src/cljs/auto_ap/views/pages/pos/expected_deposits/table.cljs
+++ b/src/cljs/auto_ap/views/pages/pos/expected_deposits/table.cljs
@@ -0,0 +1,47 @@
+
+(ns auto-ap.views.pages.pos.expected-deposits.table
+  (:require [auto-ap.subs :as subs]
+            [auto-ap.views.components.buttons :as buttons]            [auto-ap.views.components.grid :as grid]
+            [auto-ap.views.pages.data-page :as data-page]
+            [auto-ap.views.pages.pos.form :as form]
+            [auto-ap.views.utils :refer [date->str nf]]
+            [clojure.string :as str]
+            [re-frame.core :as re-frame]))
+
+(defn row [{sales-order :sales-order
+            selected-client :selected-client}]
+  (let [{:keys [client location date total fee id]} sales-order]
+    [grid/row {:class (:class sales-order) :id id}
+     (when-not selected-client
+       [grid/cell {} (:name client)])
+     [grid/cell  location ]
+     [grid/cell {} (date->str date) ]
+     [grid/cell {:class "has-text-right"} (nf total )]
+     [grid/cell {:class "has-text-right"} (nf fee )]
+     
+[grid/button-cell {}
+      [:div.buttons 
+       [buttons/fa-icon {:event [::form/editing sales-order] :icon "fa-pencil"}]]]]))
+
+(defn table [{:keys [data-page]}]
+  (let [selected-client @(re-frame/subscribe [::subs/client])
+        {:keys [data status]} @(re-frame/subscribe [::data-page/page data-page])]
+    [grid/grid {:data-page data-page
+                :column-count (if selected-client 7 8)}
+     [grid/controls data]
+     [grid/table {:fullwidth true}
+      [grid/header {}
+       [grid/row {}
+        (when-not selected-client
+          [grid/sortable-header-cell {:sort-key "client" :sort-name "Client"} "Client"])
+        [grid/sortable-header-cell {:sort-key "location" :sort-name "Location" :style {:width "7em"}} "Location"]
+        [grid/sortable-header-cell {:sort-key "date" :sort-name "Date" :style {:width "8em"}} "Date"]
+        [grid/sortable-header-cell {:sort-key "total" :sort-name "Total" :class "has-text-right" :style {:width "8em"}} "Total"]
+        [grid/sortable-header-cell {:sort-key "fee" :sort-name "Fee" :class "has-text-right" :style {:width "7em"}} "Fee"]
+        
+        [grid/header-cell {:style {:width "4em"}}]]]
+      [grid/body
+       (for [sales-order (:data data)]
+         ^{:key (:id sales-order)}
+         [row {:sales-order sales-order
+               :selected-client selected-client}])]]]))
--- a/src/cljs/auto_ap/views/pages/sales_orders/form.cljs
+++ b/src/cljs/auto_ap/views/pages/sales_orders/form.cljs
@@ -1,4 +1,4 @@
-(ns auto-ap.views.pages.sales-orders.form
+(ns auto-ap.views.pages.pos.form
  (:require 
            [auto-ap.events :as events]
            [auto-ap.forms :as forms]
--- a/src/cljs/auto_ap/views/pages/pos/sales_orders.cljs
+++ b/src/cljs/auto_ap/views/pages/pos/sales_orders.cljs
@@ -1,11 +1,11 @@
-(ns auto-ap.views.pages.sales-orders
+(ns auto-ap.views.pages.pos.sales-orders
  (:require [auto-ap.forms :as forms]
            [auto-ap.subs :as subs]
            [auto-ap.views.components.layouts :refer [side-bar-layout appearing-side-bar]]
            [auto-ap.views.pages.data-page :as data-page]
-            [auto-ap.views.pages.sales-orders.form :as form]
-            [auto-ap.views.pages.sales-orders.side-bar :as side-bar]
-            [auto-ap.views.pages.sales-orders.table :as table]
+            [auto-ap.views.pages.pos.form :as form]
+            [auto-ap.views.pages.pos.side-bar :as side-bar]
+            [auto-ap.views.pages.pos.table :as table]
            [auto-ap.views.utils :refer [with-user]]
            [clojure.set :as set]
            [re-frame.core :as re-frame]
--- a/src/cljs/auto_ap/views/pages/sales_orders/side_bar.cljs
+++ b/src/cljs/auto_ap/views/pages/sales_orders/side_bar.cljs
@@ -1,4 +1,4 @@
-(ns auto-ap.views.pages.sales-orders.side-bar
+(ns auto-ap.views.pages.pos.side-bar
  (:require [auto-ap.routes :as routes]
            [auto-ap.subs :as subs]
            [auto-ap.views.utils :refer [active-when dispatch-value-change]]
@@ -13,9 +13,20 @@
  (let [ap @(re-frame/subscribe [::subs/active-page])
        user @(re-frame/subscribe [::subs/user])]
    [:div
-     [:div 
-      
+     [:div [:p.menu-label "Type"]
+      [:ul.menu-list
+       [:li.menu-item
+        [:a.item {:href (bidi/path-for routes/routes :sales-orders)
+                  :class [(active-when ap = :sales-orders)]}
+         [:span {:class "icon icon-accounting-invoice-mail" :style {:font-size "25px"}}]
+         [:span {:class "name"} "Sales Orders"]]]
+       [:li.menu-item
+        [:a.item {:href (bidi/path-for routes/routes :expected-deposits)
+                  :class [(active-when ap = :expected-deposits)]}
+         [:span {:class "icon icon-accounting-invoice-mail" :style {:font-size "25px"}}]
+         [:span {:class "name"} "Expected Deposits"]]]]]

+     [:div
      [:p.menu-label "Date Range"]
      [:div
       [date-range-filter
--- a/src/cljs/auto_ap/views/pages/sales_orders/table.cljs
+++ b/src/cljs/auto_ap/views/pages/sales_orders/table.cljs
@@ -1,9 +1,8 @@
-(ns auto-ap.views.pages.sales-orders.table
+(ns auto-ap.views.pages.pos.table
  (:require [auto-ap.subs :as subs]
-            [auto-ap.views.components.buttons :as buttons]
-            [auto-ap.views.components.grid :as grid]
+            [auto-ap.views.components.buttons :as buttons]            [auto-ap.views.components.grid :as grid]
            [auto-ap.views.pages.data-page :as data-page]
-            [auto-ap.views.pages.sales-orders.form :as form]
+            [auto-ap.views.pages.pos.form :as form]
            [auto-ap.views.utils :refer [date->str nf]]
            [clojure.string :as str]
            [re-frame.core :as re-frame]))