effective_memberships 0.13.7 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fee4d3bcf27de0af18f92b9e8cfa6c1deb2ab8d5269252bda05aa4b5053a474e
-  data.tar.gz: 1feb91e4f927b50cedadfba765af24eaee716300c65ea3d7d924226d254361ee
+  metadata.gz: 496b494a70e47e75ca34b0b9103098b982900eb5405ca4f81d6521afc9a03394
+  data.tar.gz: b1b15ed6a27e4b436c7f3269d1a5f902b91d14c94a804d075c69233a1016171e
 SHA512:
-  metadata.gz: d6a4a5e2057af3fc3f60f4e56305359f7ffd73a97cd3d2043a2c5f201039670ebd5a85e5ae3a5e2a2df4d3ede01d758b22be3166656192bfb29f30d8a4cb9be3
-  data.tar.gz: 9548a342bcf721e7cc9e1bdbe222cfcebfd832d25f9b8b26678e1e5943d513dd0b9f5127c7f32b100491dc904ca2f3a55cf37f85a2958f40a39277b385c83827
+  metadata.gz: c620514d835854625467cfe91c104d8ea5a6666915cec8f85b7b031d8a1b9b27ae54525be78f8dcd82b1369e7b4ea0a164836e7077f5b4680bea2898a87eea91
+  data.tar.gz: f51ee6087bc44f78ddf275587dc194c3d36a0535e9cbe038f8389c23aed60529810b72b1467883accc5b99e9b9df2589dd61401b012e9667cfa70963950fa4a1

data/app/controllers/effective/applicant_endorsements_controller.rb

@@ -34,7 +34,7 @@ module Effective
     protected
 
     def permitted_params
-      permitted = params.require(:effective_applicant_endorsement).permit!.except(:token, :last_notified_at, :status, :status_steps, :applicant_id, :endorser_id)
+      permitted = params.require(:effective_applicant_endorsement).permit!.except(:token, :last_notified_at, :status, :status_steps)
 
       if current_user && current_user.memberships_owners.include?(resource.applicant&.owner)
         permitted.except(:notes, :accept_declaration)

data/app/controllers/effective/applicant_references_controller.rb

@@ -23,10 +23,10 @@ module Effective
     protected
 
     def permitted_params
-      permitted = params.require(:effective_applicant_reference).permit!.except(:token, :last_notified_at, :status, :status_steps, :applicant_id)
+      permitted = params.require(:effective_applicant_reference).permit!.except(:token, :last_notified_at, :status, :status_steps)
 
       if current_user && current_user.memberships_owners.include?(resource.applicant&.owner)
-        permitted.except(:reservations, :reservations_reason, :work_history, :accept_declaration)
+        permitted.except(:reservations, :reservations_reason, :recommendation, :recommendation_reason, :title, :regulated_professional, :work_history, :accept_declaration)
       else
         permitted
       end

data/app/datatables/admin/effective_applicant_endorsements_datatable.rb

@@ -2,7 +2,11 @@ module Admin
   class EffectiveApplicantEndorsementsDatatable < Effective::Datatable
 
     datatable do
-      order :name
+      order :updated_at
+
+      col :updated_at, visible: false
+      col :created_at, visible: false
+      col :id, visible: false
 
       col :applicant
 

data/app/datatables/admin/effective_applicant_references_datatable.rb

@@ -2,22 +2,38 @@ module Admin
   class EffectiveApplicantReferencesDatatable < Effective::Datatable
 
     datatable do
-      order :name
+      order :updated_at
+
+      col :updated_at, visible: false
+      col :created_at, visible: false
+      col :id, visible: false
 
       col :applicant
 
       col :name
       col :email
       col :phone
+      col :title
+      col :regulated_professional, visible: false
 
       col :status do |reference|
         if reference.submitted?
           'Waiting on response'
         elsif reference.completed?
           'Completed'
+        else
+          reference.status
         end
       end
 
+      col :work_history, visible: false
+
+      col :reservations
+      col :reservations_reason, visible: false
+
+      col :recommendation
+      col :recommendation_reason, visible: false
+
       col :last_notified_at do |reference|
         reference.last_notified_at&.strftime('%F') unless reference.completed?
       end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -391,39 +391,41 @@ module EffectiveMembershipsApplicant
     validates :missing_info_reason, presence: true, if: -> { missing_info? }
 
     # These two try completed and try reviewed
