effective_memberships 0.2.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f8c32ed9ffd17db6a7c0826bfb9eb72615ec3e7049adbb9f18b99cb8957c905
-  data.tar.gz: 5685ca74db5bd94d757c6a209b135160a015fddd2900ba6d66b55976a495eaa9
+  metadata.gz: b0eef9b0e1ee657cc1d68ba1bdadde44e3f89b8002889512a62f99ba77fba756
+  data.tar.gz: 0a08d2d2352e7b6a1fa1bd67ae66b99706e278c85b08eee75ef3d2e4aae8eab6
 SHA512:
-  metadata.gz: 9590986cb17a70c70183acfa7a4bf7dbc23959fd9482058737a916f767feedeb77a14444f2b6f1ed9631bb1c4d7d70affaf46e38f879a0af1a6acdc4ac480c94
-  data.tar.gz: 4dc42f6e02b50adad0c8c714ee64e97ef398828a391736db51348fed377ced92784cf116f21f147edec98eea06c365925d4d0efce559001c839d2ad89826e7ca
+  metadata.gz: db209b01ffdbe5b9071e05b7df946c72454b8edfd19833e3cb393261beed6336c65345d7133e3da3406c190e16e87612f3064e412a7bc7023191be17cfbe2691
+  data.tar.gz: f3dcfabe8a98ccae4109166398356127fb6a860d3896966681604f119fdd4b830870ae9a2f808c8fdd6a4a3be7bbbb0ba442bc8a2acb5b0e692921164f6a47a2

data/app/controllers/admin/applicant_references_controller.rb

@@ -0,0 +1,9 @@
+module Admin
+  class ApplicantReferencesController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+  end
+end

data/app/controllers/effective/applicant_references_controller.rb

@@ -24,12 +24,11 @@ module Effective
 
     def permitted_params
       permitted = params.require(:effective_applicant_reference).permit!.except(:token, :last_notified_at, :status, :status_steps)
-      authorized = current_user.effective_memberships_owners.include?(resource.applicant.owner) == false
 
-      if resource.submitted? && resource.applicant.was_submitted? && authorized
-        permitted
-      else
+      if current_user && current_user.effective_memberships_owners.include?(resource.applicant&.owner)
         permitted.except(:reservations, :reservations_reason, :work_history, :accept_declaration)
+      else
+        permitted
       end
 
     end

data/app/controllers/effective/memberships_directory_controller.rb

@@ -0,0 +1,14 @@
+module Effective
+  class MembershipsDirectoryController < ApplicationController
+    include Effective::CrudController
+
+    def index
+      @page_title = 'Directory'
+
+      EffectiveResources.authorize!(self, :index, Effective::Membership)
+
+      @datatable = EffectiveResources.best('EffectiveMembershipsDirectoryDatatable').new
+    end
+
+  end
+end

data/app/datatables/admin/effective_applicant_references_datatable.rb

@@ -0,0 +1,31 @@
+class Admin::EffectiveApplicantReferencesDatatable < Effective::Datatable
+
+  datatable do
+    order :name
+
+    col :applicant
+
+    col :name
+    col :email
+    col :phone
+
+    col :status do |reference|
+      if reference.submitted?
+        'Waiting on response'
+      elsif reference.completed?
+        'Completed'
+      end
+    end
+
+    col :last_notified_at do |reference|
+      reference.last_notified_at&.strftime('%F') unless reference.completed?
+    end
+
+    actions_col
+  end
+
+  collection do
+    Effective::ApplicantReference.deep.all
+  end
+
+end

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -8,7 +8,7 @@ module Admin
       col :owner_id, visible: false
       col :owner_type, visible: false
 
-      col :owner
+      val :owner
       col :categories
 
       col :number
@@ -28,7 +28,7 @@ module Admin
     end
 
     collection do
-      memberships = Effective::Membership.deep.all
+      memberships = Effective::Membership.deep.all.includes(:owner)
 
       raise('expected an owner_id, not user_id') if attributes[:user_id].present?
 

data/app/datatables/effective_memberships_directory_datatable.rb

@@ -0,0 +1,31 @@
+# Member Directory Datatable
+class EffectiveMembershipsDirectoryDatatable < Effective::Datatable
+  datatable do
+    length 100
+
+    col(:name) { |membership| membership.owner.to_s }
+
+    col :joined_on
+    col :number
+    col :categories, search: :string, label: 'Category'
+  end
+
+  collection do
+    scope = Effective::Membership.deep.includes(:owner)
+
+    archived_klasses.each do |klass|
+      scope = scope.where.not(owner_id: klass.archived.select('id'), owner_type: klass.name)
+    end
+
+    scope
+  end
+
+  def archived_klasses
+    @archived_klasses ||= begin
+      klasses = Effective::Membership.distinct(:owner_type).pluck(:owner_type)
+      klasses = klasses.select { |klass| klass.safe_constantize.try(:acts_as_archived?) }
+      klasses.map { |klass| klass.constantize }
+    end
+  end
+
+end

