effective_memberships 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240ed521dcef407cae7be663d49f877b373012b2fbd8877b787a4fa315539a2b
-  data.tar.gz: 394ebf710135b07e984df6277e80ca2340f8f4e4e61980e127dd0113ea6e2dca
+  metadata.gz: 981aea653a25a94a440ce8599ab99cab71f429ac409a839f5f061d9731239d2e
+  data.tar.gz: b88503a72edd658d63e81b49d4b17c4402dde65d717692db4dff53f3b54c02fe
 SHA512:
-  metadata.gz: 7602bafa9bd4d86c4d01db0acadf432da1b9af29c7eeee171d3e560baa74037318802e7604282986bbe09230fbee3ae8005ee1f3148ff477422d0ef5ed83d138
-  data.tar.gz: a3d51cf1a5d0941b48d1a3c400115973478acf21c501daf8e79aa61b83bb2109c314c6091d8a8742d1637b21895cd214819c94b53aef5e0743db3371f384bef8
+  metadata.gz: 67066fc2672c948a59c20cd1422e88d39a5b41be07aecf36ede4dcace2919e91c0d1058c165ebad70af7ed6dedcdc47015f447d89449c330d7cd1edf537a80cb
+  data.tar.gz: 7f46ea79c2d79e431f1150224180520850dbc683b399b9758801818d9ab213de67e6e4902a1e3861a1b16a5f54843fe048f5e0c5222d89cda27351ae5f6e28a6

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/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/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/config/routes.rb

@@ -22,6 +22,11 @@ EffectiveMemberships::Engine.routes.draw do
 
   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.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 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
@@ -252,6 +253,7 @@ files:
 - 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
@@ -293,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