effective_memberships 0.6.13 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58da6947ec96b076bd125a190e31ade30e7964b6dc796423dc7387efa156a246
-  data.tar.gz: 5805aa420a911f2abbb4d38ceaf1d6d743a3932e3b47a14b3b1e4a8796afd0bd
+  metadata.gz: a205c16844097a8874a4f40bda0465c96bd75cbda0ca7505cd74222180891323
+  data.tar.gz: f0edcff046181395c697a0c1ce386188dd28d419c7f3c5b9c466f6f9c51b972c
 SHA512:
-  metadata.gz: ea84383f2dbd0763c31e4c8a1c13f16d474d96e749502717dec4825cdbd50eee9fe3dbf3572650dcccedc3f05785bc283c0451fd9ac51fee5f17fd7fa738e7b6
-  data.tar.gz: f0d0dad74b75782b25fc76f786b6e1d042faa591941ebc747ac85d24301dda54e8d3fc5be080ef5827ac251de0f60d23eafea443106565fb872fd2ccdb9bf1a6
+  metadata.gz: d2abc588db28def44fbebc89138443c1de6e4cfba9654b2e0b93d2d399eca177b3ce0da51a0a62ac50dea6585518459609bc3a7749061719f9ea5f2c3572dfd2
+  data.tar.gz: 37e0ca136d376fba18e6d84eba56289a81c17c7da9268aaab10c415b78aecc5f83c256dd1a9eb43a4d4c362491b8deaf0223a711fcdf957007ccca463728c1d0

data/app/controllers/admin/applicant_reviews_controller.rb

@@ -0,0 +1,19 @@
+module Admin
+  class ApplicantReviewsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+    resource_scope -> { EffectiveMemberships.ApplicantReview.deep.all }
+    datatable -> { Admin::EffectiveApplicantReviewsDatatable.new }
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_applicant_review) ? :effective_applicant_review: :applicant_review)
+      params.require(model).permit!
+    end
+
+  end
+end

data/app/controllers/effective/applicant_reviews_controller.rb

@@ -0,0 +1,13 @@
+module Effective
+  class ApplicantReviewsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+
+    include Effective::WizardController
+
+    resource_scope -> {
+      applicant = EffectiveMemberships.Applicant.find(params[:applicant_id])
+      EffectiveMemberships.ApplicantReview.deep.where(reviewer: current_user, applicant: applicant)
+    }
+
+  end
+end

data/app/datatables/admin/effective_applicant_reviews_datatable.rb

@@ -0,0 +1,24 @@
+module Admin
+  class EffectiveApplicantReviewsDatatable < Effective::Datatable
+    datatable do
+      order :submitted_at
+
+      col :created_at, visible: false
+      col :id, visible: false
+
+      col :submitted_at, label: 'Reviewed', as: :date
+      col :reviewer
+      col :applicant
+
+      col :recommendation
+      col :comments
+
+      actions_col
+    end
+
+    collection do
+      EffectiveMemberships.ApplicantReview.deep.submitted
+    end
+
+  end
+end

data/app/datatables/effective_applicant_reviews_datatable.rb

@@ -0,0 +1,25 @@
+# Dashboard ApplicantReviews
+class EffectiveApplicantReviewsDatatable < Effective::Datatable
+  datatable do
+    order :id, :desc
+
+    col :created_at, visible: false
+    col :id, visible: false
+
+    col :applicant
+    col :reviewer, visible: false
+
+    col :submitted_at, label: 'Reviewed', as: :date
+    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))
+    end
+  end
+
+  collection do
+    EffectiveMemberships.ApplicantReview.deep.submitted.where(reviewer: current_user)
+  end
+
+end

data/app/datatables/effective_available_applicant_reviews_datatable.rb