data/app/helpers/effective_memberships_helper.rb

@@ -1,15 +1,2 @@
 module EffectiveMembershipsHelper
-
-  def edit_effective_applicants_wizard?
-    params[:controller] == 'effective/applicants' && defined?(resource) && resource.draft?
-  end
-
-  def edit_effective_applicant_reviews_wizard?
-    params[:controller] == 'effective/applicant_reviews' && defined?(resource) && resource.draft?
-  end
-
-  def edit_effective_fee_payments_wizard?
-    params[:controller] == 'effective/fee_payments' && defined?(resource) && resource.draft?
-  end
-
 end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -16,10 +16,6 @@ module EffectiveMembershipsApplicant
   module ClassMethods
     def effective_memberships_applicant?; true; end
 
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
     # For effective_category_applicant_wizard_steps_collection
     def required_wizard_steps
       [:start, :select, :summary, :billing, :checkout, :submitted]

data/app/models/concerns/effective_memberships_applicant_review.rb

@@ -16,10 +16,6 @@ module EffectiveMembershipsApplicantReview
   module ClassMethods
     def effective_memberships_applicant_review?; true; end
 
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
     # For effective_category_applicant_wizard_steps_collection
     def required_wizard_steps
       [:start, :recommendation, :submitted]

data/app/models/concerns/effective_memberships_category.rb

@@ -176,7 +176,7 @@ module EffectiveMembershipsCategory
   end
 
   def applicant_wizard_steps_collection
-    wizard_steps = EffectiveMemberships.Applicant.const_get(:WIZARD_STEPS)
+    wizard_steps = EffectiveMemberships.Applicant.all_wizard_steps
     required_steps = EffectiveMemberships.Applicant.required_wizard_steps
 
     wizard_steps.map do |step, title|
@@ -185,7 +185,7 @@ module EffectiveMembershipsCategory
   end
 
   def fee_payment_wizard_steps_collection
-    wizard_steps = EffectiveMemberships.FeePayment.const_get(:WIZARD_STEPS)
+    wizard_steps = EffectiveMemberships.FeePayment.all_wizard_steps
     required_steps = EffectiveMemberships.FeePayment.required_wizard_steps
 
     wizard_steps.map do |step, title|

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -16,10 +16,6 @@ module EffectiveMembershipsFeePayment
   module ClassMethods
     def effective_memberships_fee_payment?; true; end
 
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
     def required_wizard_steps
       [:start, :summary, :billing, :checkout, :submitted]
     end

data/app/models/concerns/effective_memberships_owner.rb

@@ -53,10 +53,12 @@ module EffectiveMembershipsOwner
   end
 
   def effective_memberships_owners
-    owners = users if respond_to?(:users) && users.any? { |user| user.class.respond_to?(:effective_memberships_owner?) }
-    owners = organizations if respond_to?(:organizations) && organizations.any? { |organization| organization.class.respond_to?(:effective_memberships_owner?) }
+    owners = organizations if self.class.respond_to?(:effective_organizations_user?)
+    owners = users if self.class.respond_to?(:effective_organizations_organization?)
 
-    owners || [self]
+    owners = Array(owners).reject { |owner| owner.try(:archived?) }
+
+    owners.presence || [self]
   end
 
   # This is the calculated way of determining if an owner is a member or not.

data/app/models/effective/membership.rb

