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

Adds the ability to set up read only users, adds linking filtering

Browse Source
This commit is contained in:
Bryce
2024-01-03 21:42:30 -08:00
parent 48f70ef93d
commit 810c3aacb2
10 changed files with 192 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/cljs/auto_ap/views/components/layouts.cljs
View File

@@ -1,6 +1,7 @@
(ns auto-ap.views.components.layouts
(:require
[auto-ap.events :as events]
[auto-ap.permissions :as p]
[auto-ap.forms :as forms]
[auto-ap.forms.builder :as form-builder]
[auto-ap.routes :as routes]
@@ -49,13 +50,20 @@
[:span (:user/name @user)]]
:id ::account}
[:div
[:a {:class "navbar-item"
:href (bidi/path-for auto-ap.ssr-routes/only-routes :company)} "My company"]
[:a.dropdown-item {:on-click (dispatch-event-with-propagation [::vendor-dialog/started {}])} "New Vendor"]
[:a.dropdown-item {:on-click (dispatch-event-with-propagation [::vendor-dialog/edit {}])} "Edit Vendor"]
(when (= "admin" (:user/role @user))
(when (p/can? @user {:subject :my-company-page})
[:a {:class "navbar-item"
:href (bidi/path-for auto-ap.ssr-routes/only-routes :company)} "My company"])
(when (p/can? @user {:subject :vendor
:activity :create})
[:a.dropdown-item {:on-click (dispatch-event-with-propagation [::vendor-dialog/started {}])} "New Vendor"])
(when (p/can? @user {:subject :vendor
:activity :edit})
[:a.dropdown-item {:on-click (dispatch-event-with-propagation [::vendor-dialog/edit {}])} "Edit Vendor"])
(when (p/can? @user {:subject :admin-page})
[:a {:class "navbar-item" :href (bidi/path-for ssr-routes/only-routes :auto-ap.routes.admin/page)} "Administration"])
[:hr {:class "navbar-divider"}]
(when (not= "read-only" (:user/role @user))
[:hr {:class "navbar-divider"}])
[:a.navbar-item {:on-click (fn []
(.removeItem js/localStorage "last-client-id" nil)
(.setItem js/localStorage "last-selected-clients" ":all")
@@ -149,7 +157,6 @@
clients (re-frame/subscribe [::subs/clients])
is-initial-loading @(re-frame/subscribe [::subs/is-initial-loading?])]
[:nav {:class "navbar has-shadow is-fixed-top is-grey"}
[:div {:class "container"}
[:div {:class "navbar-brand"}
[:a {:class "navbar-item", :href "../"}
@@ -164,27 +171,28 @@
(when-not is-initial-loading
[:div.navbar-start
[:a.navbar-item {:class [(active-when ap = :index)]
:href (bidi/path-for routes/routes :index)}
:href (bidi/path-for routes/routes :index)}
"Home" ]
[:a.navbar-item {:class [(active-when ap #{:unpaid-invoices :paid-invoices})]
:href (bidi/path-for routes/routes :unpaid-invoices)}
"Invoices" ]
[:a.navbar-item {:class [(active-when ap = :payments)]
:href (bidi/path-for routes/routes :payments)}
"Payments" ]
(when (= "admin" (:user/role @user))
(when (p/can? @user {:subject :invoice-page})
[:a.navbar-item {:class [(active-when ap #{:unpaid-invoices :paid-invoices})]
:href (bidi/path-for routes/routes :unpaid-invoices)}
"Invoices" ])
(when (p/can? @user {:subject :payment-page})
[:a.navbar-item {:class [(active-when ap = :payments)]
:href (bidi/path-for routes/routes :payments)}
"Payments" ])
(when (p/can? @user {:subject :pos-page})
[:a.navbar-item {:class [(active-when ap = :pos-sales)]
:href (str (bidi/path-for ssr-routes/only-routes :pos-sales) "?date-range=week")}
:href (str (bidi/path-for ssr-routes/only-routes :pos-sales) "?date-range=week")}
"POS" ])
[:a.navbar-item {:class [(active-when ap = :transactions)]
:href (bidi/path-for routes/routes :transactions)}
"Transactions" ]
(when (not= "manager" (:user/role @user))
(when (p/can? @user {:subject :transaction-page})
[:a.navbar-item {:class [(active-when ap = :transactions)]
:href (bidi/path-for routes/routes :transactions)}
"Transactions" ])
(when (p/can? @user {:subject :ledger-page})
[:a.navbar-item {:class [(active-when ap = :ledger)]
:href (bidi/path-for routes/routes :ledger)}
"Ledger" ])])
(when-not is-initial-loading
[:div.navbar-end
(when (> (count @clients) 1)

72
src/cljs/auto_ap/views/main.cljs
View File

@@ -2,6 +2,7 @@
(:require
[re-frame.core :as re-frame]
[auto-ap.subs :as subs]
[auto-ap.permissions :as p]
[auto-ap.views.components.layouts :refer [loading-layout]]
[auto-ap.views.pages.unpaid-invoices :refer [unpaid-invoices-page paid-invoices-page all-invoices-page voided-invoices-page]]
[auto-ap.views.pages.import-invoices :refer [import-invoices-page]]
@@ -23,67 +24,86 @@
(defmulti page (fn [active-page] active-page))
(defmethod page :unpaid-invoices [_]
^{:key :unpaid}
[unpaid-invoices-page {:status :unpaid}])
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :invoice-page})
^{:key :unpaid}
[unpaid-invoices-page {:status :unpaid}]))
(defmethod page :import-invoices [_]
(import-invoices-page ))
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :invoice-page})
(import-invoices-page )))
(defmethod page :paid-invoices [_]
^{:key :paid}
[paid-invoices-page {:status :paid}])
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :invoice-page})
^{:key :paid}
[paid-invoices-page {:status :paid}]))
(defmethod page :voided-invoices [_]
^{:key :voided}
[voided-invoices-page {:status :voided}])
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :invoice-page})
^{:key :voided}
[voided-invoices-page {:status :voided}]))
(defmethod page :invoices [_]
^{:key :all}
[all-invoices-page {}])
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :invoice-page})
^{:key :all}
[all-invoices-page {}]))
(defmethod page :payments [_]
[payments-page])
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :payment-page})
[payments-page]))
(defmethod page :transactions [_]
(transactions-page {}))
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :transaction-page})
(transactions-page {})))
(defmethod page :unapproved-transactions [_]
[transactions-page {:approval-status :unapproved}])
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :transaction-page})
[transactions-page {:approval-status :unapproved}]))
(defmethod page :approved-transactions [_]
[transactions-page {:approval-status :approved}])
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :transaction-page})
[transactions-page {:approval-status :approved}]))
(defmethod page :requires-feedback-transactions [_]
[transactions-page {:approval-status :requires-feedback}])
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :transaction-page})
[transactions-page {:approval-status :requires-feedback}]))
(defmethod page :excluded-transactions [_]
[transactions-page {:approval-status :excluded}])
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :transaction-page})
[transactions-page {:approval-status :excluded}]))
(defmethod page :ledger [_]
(ledger-page))
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :ledger-page})
(ledger-page)))
(defmethod page :profit-and-loss [_]
(profit-and-loss-page))
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :ledger-page})
(profit-and-loss-page)))
(defmethod page :cash-flows [_]
(cash-flows-page))
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :ledger-page})
(cash-flows-page)))
(defmethod page :profit-and-loss-detail [_]
(profit-and-loss-detail-page))
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :ledger-page})
(profit-and-loss-detail-page)))
(defmethod page :balance-sheet [_]
(balance-sheet-page))
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :ledger-page})
(balance-sheet-page)))
(defmethod page :admin-clients [_]
(admin-clients-page))
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :admin-page})
(admin-clients-page)))
(defmethod page :admin-specific-client [_]
(admin-clients-page))
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :admin-page})
(admin-clients-page)))
(defmethod page :admin-vendors [_]
(admin-vendors-page))
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :admin-page})
(admin-vendors-page)))
(defmethod page :index [_]
(home-page))
@@ -95,10 +115,12 @@
[needs-activation-page])
(defmethod page :external-import-ledger [_]
[external-import-page])
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :ledger-page})
[external-import-page]))
(defmethod page :external-ledger [_]
[external-ledger-page])
(when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :ledger-page})
[external-ledger-page]))
(defmethod page :initial-error [_]
[error-page])