@@ -0,0 +1,40 @@
+# Dashboard Available Applicant Reviews
+class EffectiveAvailableApplicantReviewsDatatable < Effective::Datatable
+  datatable do
+    order :created_at
+
+    col :id, visible: false
+
+    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 :user
+    col :category, label: 'Category'
+    col :to_status, label: 'Status'
+
+    actions_col(show: false) do |applicant|
+      applicant_review = applicant.applicant_review(reviewer: current_user)
+
+      if applicant_review.blank?
+        dropdown_link_to('Start Review', effective_memberships.new_applicant_applicant_review_path(applicant), 'data-turbolinks' => false)
+      elsif applicant_review.in_progress?
+        dropdown_link_to('Continue', effective_memberships.applicant_applicant_review_build_path(applicant, applicant_review, applicant_review.next_step), 'data-turbolinks' => false)
+        dropdown_link_to('Delete', effective_memberships.applicant_applicant_review_path(applicant, applicant_review), 'data-confirm': "Really delete #{applicant_review}?", 'data-method': :delete)
+      else
+        dropdown_link_to('Show', effective_memberships.applicant_applicant_review_path(applicant, applicant_review), 'data-turbolinks' => false)
+      end
+    end
+  end
+
+  collection do
+    # These ones have already been submitted by this reviewer
+    submitted = EffectiveMemberships.ApplicantReview.deep.submitted.where(reviewer: current_user).select('applicant_id')
+
+    EffectiveMemberships.Applicant.deep.reviewable.where.not(id: submitted)
+  end
+
+end

data/app/mailers/effective/memberships_mailer.rb

@@ -4,11 +4,21 @@ module Effective
     include EffectiveMailer
     include EffectiveEmailTemplatesMailer if EffectiveMemberships.use_effective_email_templates
 
+    def applicant_submitted(resource, opts = {})
+      @assigns = assigns_for(resource)
+      @applicant = resource
+
+      subject = subject_for(__method__, "Applicant Submitted - #{resource}", resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.user.email, subject: subject, **headers)
+    end
+
     def applicant_completed(resource, opts = {})
       @assigns = assigns_for(resource)
       @applicant = resource
 
-      subject = subject_for(__method__, 'Applicant Completed', resource, opts)
+      subject = subject_for(__method__, "Applicant Completed - #{resource}", resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: resource.user.email, subject: subject, **headers)
@@ -18,7 +28,7 @@ module Effective
       @assigns = assigns_for(resource)
       @applicant = resource
 
-      subject = subject_for(__method__, 'Applicant Missing Info', resource, opts)
+      subject = subject_for(__method__, "Applicant Missing Info - #{resource}", resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: resource.user.email, subject: subject, **headers)
@@ -28,7 +38,7 @@ module Effective
       @assigns = assigns_for(resource)
       @applicant = resource
 
-      subject = subject_for(__method__, 'Applicant Approved', resource, opts)
+      subject = subject_for(__method__, "Applicant Approved - #{resource}", resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: resource.user.email, subject: subject, **headers)
@@ -38,7 +48,7 @@ module Effective
       @assigns = assigns_for(resource)
       @applicant = resource
 
-      subject = subject_for(__method__, 'Applicant Declined', resource, opts)
+      subject = subject_for(__method__, "Applicant Declined - #{resource}", resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: resource.user.email, subject: subject, **headers)
@@ -64,6 +74,17 @@ module Effective
       mail(to: resource.email, subject: subject, **headers)
     end
 
+    def applicant_review_submitted(resource, opts = {})
+      @assigns = assigns_for(resource)
+      @applicant_review = resource
+      @applicant = resource.applicant
+
+      subject = subject_for(__method__, "Applicant Review Submitted - #{resource.applicant}", resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: mailer_admin, subject: subject, **headers)
+    end
+
     protected
 
     def assigns_for(resource)
@@ -71,6 +92,10 @@ module Effective
         return applicant_assigns(resource).merge(owner_assigns(resource.owner)).merge(membership_assigns(resource.owner.membership))
       end
 
+      if resource.class.respond_to?(:effective_memberships_applicant_review?)
+        return applicant_review_assigns(resource).merge(applicant_assigns(resource.applicant)).merge(owner_assigns(resource.applicant.owner)).merge(membership_assigns(resource.applicant.owner.membership))
+      end
+
       if resource.kind_of?(Effective::ApplicantEndorsement)
         return endorsement_assigns(resource).merge(owner_assigns(resource.applicant.owner))
       end
@@ -103,6 +128,23 @@ module Effective
       { applicant: values }
     end
 