-    # before_save(if: -> { submitted? }) { complete! }
-    # before_save(if: -> { completed? }) { review! }
+    # before_save(if: -> { submitted? }) { try_completed! }
+    # before_save(if: -> { completed? }) { try_reviewed! }
 
     # Clear required steps memoization
     after_save { @_required_steps = nil }
 
     # This required_steps is defined inside the included do .. end block so it overrides the acts_as_wizard one.
     def required_steps
+      @_required_steps ||= default_applicant_required_steps()
+    end
+
+    def default_applicant_required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
 
-      @_required_steps ||= begin
-        # All required
-        required_steps = self.class.required_wizard_steps
+      # All required
+      required_steps = self.class.required_wizard_steps
 
-        # Based on current applicant
-        applicant_steps = self.class.all_wizard_steps if category.blank?
-        applicant_steps ||= (reinstatement? ? category.applicant_reinstatement_wizard_steps : category.applicant_wizard_steps)
+      # Based on current applicant
+      applicant_steps = self.class.all_wizard_steps if category.blank?
+      applicant_steps ||= (reinstatement? ? category.applicant_reinstatement_wizard_steps : category.applicant_wizard_steps)
 
-        # Sanity check
-        applicant_steps.delete(:stamp) unless apply_to_join?
-        applicant_steps.delete(:organization) unless category&.organization?
-        applicant_steps.delete(:reinstatement) unless reinstatement?
+      # Sanity check
+      applicant_steps.delete(:stamp) unless apply_to_join?
+      applicant_steps.delete(:organization) unless category&.organization?
+      applicant_steps.delete(:reinstatement) unless reinstatement?
 
-        # change_wizard_steps is defined in effective_resources acts_as_wizard
-        applicant_steps = change_wizard_steps(applicant_steps)
+      # change_wizard_steps is defined in effective_resources acts_as_wizard
+      applicant_steps = change_wizard_steps(applicant_steps)
 
-        unless applicant_steps.kind_of?(Array) && applicant_steps.all? { |step| step.kind_of?(Symbol) }
-          raise('expected change_wizard_steps to return an Array of steps with no nils')
-        end
+      unless applicant_steps.kind_of?(Array) && applicant_steps.all? { |step| step.kind_of?(Symbol) }
+        raise('expected change_wizard_steps to return an Array of steps with no nils')
+      end
 
-        self.class.all_wizard_steps.select do |step|
-          required_steps.include?(step) || applicant_steps.include?(step)
-        end
+      self.class.all_wizard_steps.select do |step|
+        required_steps.include?(step) || applicant_steps.include?(step)
       end
     end
 
@@ -596,7 +598,12 @@ module EffectiveMembershipsApplicant
       summary = "Application has been purchased and submitted."
       tasks = "The following tasks remain before it can be completed:"
       approval = "Waiting on approval."
-      items = completed_requirements.map { |item, done| "<li>#{item}: #{done ? 'Complete' : 'Incomplete'}</li>" }.join
+
+      items = completed_requirements.map do |item, done|
+        done = (done ? 'Complete' : 'Incomplete') unless done.is_a?(String) || done.is_a?(Symbol)
+        "<li>#{item}: #{done}</li>"
+      end.join
+
       completed_requirements.present? ? "<p>#{summary} #{tasks}</p><ul>#{items}</ul>" : "#{summary} #{approval}"
     when 'completed'
       if applicant_reviews_required?
@@ -638,7 +645,7 @@ module EffectiveMembershipsApplicant
       return categories.where(can_apply_new: true)
     end
 
-    category_ids = user.membership.category_ids.map(&:to_s) - [nil, '']
+    category_ids = Array(user.membership&.category_ids).map(&:to_s) - [nil, '']
 
     categories.select do |category|
       category.can_apply_new? ||
@@ -699,7 +706,7 @@ module EffectiveMembershipsApplicant
   end
 
   def applicant_references_required?
-    required_steps.include?(:references) && min_applicant_references > 0
+    min_applicant_references > 0
   end
 
   # Endorsements Step
@@ -708,7 +715,7 @@ module EffectiveMembershipsApplicant
   end
 
   def applicant_endorsements_required?