1
src/cljs/auto_ap/views/pages/transactions/common.cljs
View File

@@ -41,6 +41,7 @@
:location (:location params)
:import-batch-id (some-> (:import-batch-id params) str)
:amount-lte (:amount-lte (:amount-range params))
:linked-to (:linked-to params)
:description (:description params)
:approval-status (condp = @(re-frame/subscribe [::subs/active-page])
:transactions nil

20
src/cljs/auto_ap/views/pages/transactions/side_bar.cljs
View File

@@ -105,6 +105,26 @@
{:on-change-event [::data-page/filter-changed data-page :date-range]
:value @(re-frame/subscribe [::data-page/filter data-page :date-range])}]]
[:p.menu-label "Linking"]
[:div.field.has-addons
[:p.control [:a.button.is-small {:on-click
#(re-frame/dispatch [::data-page/filter-changed data-page :linked-to nil])}
"All" ]]
[:p.control [:a.button.is-small {:on-click
#(re-frame/dispatch [::data-page/filter-changed data-page :linked-to :none])}
"None" ]]
[:p.control [:a.button.is-small {:on-click
#(re-frame/dispatch [::data-page/filter-changed data-page :linked-to :invoice])}
"Invoice" ]]
[:p.control [:a.button.is-small {:on-click
#(re-frame/dispatch [::data-page/filter-changed data-page :linked-to :expected-deposit])}
"Expected Deposit"]]
[:p.control [:a.button.is-small {:on-click
#(re-frame/dispatch [::data-page/filter-changed data-page :linked-to :payment])}
"Payment"]]]
[:p.menu-label "Location"]
[:div.field
[:div.control [:input.input {:placeholder "SC"