@@ -26,7 +26,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:membership_categories) }
+    scope :deep, -> { includes(membership_categories: :category) }
     scope :sorted, -> { order(:id) }
 
     scope :with_paid_fees_through, -> (period = nil) {

data/app/views/admin/applicant_references/_applicant_reference.html.haml

@@ -0,0 +1 @@
+= render '/effective/applicant_references/applicant_reference', applicant_reference: applicant_reference, skip_actions: true

data/app/views/admin/applicants/_form.html.haml

@@ -21,6 +21,10 @@
     = tab 'Process' do
       = render 'admin/applicants/form_process', applicant: applicant
 
+  - if applicant.applicant_references.present?
+    = tab 'References' do
+      .mb-4= render_inline_datatable(Admin::EffectiveApplicantReferencesDatatable.new(applicant: applicant))
+
   - if applicant.fees.present?
     = tab 'Fees' do
       .mb-4= render_inline_datatable(Admin::EffectiveFeesDatatable.new(applicant_id: applicant.to_param))

data/app/views/admin/applicants/_status.html.haml

@@ -51,9 +51,9 @@
             = applicant.min_applicant_references
             Required References Responded
         - else
-          - if applicant.applicant_references.count(&:submitted?) > 0
+          - if applicant.applicant_references.present?
             %p
-              = applicant.applicant_references.count(&:submitted?)
+              = applicant.applicant_references.count(&:completed?)
               = '/'
               = applicant.applicant_references.count
               References Responded

data/app/views/effective/applicant_references/_applicant_reference.html.haml

@@ -23,7 +23,7 @@
           - elsif reference.completed?
             Response completed
 
-    - if reference.applicant.was_submitted? && !reference.completed?
+    - unless reference.applicant.was_approved?
       %tr
         %th Last Notified at
         %td= reference.last_notified_at&.strftime('%F') || 'Never'

data/app/views/effective/applicants/_applicant.html.haml

@@ -1,6 +1,3 @@
 .effective-applicant
-  - blacklist = EffectiveMemberships.Applicant.required_wizard_steps
-  - steps = applicant.required_steps - blacklist
-
-  - steps.select { |step| applicant.has_completed_step?(step) }.each do |partial|
+  - applicant.render_steps.each do |partial|
     = render "effective/applicants/#{partial}", applicant: applicant, step: partial

data/app/views/effective/applicants/_course_amounts.html.haml

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:course_amounts)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:course_amounts)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:course_amounts)) if edit_effective_wizard?
 
 
     - applicant.applicant_course_areas_collection.each do |area|

data/app/views/effective/applicants/_declarations.html.haml

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:declarations)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:declarations)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:declarations)) if edit_effective_wizard?
 
     %table.table
       %tbody

data/app/views/effective/applicants/_demographics.html.haml

@@ -4,6 +4,6 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:demographics)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:demographics)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:demographics)) if edit_effective_wizard?
 
     = render 'effective/applicants/demographics_owner', applicant: applicant, owner: applicant.owner

data/app/views/effective/applicants/_education.html.haml

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:education)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:education)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:education)) if edit_effective_wizard?
 
     - datatable = EffectiveApplicantEducationsDatatable.new(applicant_id: applicant.id)
     .mb-4= render_simple_datatable(datatable)

data/app/views/effective/applicants/_experience.html.haml

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:experience)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:experience)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:experience)) if edit_effective_wizard?
 
     %table.table
       %tbody

data/app/views/effective/applicants/_files.html.haml

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:files)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:files)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:files)) if edit_effective_wizard?
 
     %table.table
       %tbody

data/app/views/effective/applicants/_references.html.haml

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:references)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:references)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:references)) if edit_effective_wizard?
 
     - applicant.applicant_references.each_with_index do |applicant_reference, index|
       - if index > 0

data/app/views/effective/applicants/_select.html.haml

@@ -0,0 +1 @@
+-# Intentionally blank

data/app/views/effective/applicants/submitted.html.haml

@@ -34,11 +34,8 @@
     = collapse('Show application...', card_class: 'my-2') do
       = render 'effective/applicants/applicant', applicant: resource
 
-  = render 'effective/applicants/orders', applicant: resource
-
-  -# - if resource.can_visit_step?(next_step)
-  -#   = effective_form_with(model: resource, url: wizard_path(step)) do |f|
-  -#     = f.hidden_field :current_step
-  -#     = f.submit 'Save and Continue', class: 'btn btn-primary'
+  .mb-4
+    = collapse('Show orders...', card_class: 'my-2') do
+      = render 'effective/applicants/orders', applicant: resource
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary btn-block'

data/app/views/effective/fee_payments/_declarations.html.haml

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= fee_payment.wizard_step_title(:declarations)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:declarations)) if edit_effective_fee_payments_wizard?
+        = link_to('Edit', wizard_path(:declarations)) if edit_effective_wizard?
 
     %table.table
       %tbody

data/app/views/effective/fee_payments/_demographics.html.haml

@@ -4,6 +4,6 @@
       .col-sm
         %h5.card-title= fee_payment.wizard_step_title(:demographics)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:demographics)) if edit_effective_fee_payments_wizard?
+        = link_to('Edit', wizard_path(:demographics)) if edit_effective_wizard?
 
     = render 'effective/fee_payments/demographics_owner', fee_payment: fee_payment, owner: fee_payment.owner

data/app/views/effective/fee_payments/_fee_payment.html.haml

@@ -1,6 +1,3 @@
 .effective-fee-payment
-  - blacklist = EffectiveMemberships.FeePayment.required_wizard_steps
-  - steps = fee_payment.required_steps - blacklist
-
-  - steps.select { |step| fee_payment.has_completed_step?(step) }.each do |partial|
+  - fee_payment.render_steps.each do |partial|
     = render "effective/fee_payments/#{partial}", fee_payment: fee_payment, resource: fee_payment, step: partial