-    required_steps.include?(:endorsements) && min_applicant_endorsements > 0
+    min_applicant_endorsements > 0
   end
 
   # Equivalences Step
@@ -768,16 +775,16 @@ module EffectiveMembershipsApplicant
     requirements = {}
     return requirements unless category.present?
 
-    if applicant_endorsements_required?
-      requirements['Applicant Endorsements'] = (applicant_endorsements.count(&:completed?) >= min_applicant_endorsements)
+    if all_steps.include?(:transcripts) || transcripts_required?
+      requirements['Transcripts'] = ('Not Required' unless transcripts_required?) || transcripts_received?
     end
 
-    if applicant_references_required?
-      requirements['Applicant References'] = (applicant_references.count(&:completed?) >= min_applicant_references)
+    if all_steps.include?(:ensorsements) || applicant_endorsements_required?
+      requirements['Endorsements'] = ('Not Required' unless applicant_endorsements_required?) || (applicant_endorsements.count(&:completed?) >= min_applicant_endorsements)
     end
 
-    if transcripts_required?
-      requirements['Applicant Transcripts'] = transcripts_received?
+    if all_steps.include?(:references) || applicant_references_required?
+      requirements['References'] = ('Not Required' unless applicant_references_required?) || (applicant_references.count(&:completed?) >= min_applicant_references)
     end
 
     requirements
@@ -820,7 +827,7 @@ module EffectiveMembershipsApplicant
   end
 
   def applicant_reviews_required?
-    (min_applicant_reviews > 0 || applicant_reviews.present?)
+    min_applicant_reviews > 0
   end
 
   def min_applicant_reviews
@@ -843,17 +850,23 @@ module EffectiveMembershipsApplicant
     requirements = {}
     return requirements unless category.present?
 
-    if applicant_reviews_required?
-      requirements['Applicant Reviews'] = (applicant_reviews.count(&:done?) >= min_applicant_reviews)
+    if EffectiveMemberships.applicant_reviews?
+      requirements['Reviews'] = ('Not Required' unless applicant_reviews_required?) || (applicant_reviews.count(&:completed?) >= min_applicant_reviews)
     end
 
     requirements
   end
 
+  # Called when an applicant is submitted
+  def try_completed!
+    return false unless submitted? && completed_requirements.values.all?
+    complete!
+  end
+
   # Called when an applicant_review was submitted
   def try_reviewed!
     return false unless completed? && reviewed_requirements.values.all?
-    reviewed!
+    review!
   end
 
   def review!

data/app/models/concerns/effective_memberships_applicant_review.rb

@@ -86,6 +86,10 @@ module EffectiveMembershipsApplicantReview
       submitted?
     end
 
+    def completed?
+      submitted?
+    end
+
     def can_visit_step?(step)
       return (step == :submitted) if was_submitted?
       can_revisit_completed_steps(step)

data/app/models/concerns/effective_memberships_owner.rb

@@ -160,7 +160,7 @@ module EffectiveMembershipsOwner
   end
 
   def registrar_action_statuses(action)
-    EffectiveMemberships.Status.sorted.all
+    EffectiveMemberships.Status.sorted.all.where.not(id: EffectiveMemberships.Registrar.not_in_good_standing_status)
   end
 
   def after_build_fee(fee)

data/app/models/effective/applicant_course.rb

@@ -33,7 +33,7 @@ module Effective
     end
 
     def to_s
-      title || 'course'
+      title.presence || model_name.human
     end
 
   end

data/app/models/effective/applicant_course_area.rb

@@ -24,7 +24,7 @@ module Effective
     validates :title, presence: true, uniqueness: true
 
     def to_s
-      title || 'course area'
+      title.presence || model_name.human
     end
 
   end

data/app/models/effective/applicant_course_name.rb

@@ -22,7 +22,7 @@ module Effective
     validates :position, presence: true
 
     def to_s
-      title || 'course name'
+      title.presence || model_name.human
     end
 
   end

data/app/models/effective/applicant_education.rb

@@ -28,7 +28,7 @@ module Effective
     end
 
     def to_s
-      degree_obtained || 'education'
+      degree_obtained.presence || model_name.human
     end
 
   end

data/app/models/effective/applicant_endorsement.rb

@@ -16,7 +16,6 @@ module Effective
     belongs_to :applicant, polymorphic: true
     belongs_to :endorser, polymorphic: true, optional: true
 