+    def applicant_review_assigns(applicant_review)
+      raise('expected an applicant review') unless applicant_review.class.respond_to?(:effective_memberships_applicant_review?)
+
+      values = {
+        date: (applicant_review.submitted_at || Time.zone.now).strftime('%F'),
+        submitted_at: (applicant_review.submitted_at&.strftime('%F') || 'not submitted'),
+
+        url: effective_memberships.applicant_applicant_review_url(applicant_review.applicant, applicant_review),
+        admin_url: effective_memberships.admin_applicant_review_url(applicant_review),
+
+        recommendation: applicant_review.recommendation.presence,
+        comments: applicant_review.comments.presence
+      }.compact
+
+      { applicant_review: values }
+    end
+
     def membership_assigns(membership)
       return {} if membership.blank?
       raise('expected a membership') unless membership.kind_of?(Effective::Membership)
@@ -149,5 +191,16 @@ module Effective
       { user: values }
     end
 
+    def reviewer_assigns(owner)
+      raise('expected a owner') unless owner.class.respond_to?(:effective_memberships_owner?)
+
+      values = {
+        name: owner.to_s,
+        email: owner.email
+      }
+
+      { reviewer: values }
+    end
+
   end
 end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -187,6 +187,8 @@ module EffectiveMembershipsApplicant
 
     scope :not_draft, -> { where.not(status: :draft) }
 
