effective_memberships 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bced8cc69d7024a32e2c3a659c0b97637bbf3f1d3542f1757079e66e585f3cbb
-  data.tar.gz: 695ba5032274cceb7e0f1d39f7283edf8029032323b51988875afb0149d76759
+  metadata.gz: 611d01eb6651211b44bbc681c6060aa4a74541a08ec9ac59d3b0d1972ceacbfc
+  data.tar.gz: 78796ebd87001ae6e9448f48892d61b034077637ceea0437084a259746824e57
 SHA512:
-  metadata.gz: 07ac154133b57deaa2aeb5eb26af1c2eac572e946e3b407b76715eeae3c8bf4eedb719dd8ed4c5b9a7a3e869a9b0db007dcc177fac88a048ecfa04db822f3954
-  data.tar.gz: 9139022657817e218cf169c6aa97b2eec69c89e8dc2592535f78815135289a15e098184b9a099a217112a4c213058f965cfae2835bcfc6369ba903e0f768f5d1
+  metadata.gz: 60bd9e7864f520588a47b4ef69a9460c5cbadbc7fbd0718086566787a16e785348666e87c16c41a6e95826c6b4cd5b93a5c9c67a239b14a5ed82699681e6c279
+  data.tar.gz: 5032cf5a31bda06e919a7abc9009c00ae2d3fcaf25c2889453184839b625cdaa8987c88c95ae7c462c0fb501d6303126b1f2a0b8f14778bbb7d945d49574c9ff

data/app/datatables/effective_applicant_reviews_datatable.rb

@@ -6,15 +6,21 @@ class EffectiveApplicantReviewsDatatable < Effective::Datatable
     col :created_at, visible: false
     col :id, visible: false
 
-    col :applicant
+    val :applicant, search: :string
     col :reviewer, visible: false
 
     col :submitted_at, label: 'Reviewed', as: :date
+
+    col :reviews do |applicant_review|
+      pluralize(applicant_review.applicant.applicant_reviews.count { |review| review.submitted? }, 'review')
+    end
+
     col :recommendation
     col :comments
 
     actions_col(show: false) do |applicant_review|
       dropdown_link_to('Show', effective_memberships.applicant_applicant_review_path(applicant_review.applicant, applicant_review))
+      dropdown_link_to('Review Again', effective_memberships.new_applicant_applicant_review_path(applicant_review.applicant))
     end
   end
 

data/app/datatables/effective_available_applicant_reviews_datatable.rb

@@ -7,15 +7,18 @@ class EffectiveAvailableApplicantReviewsDatatable < Effective::Datatable
 
     col :created_at, label: 'Created', as: :date, visible: false
     col :updated_at, label: 'Updated', as: :date, visible: false
-    col :submitted_at, label: 'Submitted', as: :date, visible: false
 
     # This is when they become available for review
-    col :completed_at, label: 'Date', as: :date
+    col :submitted_at, label: 'Submitted', as: :date
 
     col :user
     col :category, label: 'Category'
     col :to_status, label: 'Status'
 
+    col :reviews do |applicant|
+      pluralize(applicant.applicant_reviews.count { |review| review.submitted? }, 'review')
+    end
+
     actions_col(show: false) do |applicant|
       applicant_review = applicant.applicant_review(reviewer: current_user)
 

data/app/models/concerns/effective_memberships_applicant.rb

@@ -187,7 +187,7 @@ module EffectiveMembershipsApplicant
 
     scope :not_draft, -> { where.not(status: :draft) }
 