-
     effective_resource do
       # These fields are submitted by the applicant
       # They should try to select an endorser from the dropdown
@@ -82,7 +81,11 @@ module Effective
     end
 
     def to_s
-      'endorsement'
+      if (endorser.present? || name.present?)
+        "#{model_name.human} from #{endorer || name}"
+      else
+        model_name.human
+      end
     end
 
     def email

data/app/models/effective/applicant_equivalence.rb

@@ -25,7 +25,7 @@ module Effective
     end
 
     def to_s
-      name || 'equivalence'
+      name.present? ? "#{model_name.human} from #{name}" : model_name.human
     end
 
   end

data/app/models/effective/applicant_experience.rb

@@ -46,7 +46,7 @@ module Effective
     end
 
     def to_s
-      position.presence || 'work experience'
+      position.presence || model_name.human
     end
 
     def assign_months!

data/app/models/effective/applicant_reference.rb

@@ -12,29 +12,36 @@ module Effective
 
     log_changes(to: :applicant) if respond_to?(:log_changes)
 
-    belongs_to :applicant, polymorphic: true
+    belongs_to :applicant, polymorphic: true, optional: true
 
     KNOWNS = ['6 months - 1 year', '1 year - 2 years', '2 - 5 years', '5 - 10 years', 'More than 10 years']
     RELATIONSHIPS = ['Supervisor', 'Employer', 'Colleague', 'Other']
+    RECOMMENDATIONS = ['Recommend for Membership', 'Do not recommend for Membership']
 
     effective_resource do
-      # These two fields are submitted on the Applicant wizard step
+      # These fields are submitted on the Applicant wizard references step
       name    :string
       email   :string
       phone   :string
 
+      known                   :string
+      relationship            :string
+
       # As per acts_as_statused. For tracking the state machine.
       status            :string
       status_steps      :text
 
       # Reference Declaration
-      known                   :string
-      relationship            :string
+      title                 :string
+      regulated_professional :boolean
+
+      work_history            :text
 
       reservations            :boolean
       reservations_reason     :text
 
-      work_history            :text
+      recommendation          :string
+      recommendation_reason   :text
 
       accept_declaration      :boolean
 
@@ -48,27 +55,24 @@ module Effective
     scope :deep, -> { all }
 
     # All step validations
-    validates :applicant, presence: true
-
     validates :name, presence: true
     validates :email, presence: true, email: true
-    validates :phone, presence: true
-
-    validates :relationship, presence: true
-    validates :known, presence: true
 
     # When being submit by the reference
-    with_options(if: -> { completed? }) do
+    with_options(if: -> { just_completed? }) do
       validates :reference_address, presence: true
       validates :reservations_reason, presence: true, if: -> { completed? && reservations? }
       validates :work_history, presence: true
       validates :accept_declaration, acceptance: true
+
+      validates :recommendation, presence: true
+      validates :recommendation_reason, presence: true, if: -> { completed? && recommendation.present? }
     end
 
     after_commit(on: :create, if: -> { applicant.was_submitted? && !applicant.done? }, unless: -> { email_form_skip }) { notify! }
 
     def to_s
-      'reference'
+      name.present? ? "#{model_name.human} from #{name}" : model_name.human
     end
 
     def notify!

data/app/models/effective/membership.rb

@@ -129,7 +129,7 @@ module Effective
     end
 
     def to_s