+    scope :reviewable, -> { where(status: :completed) }
+
     scope :for, -> (user) {
       raise('expected a effective memberships user') unless user.class.try(:effective_memberships_user?)
       where(user: user).or(where(organization: user.organizations))
@@ -488,6 +490,8 @@ module EffectiveMembershipsApplicant
       stamps.each { |stamp| stamp.submit! }
 
       after_commit do
+        send_email(:applicant_submitted)
+
         applicant_endorsements.each { |endorsement| endorsement.notify! if endorsement.submitted? }
         applicant_references.each { |reference| reference.notify! if reference.submitted? }
       end
@@ -569,7 +573,7 @@ module EffectiveMembershipsApplicant
     when 'reviewed'
       "This application has been reviewed and is now ready for an admin to approve or decline it. If approved, prorated fees will be generated."
     when 'approved'
-      "The application has been approved! All done!"
+      "The application has been approved. All done."
     when 'declined'
       "This application has been declined."
     else
@@ -750,6 +754,10 @@ module EffectiveMembershipsApplicant
   end
 
   # Completed -> Reviewed requirements
+  def reviewable?
+    completed?
+  end
+
   def applicant_reviews_required?
     (min_applicant_reviews > 0 || applicant_reviews.present?)
   end
@@ -758,6 +766,16 @@ module EffectiveMembershipsApplicant
     category&.min_applicant_reviews.to_i
   end
 
+  # Find
+  def applicant_review(reviewer:)
+    applicant_reviews.find { |ar| ar.reviewer_id == reviewer.id && ar.reviewer_type == reviewer.class.name }
+  end
+
+  # Find or build
+  def build_applicant_review(reviewer:)
+    applicant_review(reviewer: reviewer) || applicant_reviews.build(reviewer: reviewer)
+  end
+
   # When an application is completed, these must be done to go to reviewed
   # An Admin can override this and just set them to reviewed.
   def reviewed_requirements
@@ -765,17 +783,22 @@ module EffectiveMembershipsApplicant
     return requirements unless category.present?
 
     if applicant_reviews_required?
-      requirements['Applicant Reviews'] = (applicant_reviews.count(&:completed?) >= min_applicant_reviews)
+      requirements['Applicant Reviews'] = (applicant_reviews.count(&:done?) >= min_applicant_reviews)
     end
 
     requirements
   end
 
+  # Called when an applicant_review was submitted
+  def try_reviewed!
+    return false unless completed? && reviewed_requirements.values.all?
+    reviewed!
+  end
+
   def review!
     raise('applicant must have been submitted to review!') unless was_submitted?
 
     # Let an admin ignore these requirements if need be
-    # return false unless completed? && reviewed_requirements.values.all?
     reviewed!
   end
 

data/app/models/concerns/effective_memberships_applicant_review.rb

@@ -2,7 +2,7 @@
 
 # EffectiveMembershipsApplicantReview
 #
-# Mark your category model with effective_memberships_applicant_review to get all the includes
+# Mark your owner model with effective_memberships_applicant_review to get all the includes
 
 module EffectiveMembershipsApplicantReview
   extend ActiveSupport::Concern
@@ -22,82 +22,60 @@ module EffectiveMembershipsApplicantReview
     end
 
     def recommendations
-      ['Accept', 'Reject']
+      ['Recommend Approve', 'Recommend Decline', 'Missing Information']
     end
 
   end
 
   included do
-    log_changes if respond_to?(:log_changes)
+    log_changes(to: :applicant) if respond_to?(:log_changes)
 
     acts_as_tokened
 
     acts_as_statused(
-      :draft,         # Just Started
-      :conflicted,    # Conflict of Interest
-      :accepted,      # Accepted
-      :rejected       # Rejected
+      :draft,       # Just Started
+      :submitted    # All Done
     )
 
     acts_as_wizard(
       start: 'Start',
-      conflict: 'Conflict of Interest',
-      education: 'Education',
-      course_amounts: 'Courses',
-      experience: 'Work Experience',
-      references: 'References',
-      files: 'Attach Files',
-      declarations: 'Declarations',
+      review: 'Review Applicant',
       recommendation: 'Recommendation',
       submitted: 'Submitted'
     )
 
+    scope :in_progress, -> { where(status: :draft) }
+    scope :done, -> { where(status: :submitted) }
+
     belongs_to :applicant
     belongs_to :reviewer, polymorphic: true
 
     effective_resource do
       submitted_at              :datetime
-      recommendation            :string
 
+      recommendation            :string
       comments                  :text         # Rolling comments
 
-      # Conflict Step
-      conflict_of_interest      :boolean
-
-      # Education Step
-      education_accepted        :boolean
-
-      # Course Amounts
-      course_amounts_accepted   :boolean
-
-      # Courses
-      courses_accepted          :boolean
-
-      # Experience Step
-      experience_accepted       :boolean
-
-      # References Step
-      references_accepted       :boolean
-
-      # References Step
-      files_accepted            :boolean
-
       timestamps
     end
 
-    scope :deep, -> { includes(:reviewer, applicant: :owner) }
+    scope :deep, -> { includes(:reviewer, applicant: :user) }
 
-    with_options(if: -> { current_step == :conflict }) do
-      validates :conflict_of_interest, inclusion: { in: [true, false] }
-      validates :comments, presence: true, if: -> { conflict_of_interest? }
-    end
+    scope :for, -> (user) {
+      raise('expected a effective memberships user') unless user.class.try(:effective_memberships_user?)
+      where(reviewer: user)
+    }
 
-    validates :recommendation, absence: true, if: -> { done? && conflict_of_interest? }
+    with_options(if: -> { submitted? }) do
+      validates :recommendation, presence: true
 
-    after_commit(on: :create, if: -> { applicant.completed? }) { notify! }
+      validate do
+        self.errors.add(:recommendation, 'is invalid') unless EffectiveMemberships.ApplicantReview.recommendations.include?(recommendation)
+      end
+    end
 
     def to_s
-      'applicant review'
+      "Review of #{applicant}"
     end
 
     def in_progress?
@@ -105,43 +83,31 @@ module EffectiveMembershipsApplicantReview
     end
 
     def done?
-      !draft?
+      submitted?
     end
 
-    def conflict_of_interest!
-      update!(conflict_of_interest: true, recommendation: nil)
-      conflicted!
-
-      applicant.save!
-
-      after_commit { send_email(:applicant_review_conflict_of_interest) }
-      true
+    def can_visit_step?(step)
+      return (step == :submitted) if was_submitted?
+      can_revisit_completed_steps(step)
     end
 
-    def accept!
-      assign_attributes(recommendation: 'Accept')
-      accepted!
-
-      applicant.save!
-
-      after_commit { send_email(:applicant_review_completed) }
-      true
+    # Called by the recommendation wizard step
+    def recommendation!
+      submit!
     end
 
-    def reject!
-      assign_attributes(recommendation: 'Reject')
-      rejected!
-
-      applicant.save!
+    def submit!
+      submitted!
+      applicant.try_reviewed!
 
-      after_commit { send_email(:applicant_review_completed) }
+      after_commit { send_email(:applicant_review_submitted) }
       true
     end
 
     private
 
     def send_email(email)
-      EffectiveMemberships.send_email(email, self, email_form_params) unless email_form_skip?
+      EffectiveMemberships.send_email(email, self)
     end
 
   end

data/app/models/concerns/effective_memberships_owner.rb

@@ -43,6 +43,11 @@ module EffectiveMembershipsOwner
       without_role(:member).where(id: removed.select(:owner_id))
     }
 