data/app/views/effective/fee_payments/_summary.html.haml

@@ -0,0 +1 @@
+-# Intentionally blank

data/app/views/effective/fee_payments/submitted.html.haml

@@ -9,6 +9,7 @@
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
 
+  = render 'effective/fee_payments/summary', fee_payment: resource
   = render 'effective/fee_payments/fee_payment', fee_payment: resource
   = render 'effective/fee_payments/orders', fee_payment: resource
 

data/app/views/effective/memberships_directory/index.html.haml

@@ -0,0 +1 @@
+= render_datatable(@datatable, buttons: false)

data/config/routes.rb

@@ -16,10 +16,17 @@ EffectiveMemberships::Engine.routes.draw do
     resources :fee_payments, only: [:new, :show] do
       resources :build, controller: :fee_payments, only: [:show, :update]
     end
+
+    get '/directory', to: 'memberships_directory#index'
   end
 
   namespace :admin do
     resources :applicants, except: [:new, :create, :show]
+
+    resources :applicant_references, only: [:show] do
+      post :notify, on: :member
+    end
+
     resources :fees
     resources :categories, except: [:show]
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.2.0'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -240,6 +240,7 @@ files:
 - app/assets/stylesheets/effective_memberships/base.scss
 - app/controllers/admin/applicant_course_areas_controller.rb
 - app/controllers/admin/applicant_course_names_controller.rb
+- app/controllers/admin/applicant_references_controller.rb
 - app/controllers/admin/applicants_controller.rb
 - app/controllers/admin/categories_controller.rb
 - app/controllers/admin/fee_payments_controller.rb
@@ -249,8 +250,10 @@ files:
 - app/controllers/effective/applicant_references_controller.rb
 - app/controllers/effective/applicants_controller.rb
 - app/controllers/effective/fee_payments_controller.rb
+- app/controllers/effective/memberships_directory_controller.rb
 - app/datatables/admin/effective_applicant_course_areas_datatable.rb
 - app/datatables/admin/effective_applicant_course_names_datatable.rb
+- app/datatables/admin/effective_applicant_references_datatable.rb
 - app/datatables/admin/effective_applicants_datatable.rb
 - app/datatables/admin/effective_categories_datatable.rb
 - app/datatables/admin/effective_fee_payments_datatable.rb
@@ -263,6 +266,7 @@ files:
 - app/datatables/effective_applicant_references_datatable.rb
 - app/datatables/effective_applicants_datatable.rb
 - app/datatables/effective_fee_payments_datatable.rb
+- app/datatables/effective_memberships_directory_datatable.rb
 - app/helpers/effective_memberships_helper.rb
 - app/mailers/effective/memberships_mailer.rb
 - app/models/concerns/effective_memberships_applicant.rb
@@ -291,6 +295,7 @@ files:
 - app/views/admin/applicant_course_areas/_form_applicant_course_area.html.haml
 - app/views/admin/applicant_course_areas/index.html.haml
 - app/views/admin/applicant_course_name/_form.html.haml
+- app/views/admin/applicant_references/_applicant_reference.html.haml
 - app/views/admin/applicants/_form.html.haml
 - app/views/admin/applicants/_form_approve.html.haml
 - app/views/admin/applicants/_form_decline.html.haml
@@ -338,6 +343,7 @@ files:
 - app/views/effective/applicants/_layout.html.haml
 - app/views/effective/applicants/_orders.html.haml
 - app/views/effective/applicants/_references.html.haml
+- app/views/effective/applicants/_select.html.haml
 - app/views/effective/applicants/_summary.html.haml
 - app/views/effective/applicants/billing.html.haml
 - app/views/effective/applicants/checkout.html.haml
@@ -361,6 +367,7 @@ files:
 - app/views/effective/fee_payments/_fee_payment.html.haml
 - app/views/effective/fee_payments/_layout.html.haml
 - app/views/effective/fee_payments/_orders.html.haml
+- app/views/effective/fee_payments/_summary.html.haml
 - app/views/effective/fee_payments/billing.html.haml
 - app/views/effective/fee_payments/checkout.html.haml
 - app/views/effective/fee_payments/declarations.html.haml
@@ -372,6 +379,7 @@ files:
 - app/views/effective/fees/_fee.html.haml
 - app/views/effective/memberships/_dashboard.html.haml
 - app/views/effective/memberships/_membership.html.haml
+- app/views/effective/memberships_directory/index.html.haml
 - app/views/effective/memberships_mailer/applicant_approved.liquid
 - app/views/effective/memberships_mailer/applicant_declined.liquid
 - app/views/effective/memberships_mailer/applicant_reference_notification.liquid