-    scope :reviewable, -> { where(status: :completed) }
+    scope :reviewable, -> { where.not(status: [:draft, :declined, :approved]) }
 
     scope :for, -> (user) {
       raise('expected a effective memberships user') unless user.class.try(:effective_memberships_user?)

data/app/models/concerns/effective_memberships_applicant_review.rb

@@ -59,7 +59,7 @@ module EffectiveMembershipsApplicantReview
       timestamps
     end
 
-    scope :deep, -> { includes(:reviewer, applicant: :user) }
+    scope :deep, -> { includes(:reviewer, applicant: [:user, :applicant_reviews]) }
 
     scope :for, -> (user) {
       raise('expected a effective memberships user') unless user.class.try(:effective_memberships_user?)

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -111,12 +111,12 @@ module EffectiveMembershipsFeePayment
 
     # Sanity check validations. We should not have more than 1 in progress fee payment at a time
     validate(if: -> { new_record? && user.present? }) do
-      existing = user.fee_payments.in_progress.first
+      existing = EffectiveMemberships.FeePayment.where(user: user).in_progress.first
       self.errors.add(:base, 'please complete your existing fee payment first') if existing.present?
     end
 
     validate(if: -> { new_record? && organization.present? }) do
-      existing = organization.fee_payments.in_progress.first
+      existing = EffectiveMemberships.FeePayment.where(organization: organization).in_progress.first
       self.errors.add(:base, 'please complete your existing fee payment first') if existing.present?
     end
 

data/app/views/effective/applicant_reviews/_dashboard.html.haml

@@ -26,11 +26,11 @@
 - if available.present?
   %p The following applicants are available for your review:
 
-  = render_simple_datatable(available)
+  = render_datatable(available, simple: true)
 - else
   %p There are no applicants available for your review. When there are, we'll show them here.
 
 - if datatable.present?
   .mt-4
     %h2 Review History
-    = render_datatable(datatable, simple: true)
+    = render_datatable(datatable)

data/app/views/effective/applicant_reviews/_other_reviews.html.haml

@@ -0,0 +1,7 @@
+- other_reviews = applicant_review.applicant.applicant_reviews.select { |review| review != applicant_review }
+
+- if other_reviews.present?
+  .mb-4
+    = collapse('Show other reviews') do
+      - other_reviews.each do |applicant_review|
+        = render('effective/applicant_reviews/applicant_review', applicant_review: applicant_review)

data/app/views/effective/applicant_reviews/recommendation.html.haml

@@ -8,6 +8,8 @@
     = collapse('Show application...', card_class: 'my-2') do
       = render 'effective/applicants/applicant', applicant: resource.applicant
 
+  = render 'effective/applicant_reviews/other_reviews', applicant_review: resource
+
   = card('Recommendation') do
 
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|

data/app/views/effective/applicant_reviews/review.html.haml

@@ -5,6 +5,8 @@
     = render 'effective/applicants/summary', applicant: resource.applicant
     = render 'effective/applicants/applicant', applicant: resource.applicant
 
+  = render 'effective/applicant_reviews/other_reviews', applicant_review: resource
+
   = card do
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id

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

@@ -10,6 +10,8 @@
     = collapse('Show application...', card_class: 'my-2') do
       = render 'effective/applicants/applicant', applicant: resource.applicant
 
+  = render 'effective/applicant_reviews/other_reviews', applicant_review: resource
+
   = render 'effective/applicant_reviews/applicant_review', applicant_review: resource
 
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary btn-block'
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -39,4 +39,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'
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -7,7 +7,7 @@
   .alert.alert-warning.mb-4
     Successfully paid on #{resource.submit_order.purchased_at.strftime('%F')}.
 
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
 
   = card do
     = render 'effective/fee_payments/summary', fee_payment: resource
@@ -20,4 +20,4 @@
     = collapse('Show orders...', card_class: 'my-2') do
       = render 'effective/fee_payments/orders', fee_payment: resource
 
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary'
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.2'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -407,6 +407,7 @@ files:
 - app/views/effective/applicant_reviews/_content.html.haml
 - app/views/effective/applicant_reviews/_dashboard.html.haml
 - app/views/effective/applicant_reviews/_layout.html.haml
+- app/views/effective/applicant_reviews/_other_reviews.html.haml
 - app/views/effective/applicant_reviews/_recommendation.html.haml
 - app/views/effective/applicant_reviews/_review.html.haml
 - app/views/effective/applicant_reviews/recommendation.html.haml