+    scope :membership_good_standing, -> {
+      bad_standing = Effective::Membership.where(bad_standing: false).where(owner_type: name)
+      where(id: bad_standing.select(:owner_id))
+    }
+
     scope :membership_bad_standing, -> {
       bad_standing = Effective::Membership.where(bad_standing: true).where(owner_type: name)
       where(id: bad_standing.select(:owner_id))
@@ -71,6 +76,20 @@ module EffectiveMembershipsOwner
       where(id: memberships.where(owner_type: name).select(:owner_id))
     }
 
+    scope :membership_joined_before, -> (date) {
+      raise('expected a date') unless date.respond_to?(:strftime)
+
+      joined_before = Effective::Membership.joined_before(date).where(owner_type: name)
+      where(id: joined_before.select(:owner_id))
+    }
+
+    scope :membership_joined_after, -> (date) {
+      raise('expected a date') unless date.respond_to?(:strftime)
+
+      joined_after = Effective::Membership.joined_after(date).where(owner_type: name)
+      where(id: joined_after.select(:owner_id))
+    }
+
   end
 
   def assign_member_role

data/app/models/concerns/effective_memberships_user.rb

@@ -21,6 +21,7 @@ module EffectiveMembershipsUser
     # App scoped
     has_many :applicants, -> { order(:id) }, inverse_of: :user, as: :user
     has_many :fee_payments, -> { order(:id) }, inverse_of: :user, as: :user
+    has_many :applicant_reviews, -> { order(:id) }, inverse_of: :reviewer, as: :reviewer
 
     # Effective Scoped
     has_many :representatives, -> { Effective::Representative.sorted },
@@ -85,4 +86,9 @@ module EffectiveMembershipsUser
     membership_history_on(date).try(:membership_categories)
   end
 
+  # Roles
+  def applicant_reviewer?
+    false
+  end
+
 end

data/app/models/effective/membership.rb

@@ -36,6 +36,9 @@ module Effective
 
     scope :good_standing, -> { where(bad_standing: [nil, false]) }
 
+    scope :joined_before, -> (date) { where(arel_table[:joined_on].lt(date)) }
+    scope :joined_after, -> (date) { where(arel_table[:joined_on].gteq(date)) }
+
     scope :with_paid_fees_through, -> (period = nil) {
       where(arel_table[:fees_paid_period].gteq(period || EffectiveMemberships.Registrar.current_period))
     }

data/app/views/admin/applicant_reviews/_applicant_review.html.haml

@@ -0,0 +1 @@
+= render 'effective/applicant_reviews/applicant_review', applicant_review: applicant_review

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

@@ -17,6 +17,10 @@
       = render 'effective/applicants/applicant', applicant: applicant, namespace: :admin
 
   - # Just normal tabs now
+  - if applicant.applicant_reviews.present?
+    = tab 'Reviews' do
+      .mb-4= render_inline_datatable(Admin::EffectiveApplicantReviewsDatatable.new(applicant: applicant))
+
   - if applicant.was_submitted? && !applicant.was_approved?
     = tab 'Process' do
       = render 'admin/applicants/form_process', applicant: applicant

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

@@ -107,10 +107,10 @@
               - if applicant.reviewed_requirements['Applicant Reviews']
                 = icon('check', class: 'small-1')
 
-              = applicant.applicant_reviews.count(&:completed?)
+              = applicant.applicant_reviews.count(&:submitted?)
               = '/'
               = applicant.min_applicant_reviews
-              Reviews Completed
+              Reviews Submitted
           - else
             %p
               = icon('check', class: 'small-1')

data/app/views/effective/applicant_endorsements/complete.html.haml

@@ -1,2 +1,2 @@
 = card do
-  %p Thank you! The confidential endorsement has been completed.
+  %p Thank you. The confidential endorsement has been completed.

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