-      return 'membership' if owner.blank?
+      return model_name.human if owner.blank?
 
       summary = [
         owner.to_s,

data/app/models/effective/membership_category.rb

@@ -6,7 +6,7 @@ module Effective
     log_changes(to: :membership) if respond_to?(:log_changes)
 
     def to_s
-      category&.to_s || 'membership category'
+      category&.to_s || model_name.human
     end
 
   end

data/app/models/effective/membership_history.rb

@@ -38,7 +38,7 @@ module Effective
     end
 
     def to_s
-      'membership history'
+      model_name.human
     end
 
     # These two accessors are for the memberships history form.

data/app/models/effective/membership_status.rb

@@ -6,7 +6,7 @@ module Effective
     log_changes(to: :membership) if respond_to?(:log_changes)
 
     def to_s
-      status&.to_s || 'membership status'
+      status&.to_s || model_name.human
     end
 
   end

data/app/models/effective/representative.rb

@@ -41,7 +41,7 @@ module Effective
       uniqueness: { scope: [:organization_id, :organization_type], message: 'already belongs to this organization' }
 
     def to_s
-      user.to_s
+      user&.to_s || model_name.human
     end
 
     def build_user(attributes = {})

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

@@ -0,0 +1,18 @@
+= effective_form_with(model: [:admin, applicant_reference], engine: true) do |f|
+  = f.hidden_field :applicant_type
+  = f.hidden_field :applicant_id
+
+  = f.text_field :name
+
+  .row
+    .col= f.email_field :email
+    .col= f.tel_field :phone
+
+  - applicant = f.object.applicant
+  - will_send = applicant.present? && applicant.was_submitted? && !applicant.done?
+
+  - if f.object.new_record? && will_send
+    %p An email will be sent asking them to complete a reference declaration form.
+    = f.submit('Create and Notify Reference')
+  - else
+    = f.submit

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

@@ -17,28 +17,28 @@
       = render 'effective/applicants/applicant', applicant: applicant, namespace: :admin
 
   - # Just normal tabs now
-  - if applicant.applicant_reviews.present? || applicant.was_completed?
-    = 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
 
-  - if applicant.applicant_references.present?
+  - if applicant.was_submitted? && applicant.required_steps.include?(:transcripts)
+    = tab 'Transcripts' do
+      = render 'admin/applicants/form_transcripts', applicant: applicant
+
+  - if applicant.was_submitted? && applicant.required_steps.include?(:references)
     = tab 'References' do
       .mb-4= render_inline_datatable(Admin::EffectiveApplicantReferencesDatatable.new(applicant: applicant))
 
-  - if applicant.applicant_endorsements.present?
+  - if applicant.was_submitted? && applicant.required_steps.include?(:endorsements)
     = tab 'Endorsements' do
       .mb-4= render_inline_datatable(Admin::EffectiveApplicantEndorsementsDatatable.new(applicant: applicant))
 
-  - if applicant.transcripts_required?
-    = tab 'Transcripts' do
-      = render 'admin/applicants/form_transcripts', applicant: applicant
-
   = yield
 
+  - if applicant.applicant_reviews.present? || applicant.was_completed?
+    = tab 'Reviews' do
+      .mb-4= render_inline_datatable(Admin::EffectiveApplicantReviewsDatatable.new(applicant: applicant))
+
   - if applicant.fees.present? || applicant.orders.present?
     = tab 'Fees' do
       .mb-4

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

@@ -41,32 +41,66 @@
       %td= applicant.submitted_at&.strftime('%F') || '-'
       %td
         - applicant.completed_requirements.each do |requirement, completed|
-          - next if requirement.to_s == 'Applicant References'
 
-          %p
-            = icon((completed ? 'check' : 'x'), class: 'small-1')
-            = requirement
+          - if requirement == 'References' && applicant.applicant_references_required?
+            %p
+              = icon((completed ? 'check' : 'x'), class: 'small-1')
 
-        - if applicant.applicant_references_required?
-          %p
-            - if applicant.completed_requirements['Applicant References']
-              = icon('check', class: 'small-1')
+              = applicant.applicant_references.count(&:completed?)
+              = '/'
+              = applicant.min_applicant_references
 
-            = applicant.applicant_references.count(&:completed?)
-            = '/'
-            = applicant.min_applicant_references
-            Required References Responded
-        - else
-          - if applicant.applicant_references.present?
+              Required References Responded
+
+          - elsif requirement == 'References' && (!applicant.applicant_references_required? || applicant.applicant_references.present?)
             %p
-              = applicant.applicant_references.count(&:completed?)
+              = icon((completed ? 'check' : 'x'), class: 'small-1')
+              References Not Required
+
+            - if applicant.applicant_references.present?
+              %p
+                = applicant.applicant_references.count(&:completed?)
+                = '/'
+                = applicant.applicant_references.count
+                References Responded
+
+          - elsif requirement == 'Endorsements' && applicant.applicant_endorsements_required?
+            %p
+              = icon((completed ? 'check' : 'x'), class: 'small-1')
+
+              = applicant.applicant_endorsements.count(&:completed?)
               = '/'
-              = applicant.applicant_references.count
-              References Responded
+              = applicant.min_applicant_endorsements
+
+              Required Endorsements Responded
+
+          - elsif requirement == 'Endorsements' && (!applicant.applicant_endorsements_required? || applicant.applicant_endorsements.present?)
+            %p
+              = icon((completed ? 'check' : 'x'), class: 'small-1')
+              Endorsements Not Required
+
+            - if applicant.applicant_endorsements.present?
+              %p
+                = applicant.applicant_endorsements.count(&:completed?)
+                = '/'
+                = applicant.applicant_endorsements.count
+                Endorsements Responded
+
+          - elsif requirement == 'Transcripts' && applicant.transcripts_required?
+            %p
+              = icon((completed ? 'check' : 'x'), class: 'small-1')
+              Transcripts Received
+
+          - elsif requirement == 'Transcripts' && !applicant.transcripts_required?
+            %p
+              = icon((completed ? 'check' : 'x'), class: 'small-1')
+              Transcripts Not Required
 
-          %p
-            = icon('check', class: 'small-1')
-            References Not Required
+          - else
+            %p
+              = icon((completed ? 'check' : 'x'), class: 'small-1')
+              = requirement
+              = 'Not Required' if completed == 'Not Required'
 
       %td
         - if applicant.submitted?
@@ -96,25 +130,31 @@
         %td= applicant.reviewed_at&.strftime('%F') || '-'
         %td
           - applicant.reviewed_requirements.each do |requirement, completed|
-            - next if requirement.to_s == 'Applicant Reviews'
-
-            %p
-              = icon((completed ? 'check' : 'x'), class: 'small-1')
-              = requirement
-
-          - if applicant.applicant_reviews_required?
-            %p
-              - if applicant.reviewed_requirements['Applicant Reviews']
-                = icon('check', class: 'small-1')
-
-              = applicant.applicant_reviews.count(&:submitted?)
-              = '/'
-              = applicant.min_applicant_reviews
-              Reviews Submitted
-          - else
-            %p
-              = icon('check', class: 'small-1')
-              Reviews Not Required
+            - if requirement == 'Reviews' && applicant.applicant_reviews_required?
+              %p
+                = icon((completed ? 'check' : 'x'), class: 'small-1')
+
+                = applicant.applicant_reviews.count(&:completed?)
+                = '/'
+                = applicant.min_applicant_reviews
+
+                Reviews Submitted
+
+            - elsif requirement == 'Reviews' && (!applicant.applicant_reviews_required? || applicant.applicant_reviews.present?)
+              %p
+                = icon((completed ? 'check' : 'x'), class: 'small-1')
+                Reviews Not Required
+
+              - if applicant.applicant_reviews.present?
+                %p
+                  = applicant.applicant_reviews.count(&:completed?)
+                  Reviews Submitted
+
+            - else
+              %p
+                = icon((completed ? 'check' : 'x'), class: 'small-1')
+                = requirement
+                = 'Not Required' if completed == 'Not Required'
 
         %td
           - # Button to create reviews here

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

@@ -1,51 +1,21 @@
 - reference = applicant_reference
 
-%table.table.table-sm
-  %tbody
-    %tr
-      %th Name
-      %td= link_to("#{reference.name} <#{reference.email}>", "mailto:#{reference.email}")
-
-    %tr
-      %th Known
-      %td= reference.known
-
-    %tr
-      %th Relationship
-      %td= reference.relationship
-
-    - if reference.applicant.was_submitted?
-      %tr
-        %th Status
-        %td
-          - if reference.submitted?
-            Waiting on response
-          - elsif reference.completed?
-            Response completed
-
-    - unless reference.applicant.was_approved?
-      %tr
-        %th Last Notified at
-        %td= reference.last_notified_at&.strftime('%F') || 'Never'
-
-      - if can?(:notify, reference) && !local_assigns[:skip_actions]
-        %tr
-          %th Notification
-          %td= link_to('Resend email notification', effective_memberships.notify_applicant_reference_path(reference), 'data-method': :post, 'data-confirm': "Really resend email notification to #{reference.email}?")
-
-    - if reference.completed? && can?(:review, reference)
-      %tr
-        %th Address
-        %td= reference.reference_address.to_html
-
-      %tr
-        %th Reservations
-        %td
-          - if reference.reservations?
-            = reference.reservations_reason
-          - else
-            None
-
-      %tr
-        %th Work History
-        %td= reference.work_history
+= card(et(reference)) do
+  = effective_table_with(reference, only: [:applicant, :name, :email, :known, :relationship, :status, :last_notified_at]) do |f|
+    = f.content_for :status do
+      - if reference.submitted?
+        Waiting on response
+      - elsif reference.completed?
+        Response completed
+      - else
+        = f.object.status
+
+    = f.content_for :last_notified_at do
+      = reference.last_notified_at&.strftime('%F') || 'Never'
+
+      - if EffectiveResources.authorized?(self, :notify, reference) && !local_assigns[:skip_actions]
+        %p.mt-2= link_to('Resend email notification', effective_memberships.notify_applicant_reference_path(reference), 'data-method': :post, 'data-confirm': "Really resend email notification to #{reference.email}?")
+
+- if reference.completed? && can?(:review, reference)
+  = card(et(reference) + ' Response') do
+    = effective_table_with(reference, only: [:title, :reference_address, :regulated_professional, :work_history, :reservations, :reservations_reason, :recommendation, :recommendation_reason])

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

@@ -0,0 +1 @@
+%p Please confirm your name, email, phone and address:

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

@@ -1,16 +1,16 @@
 = effective_form_with(model: applicant_reference, engine: true) do |f|
-  = f.hidden_field :applicant_id
   = f.hidden_field :applicant_type
+  = f.hidden_field :applicant_id
 
   = f.text_field :name
 
   .row
     .col= f.email_field :email
-    .col= f.tel_field :phone
+    .col= f.tel_field :phone, required: true
 
   .row
-    .col= f.select :relationship, Effective::ApplicantReference::RELATIONSHIPS
-    .col= f.select :known, Effective::ApplicantReference::KNOWNS, label: 'Known for'
+    .col= f.select :relationship, Effective::ApplicantReference::RELATIONSHIPS, required: true
+    .col= f.select :known, Effective::ApplicantReference::KNOWNS, label: 'Known for', required: true
 
   - if f.object.new_record?
     %p An email will be sent asking them to complete a reference declaration form.

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

@@ -1,38 +1,52 @@
 = effective_form_with(model: applicant_reference, engine: true) do |f|
+  - user = f.object.applicant.owner
 
-  %h2 My Information
-  %p Please confirm your name, email, phone and address:
+  %p
+    Please provide a reference for
+    = succeed('.') do
+      %strong= user
 
+  = render('effective/applicant_references/declaration_requirements', f: f)
+
+  %h2 Contact Info
   .row
     .col= f.text_field :name
     .col= f.email_field :email
-    .col= f.tel_field :phone
+    .col= f.tel_field :phone, required: true
+
+  = f.text_field :title, label: 'Job Position or Professional Title(s)', hint: 'job title and/or professional designations or degrees'
 
   = effective_address_fields(f, :reference_address)
 
-  %h2 Applicant Reference
+  = f.check_box :regulated_professional,
+    label: 'Yes, I am a member of a regulated profession',
+    hint: 'a regulated profession is a body governed by law and subject to a code of ethics and disciplinary action. By choosing yes, you are confirming that you are in good standing with your regulated professional body.'
+
+  %h2= et(f.object)
 
-  = f.select :known, Effective::ApplicantReference::KNOWNS, label: 'I have known the applicant for', required: true
+  = f.select :known, Effective::ApplicantReference::KNOWNS, label: "I have known #{user} for", required: true
 
   = f.radios :relationship, Effective::ApplicantReference::RELATIONSHIPS, required: true,
-    label: 'I have known or been associated with the applicant as their'
+    label: "I have known or been associated with #{user} as their"
 
   - reservations = [['Yes, I have reservations', true], ['No, I do not have reservations', false]]
 
+  = f.text_area :work_history,
+    label: "Work History - Please provide information on the their work history and work ethic",
+    hint: "If you are an employer or supervisor please provide information on the term of employment, the responsibilities of the position, and any significant projects undertaken by the individual of which you are aware or with which you have been involved."
+
+  %hr
+
   = f.radios :reservations, reservations,
-    label: "Do you have any reservations about the applicant?", inline: true, required: true
+    label: "Do you have any reservations about #{user}?", inline: true, required: true
 
   = f.show_if :reservations, true do
-    .mt-2
-      = f.text_area :reservations_reason,
-        label: 'Please provide a brief but candid explanation of your reservations'
-
-  .mt-4
+    = f.text_area :reservations_reason, label: 'Please provide a brief but candid explanation of your reservations'
 
-  = f.text_area :work_history,
-    label: "Work History - Please provide information on the applicant's work history and work ethic",
-    hint: "If you are an employer or supervisor please provide information on the term of employment, the responsibilities of the position, and any significant projects undertaken by the individual of which you are aware or with which you have been involved."
+  = f.radios :recommendation, Effective::ApplicantReference::RECOMMENDATIONS, label: 'Your recommendation'
+  = f.text_area :recommendation_reason, label: 'Please provide an explanation of your recommendation'
 
+  .mt-4
   = f.check_box :accept_declaration, label: 'Yes, I declare that the above information is true and accurate'
 
-  = f.submit 'Complete Reference'
+  = f.submit 'Complete ' + et(f.object), 'data-confirm': "Complete #{et(f.object)} for #{user}?", class: 'btn btn-lg btn-primary btn-block'

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

@@ -1,7 +1,2 @@
 = card do
-  %p
-    Please provide a reference for the applicant
-    = succeed('.') do
-      %strong= @applicant_reference.applicant.owner
-
   = render('form_declaration', applicant_reference: @applicant_reference)

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

@@ -3,7 +3,7 @@
 
   = card do
     - if resource.min_applicant_educations > 0
-      .alert.alert-danger You must include #{resource.min_applicant_educations} or more post-secondary educations.
+      %p You must include #{resource.min_applicant_educations} or more post-secondary educations.
 
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
@@ -19,7 +19,7 @@
 
         .row
           .col= aef.date_field :start_on, label: 'Start Date'
-          .col= aef.date_field :end_on, label: 'Graduation Date'
+          .col= aef.date_field :end_on, label: 'Graduation Date', hint: 'If you are still attending, leave this blank'
 
       = render_if_exists("effective/applicants/education_fields", f: f)
 

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

@@ -27,7 +27,7 @@
       %h3 Transcripts
       = render 'effective/applicants/transcripts_requirements', applicant: resource
 
-  - if resource.min_applicant_references.to_i > 0 || resource.applicant_references.present?
+  - if resource.required_steps.include?(:references) || resource.applicant_references.present?
     = card do
       %h3 Confidential References
       %p

data/app/views/effective/memberships/_membership.html.haml

@@ -26,7 +26,7 @@
     - if membership.statuses.length == 0
       %tr
         %th Status
-        %td None
+        %td= '-'
     - elsif membership.statuses.length == 1
       %tr
         %th Status
@@ -45,3 +45,7 @@
     %tr
       %th Fees Paid Through
       %td= membership.fees_paid_through_period&.strftime('%F') || '-'
+
+    %tr
+      %th Outstanding Fees
+      %td= membership.owner.fees.reject(&:purchased?).count

data/db/migrate/01_create_effective_memberships.rb.erb

@@ -312,16 +312,19 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.string :name
       t.string :email
       t.string :phone
+      t.string :known
+      t.string :relationship
 
       t.string :status
       t.text :status_steps
-      t.string :known
-      t.string :relationship
 
+      t.string :title
+      t.boolean :regulated_professional, default: false
+      t.text :work_history
       t.boolean :reservations
       t.text :reservations_reason
-
-      t.text :work_history
+      t.string :recommendation
+      t.text :recommendation_reason
       t.boolean :accept_declaration
 
       t.string :token

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.13.7'
+  VERSION = '0.15.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.15.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -353,6 +353,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_references/_form.html.haml
 - app/views/admin/applicant_reviews/_applicant_review.html.haml
 - app/views/admin/applicants/_fees_approve.html.haml
 - app/views/admin/applicants/_form.html.haml
@@ -417,6 +418,7 @@ files:
 - app/views/effective/applicant_endorsers/_dashboard.html.haml
 - app/views/effective/applicant_references/_applicant_reference.html.haml
 - app/views/effective/applicant_references/_datatable_actions.html.haml
+- app/views/effective/applicant_references/_declaration_requirements.html.haml
 - app/views/effective/applicant_references/_form.html.haml
 - app/views/effective/applicant_references/_form_declaration.html.haml
 - app/views/effective/applicant_references/complete.html.haml