@@ -1,2 +1,2 @@
 = card do
-  %p Thank you! The confidential reference has been completed.
+  %p Thank you. The confidential reference has been completed.

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

@@ -0,0 +1,4 @@
+.effective-applicant-review
+  - applicant_review.render_steps.each do |partial|
+    - applicant_review.render_step = partial
+    = render "effective/applicant_reviews/#{partial}", applicant_review: applicant_review

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

@@ -0,0 +1,8 @@
+- all_steps_content = resource.applicant&.category&.rich_text_applicant_review_all_steps_content
+- step_content = resource.applicant&.category&.send("rich_text_applicant_review_#{step}_content")
+
+- if all_steps_content.present?
+  .mb-2= all_steps_content
+
+- if step_content.present?
+  .mb-2= step_content

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

@@ -0,0 +1,36 @@
+- authorized = EffectiveResources.authorized?(self, :new, EffectiveMemberships.ApplicantReview)
+
+- available = EffectiveResources.best('EffectiveAvailableApplicantReviewsDatatable').new(self)
+- datatable = EffectiveResources.best('EffectiveApplicantReviewsDatatable').new(self)
+
+- # In progress
+- applicant_review = current_user.applicant_reviews.in_progress.first
+
+- if applicant_review.present? && applicant_review.draft?
+  %h2 In-Progress Applicant Review
+
+  %p
+    Your review of #{applicant_review} is incomplete.
+
+    %p
+      Please
+      = link_to("Continue review", effective_memberships.applicant_applicant_review_build_path(applicant_review.applicant, applicant_review, applicant_review.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+      or you can
+      = link_to('Abandon review', effective_memberships.applicant_applicant_review_path(applicant_review.applicant, applicant_review), 'data-confirm': "Really delete #{applicant_review}?", 'data-method': :delete, class: 'btn btn-danger')
+      to review again.
+
+    %hr
+
+%h2 Applicant Reviews
+
+- if available.present?
+  %p The following applicants are available for your review:
+
+  = render_simple_datatable(available)
+- 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)

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

@@ -0,0 +1,3 @@
+.row
+  .col-lg-3.mb-3= render_wizard_sidebar(resource)
+  .col-lg-9= yield

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

@@ -0,0 +1,23 @@
+= wizard_card(applicant_review) do
+  %table.table
+    - if request.path.start_with?('/admin')
+      %tr
+        %th Reviewer
+        %td
+          - url = (polymorphic_admin_path(applicant_review.reviewer) rescue "/admin/users/#{applicant_review.reviewer.to_param}/edit")
+          = link_to(applicant_review.reviewer, url)
+    - else
+      %tr
+        %th Reviewer
+        %td
+          = applicant_review.reviewer.to_s
+          %br
+          = mail_to(applicant_review.reviewer.email)
+
+    %tr
+      %th Recommendation
+      %td= applicant_review.recommendation
+
+    %tr
+      %th Comments
+      %td= simple_format(applicant_review.comments.presence || 'none')

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

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

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

@@ -0,0 +1,20 @@
+= render 'layout' do
+  = render 'effective/applicant_reviews/content', resource: resource
+
+  = card('Summary') do
+    = render 'effective/applicants/summary', applicant: resource.applicant
+
+  .mb-2
+    = collapse('Show application...', card_class: 'my-2') do
+      = render 'effective/applicants/applicant', applicant: resource.applicant
+
+  = card('Recommendation') do
+
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+
+      %p My recommendation is
+      = f.radios :recommendation, EffectiveMemberships.ApplicantReview.recommendations, label: false
+      = f.text_area :comments, label: 'Reviewer comments'
+
+      = f.save 'Submit Recommendation'

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

@@ -0,0 +1,14 @@
+= render 'layout' do
+  = render 'effective/applicant_reviews/content', resource: resource
+
+  = card do
+    = render 'effective/applicants/summary', applicant: resource.applicant
+    = render 'effective/applicants/applicant', applicant: resource.applicant
+
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+
+      = f.text_area :comments, label: 'Reviewer comments'
+
+      = f.save 'Save and Continue'

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

@@ -0,0 +1,18 @@
+= render 'layout' do
+  = render 'effective/applicant_reviews/content', resource: resource
+
+  = card do
+    %p Welcome #{current_user}
+
+    %p You are starting an applicant review for #{resource.applicant}.
+
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+
+      = f.hidden_field :applicant_type, value: f.object.applicant.class.name
+      = f.hidden_field :applicant_id
+
+      = f.hidden_field :reviewer_type
+      = f.hidden_field :reviewer_id
+
+      = f.save 'Save and Continue'

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

@@ -0,0 +1,15 @@
+= render 'layout' do
+  = render 'effective/applicant_reviews/content', resource: resource
+
+  - raise('expected a submitted applicant review') unless resource.was_submitted?
+
+  .alert.alert-success.mb-4
+    This review was submitted on #{resource.submitted_at.strftime('%F')}
+
+  .mb-4
+    = collapse('Show application...', card_class: 'my-2') do
+      = render 'effective/applicants/applicant', applicant: resource.applicant
+
+  = render 'effective/applicant_reviews/applicant_review', applicant_review: resource
+
+  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -54,11 +54,12 @@
         %th Stream
         %td= applicant.stream
 
-    - if applicant.orders.present?
+    - orders = applicant.orders.select { |order| EffectiveResources.authorized?(self, :show, order) }
+    - if orders.present?
       %tr
-        %th Order#{'s' if applicant.orders.length > 1}
+        %th Order#{'s' if orders.length > 1}
         %td
-          - applicant.orders.each do |order|
+          - orders.each do |order|
             - if request.path.start_with?('/admin')
               = link_to(order, effective_orders.edit_admin_order_path(order))
             - else

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

@@ -31,4 +31,4 @@
   %p= link_to 'Pay Fees', effective_memberships.new_fee_payment_path, class: 'btn btn-primary'
 
 - else
-  %p You have no outstanding fees at this time. Thank you!
+  %p You have no outstanding fees at this time. Thank you.

data/app/views/effective/memberships_mailer/applicant_approved.liquid

@@ -1,10 +1,10 @@
 ---
-subject: 'Your application was approved!'
+subject: 'Your application was approved'
 from: 'admin@example.com'
 ---
 Hello {{ user.name }},
 
-Your application for {{ applicant.to_category }} was approved!
+Your application for {{ applicant.to_category }} was approved.
 
 Please log in and purchase any outstanding fees.
 

data/app/views/effective/memberships_mailer/applicant_completed.liquid

@@ -1,5 +1,5 @@
 ---
-subject: 'Your application was marked as completed!'
+subject: 'Your application was marked as completed'
 from: 'admin@example.com'
 ---
 Hello {{ user.name }},

data/app/views/effective/memberships_mailer/applicant_review_submitted.liquid

@@ -0,0 +1,19 @@
+---
+subject: 'An applicant review has been submitted'
+from: 'admin@example.com'
+---
+Hello admin,
+
+The application for {{ user.name }} for {{ applicant.to_category }} has been reviewed by #{{ reviewer.name }}
+
+They recommended {{ applicant_review.recommendation }} with the following comments:
+
+{{ applicant_review.comments }}
+
+For more details please visit
+
+{{ applicant.admin_url }}
+
+Thanks,
+
+Have a great day

data/app/views/effective/memberships_mailer/applicant_submitted.liquid

@@ -0,0 +1,15 @@
+---
+subject: 'Your application was successfully submitted'
+from: 'admin@example.com'
+---
+Hello {{ user.name }},
+
+We have received your application for {{ applicant.to_category }} #{{ applicant.to_status }}
+
+For more details please visit
+
+{{ applicant.url }}
+
+Thank you.
+
+Please contact us for assistance.

data/config/routes.rb

@@ -7,6 +7,10 @@ EffectiveMemberships::Engine.routes.draw do
   scope module: 'effective' do
     resources :applicants, only: [:new, :show, :destroy] do
       resources :build, controller: :applicants, only: [:show, :update]
+
+      resources :applicant_reviews, only: [:new, :show, :destroy] do
+        resources :build, controller: :applicant_reviews, only: [:show, :update]
+      end
     end
 
     resources :applicant_endorsements, only: [:new, :create, :show, :update] do
@@ -45,6 +49,8 @@ EffectiveMemberships::Engine.routes.draw do
       post :notify, on: :member
     end
 
+    resources :applicant_reviews, only: [:index, :show]
+
     resources :fees
     resources :categories, only: [:index, :edit, :update]
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.6.13'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.7.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -258,6 +258,7 @@ files:
 - app/controllers/admin/applicant_course_names_controller.rb
 - app/controllers/admin/applicant_endorsements_controller.rb
 - app/controllers/admin/applicant_references_controller.rb
+- app/controllers/admin/applicant_reviews_controller.rb
 - app/controllers/admin/applicants_controller.rb
 - app/controllers/admin/categories_controller.rb
 - app/controllers/admin/fee_payments_controller.rb
@@ -270,6 +271,7 @@ files:
 - app/controllers/admin/statuses_controller.rb
 - app/controllers/effective/applicant_endorsements_controller.rb
 - app/controllers/effective/applicant_references_controller.rb
+- app/controllers/effective/applicant_reviews_controller.rb
 - app/controllers/effective/applicants_controller.rb
 - app/controllers/effective/fee_payments_controller.rb
 - app/controllers/effective/membership_cards_controller.rb
@@ -280,6 +282,7 @@ files:
 - app/datatables/admin/effective_applicant_course_names_datatable.rb
 - app/datatables/admin/effective_applicant_endorsements_datatable.rb
 - app/datatables/admin/effective_applicant_references_datatable.rb
+- app/datatables/admin/effective_applicant_reviews_datatable.rb
 - app/datatables/admin/effective_applicants_datatable.rb
 - app/datatables/admin/effective_categories_datatable.rb
 - app/datatables/admin/effective_fee_payments_datatable.rb
@@ -296,7 +299,9 @@ files:
 - app/datatables/effective_applicant_equivalences_datatable.rb
 - app/datatables/effective_applicant_experiences_datatable.rb
 - app/datatables/effective_applicant_references_datatable.rb
+- app/datatables/effective_applicant_reviews_datatable.rb
 - app/datatables/effective_applicants_datatable.rb
+- app/datatables/effective_available_applicant_reviews_datatable.rb
 - app/datatables/effective_fee_payments_datatable.rb
 - app/datatables/effective_memberships_directory_datatable.rb
 - app/datatables/effective_organizations_datatable.rb
@@ -342,6 +347,7 @@ files:
 - app/views/admin/applicant_course_name/_form.html.haml
 - app/views/admin/applicant_endorsements/_applicant_endorsement.html.haml
 - app/views/admin/applicant_references/_applicant_reference.html.haml
+- app/views/admin/applicant_reviews/_applicant_review.html.haml
 - app/views/admin/applicants/_form.html.haml
 - app/views/admin/applicants/_form_applicant.html.haml
 - app/views/admin/applicants/_form_approve.html.haml
@@ -395,6 +401,16 @@ files:
 - app/views/effective/applicant_references/_form_declaration.html.haml
 - app/views/effective/applicant_references/complete.html.haml
 - app/views/effective/applicant_references/edit.html.haml
+- app/views/effective/applicant_reviews/_applicant_review.html.haml
+- 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/_recommendation.html.haml
+- app/views/effective/applicant_reviews/_review.html.haml
+- app/views/effective/applicant_reviews/recommendation.html.haml
+- app/views/effective/applicant_reviews/review.html.haml
+- app/views/effective/applicant_reviews/start.html.haml
+- app/views/effective/applicant_reviews/submitted.html.haml
 - app/views/effective/applicants/_applicant.html.haml
 - app/views/effective/applicants/_content.html.haml
 - app/views/effective/applicants/_course_amounts.html.haml
@@ -470,6 +486,8 @@ files:
 - app/views/effective/memberships_mailer/applicant_endorsement_notification.liquid
 - app/views/effective/memberships_mailer/applicant_missing_info.liquid
 - app/views/effective/memberships_mailer/applicant_reference_notification.liquid
+- app/views/effective/memberships_mailer/applicant_review_submitted.liquid
+- app/views/effective/memberships_mailer/applicant_submitted.liquid
 - app/views/effective/organizations/_dashboard.html.haml
 - app/views/effective/organizations/_form.html.haml
 - app/views/effective/organizations/_form_organization.html.haml