effective_memberships 0.4.10 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7d09ef68f61058a8ee29567caa3a008d887482edab0fa3e8d251ea69f9ea3cb
-  data.tar.gz: 10a88e200464a6d2d7dbb8fbdcaa3aed77337b067e12fc3577b31a8032cbd2ce
+  metadata.gz: 013c543f704442649f57e61b6d381da7abd27a181b8cfb00eafcca8713eec4d0
+  data.tar.gz: 71d84f67fad2d7f5718fd6186eed8ee3877ccc32292dcd56456fe93bd73918fe
 SHA512:
-  metadata.gz: 3adbdb1ab5f18df509ebc6631f39a142f2857213ce9ee0a23b83eec2fa44dda3d8b77c42afe7e4e4b494bb938dac7aee672cc26dacbd398fd9f34cc3c55ed222
-  data.tar.gz: ab80c7ff8b01736429ecabc774b81c45702d21ae521e2e7db276191802fa212171f8e81e448a06e452fb97745c5aec3723fe37537669f3a3ed87b9cd30d03746
+  metadata.gz: f6e975206c149832fc53de2db37b08405c21b22021e1fdae0f5cbd6d619747f9288b86f38f22a943fe27e69a963af44fb9b201fa43cc3bac20d90211ea8cb557
+  data.tar.gz: 3ba98f86d83f2afc099d57463495aa7fa643a72af6b230156538eeebc0bb6b306bd2bae12726e651fc59b38cf1c2db353db881c6149049370d34aae189370657

data/app/datatables/effective_applicant_endorsements_datatable.rb

@@ -2,6 +2,7 @@
 class EffectiveApplicantEndorsementsDatatable < Effective::Datatable
 
   datatable do
+    length :all
     order :name
 
     col :name do |endorsement|

data/app/datatables/effective_applicant_equivalences_datatable.rb

@@ -0,0 +1,23 @@
+class EffectiveApplicantEquivalencesDatatable < Effective::Datatable
+  datatable do
+    length :all
+    order :start_on
+
+    col :start_on
+
+    col :end_on do |applicant_equivalence|
+      applicant_equivalence.end_on&.strftime('%F') || '-'
+    end
+
+    col :name
+    col :notes
+  end
+
+  collection do
+    Effective::ApplicantEquivalence.deep.where(applicant: applicant)
+  end
+
+  def applicant
+    @applicant ||= EffectiveMemberships.Applicant.where(id: attributes[:applicant_id]).first!
+  end
+end

data/app/datatables/effective_applicant_experiences_datatable.rb

@@ -1,6 +1,7 @@
 class EffectiveApplicantExperiencesDatatable < Effective::Datatable
   datatable do
     length :all
+
     order :start_on
 
     col :start_on

data/app/models/concerns/effective_memberships_applicant.rb

@@ -24,6 +24,11 @@ module EffectiveMembershipsApplicant
     def categories
       ['Apply to Join', 'Apply to Reclassify']
     end
+
+    def transcripts_statuses
+      []
+    end
+
   end
 
   included do
@@ -48,6 +53,7 @@ module EffectiveMembershipsApplicant
       organization: 'Organization',         # Organization only. Organization fields.
       education: 'Education',
       course_amounts: 'Courses',
+      transcripts: 'Transcripts',
       experience: 'Work Experience',
       references: 'References',
       files: 'Attach Files',
@@ -64,6 +70,10 @@ module EffectiveMembershipsApplicant
     log_changes(except: :wizard_steps) if respond_to?(:log_changes)
 
     has_many_attached :applicant_files
+    has_many_attached :transcripts
+
+    # Transcripts Step
+    attr_accessor :declare_will_send_transcripts
 
     # Declarations Step
     attr_accessor :declare_code_of_ethics
@@ -96,6 +106,9 @@ module EffectiveMembershipsApplicant
     has_many :applicant_endorsements, -> { order(:id) }, class_name: 'Effective::ApplicantEndorsement', as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_endorsements, reject_if: :all_blank, allow_destroy: true
 
+    has_many :applicant_equivalences, -> { order(:id) }, class_name: 'Effective::ApplicantEquivalence', as: :applicant, inverse_of: :applicant, dependent: :destroy
+    accepts_nested_attributes_for :applicant_equivalences, reject_if: :all_blank, allow_destroy: true
+
     has_many :applicant_experiences, -> { order(:id) }, class_name: 'Effective::ApplicantExperience', as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_experiences, reject_if: :all_blank, allow_destroy: true
 
@@ -140,6 +153,11 @@ module EffectiveMembershipsApplicant
       applicant_experiences_months    :integer
       applicant_experiences_details   :text
 
+      # Transcripts
+      transcripts_received_on       :date
+      transcripts_status            :string
+      transcripts_details           :text
+
       # Additional Information
       additional_information          :text
 
@@ -251,6 +269,16 @@ module EffectiveMembershipsApplicant
       end
     end
 
+    # Applicant Equivalences Step
+    with_options(if: -> { current_step == :equivalences }) do
+      validate do
+        required = min_applicant_equivalences()
+        existing = applicant_equivalences().reject(&:marked_for_destruction?).length
+
+        self.errors.add(:applicant_equivalences, "please include #{required} or more equivalences") if existing < required
+      end
+    end
+
     # Applicant References Step
     with_options(if: -> { current_step == :references }) do
       validate do
@@ -271,6 +299,11 @@ module EffectiveMembershipsApplicant
       end
     end
 
+    # Transcripts step
+    with_options(if: -> { current_step == :transcripts }) do
+      validates :declare_will_send_transcripts, acceptance: true
+    end
+
     # Declarations Step
     with_options(if: -> { current_step == :declarations }) do
       validates :declare_code_of_ethics, acceptance: true
@@ -535,11 +568,33 @@ module EffectiveMembershipsApplicant
     category&.min_applicant_references.to_i
   end
 
+  def applicant_references_required?
+    min_applicant_references > 0
+  end
+
   # Endorsements Step
   def min_applicant_endorsements
     category&.min_applicant_endorsements.to_i
   end
 
+  def applicant_endorsements_required?
+    min_applicant_endorsements > 0
+  end
+
+  # Equivalences Step
+  def min_applicant_equivalences
+    category&.min_applicant_equivalences.to_i
+  end
+
+  # Transcripts Step
+  def transcripts_received?
+    transcripts_received_on_was.present?
+  end
+
+  def transcripts_required?
+    category.applicant_wizard_steps.include?(:transcripts)
+  end
+
   # Files Step
   def min_applicant_files
     category&.min_applicant_files.to_i
@@ -555,26 +610,22 @@ module EffectiveMembershipsApplicant
     )
   end
 
-  def applicant_endorsements_required?
-    min_applicant_endorsements > 0
-  end
-
-  def applicant_references_required?
-    min_applicant_references > 0
-  end
-
   # When an application is submitted, these must be done to go to completed.
   # An Admin can override this and just set them to completed.
   def completed_requirements
     requirements = {}
     return requirements unless category.present?
 
+    if category.applicant_wizard_steps.include?(:endorsements) || applicant_endorsements_required?
+      requirements['Applicant Endorsements'] = (!applicant_endorsements_required? || applicant_endorsements.count(&:completed?) >= min_applicant_endorsements)
+    end
+
     if category.applicant_wizard_steps.include?(:references) || applicant_references_required?
       requirements['Applicant References'] = (!applicant_references_required? || applicant_references.count(&:completed?) >= min_applicant_references)
     end
 
-    if category.applicant_wizard_steps.include?(:endorsements) || applicant_endorsements_required?
-      requirements['Applicant Endorsements'] = (!applicant_endorsements_required? || applicant_endorsements.count(&:completed?) >= min_applicant_endorsements)
+    if category.applicant_wizard_steps.include?(:transcripts) || transcripts_required?
+      requirements['Applicant Transcripts'] = (!transcripts_required? || transcripts_received?)
     end
 
     requirements

data/app/models/concerns/effective_memberships_category.rb

@@ -55,6 +55,8 @@ module EffectiveMembershipsCategory
       applicant_wizard_steps     :text
 
       min_applicant_educations          :integer
+      min_applicant_endorsements        :integer
+      min_applicant_equivalences        :integer
       min_applicant_experiences_months  :integer
       min_applicant_references          :integer
       min_applicant_courses             :integer

data/app/models/effective/applicant_endorsement.rb

@@ -42,7 +42,7 @@ module Effective
 
     # All step validations
     validates :applicant, presence: true
-    validates :endorser, presence: true, unless: -> { unknown_member? }
+    validates :endorser_id, presence: true, unless: -> { unknown_member? }
 
     with_options(if: -> { unknown_member? }) do
       validates :endorser_email, presence: true, email: true

data/app/models/effective/applicant_equivalence.rb

@@ -0,0 +1,32 @@
+module Effective
+  class ApplicantEquivalence < ActiveRecord::Base
+    belongs_to :applicant, polymorphic: true
+
+    log_changes(to: :applicant) if respond_to?(:log_changes)
+
+    effective_resource do
+      name           :string
+
+      start_on       :date
+      end_on         :date
+
+      notes          :text
+
+      timestamps
+    end
+
+    scope :deep, -> { all }
+
+    validates :name, presence: true
+    validates :start_on, presence: true
+
+    validate(if: -> { start_on.present? && end_on.present? }) do
+      errors.add(:end_on, 'must be after start date') unless start_on < end_on
+    end
+
+    def to_s
+      name || 'equivalence'
+    end
+
+  end
+end

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

@@ -29,6 +29,10 @@
     = 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
+
   - if applicant.fees.present? || applicant.orders.present?
     = tab 'Fees' do
       .mb-4

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

@@ -0,0 +1,12 @@
+= effective_form_with(model: [:admin, applicant], engine: true) do |f|
+  = f.date_field :transcripts_received_on
+
+  - statuses = f.object.class.transcripts_statuses
+
+  - if statuses.present?
+    = f.select_field :transcripts_status, statuses
+
+  = f.file_field :transcripts
+  = f.text_area :transcripts_details, hint: 'These details will be displayed to the applicant'
+
+  = f.submit 'Save Transcripts', border: false, center: true

data/app/views/admin/categories/_form_applicant_steps.html.haml

@@ -38,6 +38,12 @@
           %td= f.number_field :min_applicant_endorsements, label: false
           %td minimimum number of endorsements
 
+      - if applicant.wizard_step_keys.include?(:equivalences)
+        %tr
+          %td= applicant.wizard_step_title(:equivalences)
+          %td= f.number_field :min_applicant_equivalences, label: false
+          %td minimimum number of equivalent memberships
+
       - if applicant.wizard_step_keys.include?(:references)
         %tr
           %td= applicant.wizard_step_title(:references)

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

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

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

@@ -1,8 +1,7 @@
-.card
-  .card-body
-    %p
-      Please provide a endorsement for the applicant
-      = succeed('.') do
-        %strong= @applicant_endorsement.applicant.owner
+= card do
+  %p
+    Please provide a endorsement for the applicant
+    = succeed('.') do
+      %strong= @applicant_endorsement.applicant.owner
 
-    = render('form_declaration', applicant_endorsement: @applicant_endorsement)
+  = render('form_declaration', applicant_endorsement: @applicant_endorsement)

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

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

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

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

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

@@ -1,3 +1,4 @@
 .effective-applicant
   - applicant.render_steps.each do |partial|
-    = render "effective/applicants/#{partial}", applicant: applicant, step: partial
+    - applicant.render_step = partial
+    = render "effective/applicants/#{partial}", applicant: applicant

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

@@ -1,19 +1,11 @@
-.card
-  .card-body
-    .row
-      .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_wizard?
+= wizard_card(applicant) do
+  - applicant.applicant_course_areas_collection.each do |area|
+    - datatable = EffectiveApplicantCoursesDatatable.new(applicant: applicant, applicant_course_area_id: area.id)
 
+    .mb-4
+      %h6= area
+      = render_simple_datatable(datatable)
+      %p #{area} courses: #{applicant.applicant_course_area_sum(applicant_course_area: area)}
 
-    - applicant.applicant_course_areas_collection.each do |area|
-      - datatable = EffectiveApplicantCoursesDatatable.new(applicant: applicant, applicant_course_area_id: area.id)
-
-      .mb-4
-        %h6= area
-        = render_simple_datatable(datatable)
-        %p #{area} courses: #{applicant.applicant_course_area_sum(applicant_course_area: area)}
-
-    %p
-      %strong All courses: #{pluralize(applicant.applicant_courses_sum, 'total course')}
+  %p
+    %strong All courses: #{pluralize(applicant.applicant_courses_sum, 'total course')}

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

@@ -1,16 +1,9 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= applicant.wizard_step_title(:declarations)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:declarations)) if edit_effective_wizard?
-
-    %table.table.table-sm
-      %tbody
-        %tr
-          %td= icon('check')
-          %td Yes, I hereby certify that I have read and will adhere to the Code of Ethics
-        %tr
-          %td= icon('check')
-          %td Yes, I hereby certify that the statements and information contained herein are correct
+= wizard_card(applicant) do
+  %table.table.table-sm
+    %tbody
+      %tr
+        %td= icon('check')
+        %td Yes, I hereby certify that I have read and will adhere to the Code of Ethics
+      %tr
+        %td= icon('check')
+        %td Yes, I hereby certify that the statements and information contained herein are correct

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

@@ -1,9 +1,2 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= applicant.wizard_step_title(:demographics)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:demographics)) if edit_effective_wizard?
-
-    = render 'users/demographics', parent: applicant, user: applicant.user
+= wizard_card(applicant) do
+  = render 'users/demographics', parent: applicant, user: applicant.user

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

@@ -1,14 +1,7 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= applicant.wizard_step_title(:education)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:education)) if edit_effective_wizard?
+= wizard_card(applicant) do
+  - datatable = EffectiveApplicantEducationsDatatable.new(applicant: applicant)
+  .mb-4= render_simple_datatable(datatable)
 
-    - datatable = EffectiveApplicantEducationsDatatable.new(applicant: applicant)
-    .mb-4= render_simple_datatable(datatable)
-
-    - if applicant.applicant_educations_details.present?
-      %h6 Additional Education Details
-      = simple_format(applicant.applicant_educations_details)
+  - if applicant.applicant_educations_details.present?
+    %h6 Additional Education Details
+    = simple_format(applicant.applicant_educations_details)

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

@@ -1,15 +1,8 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= applicant.wizard_step_title(:endorsements)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:endorsements)) if edit_effective_wizard?
+= wizard_card(applicant) do
+  - applicant.applicant_endorsements.each_with_index do |applicant_endorsement, index|
+    - if index > 0
+      .mb-4
 
-    - applicant.applicant_endorsements.each_with_index do |applicant_endorsement, index|
-      - if index > 0
-        .mb-4
+    %h6 Endorsement ##{index + 1}
 
-      %h6 Endorsement ##{index + 1}
-
-      = render('effective/applicant_endorsements/applicant_endorsement', applicant_endorsement: applicant_endorsement)
+    = render('effective/applicant_endorsements/applicant_endorsement', applicant_endorsement: applicant_endorsement)

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

@@ -0,0 +1,3 @@
+= wizard_card(applicant) do
+  - datatable = EffectiveApplicantEquivalencesDatatable.new(applicant: applicant)
+  .mb-4= render_simple_datatable(datatable)

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

@@ -1,28 +1,21 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= applicant.wizard_step_title(:experience)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:experience)) if edit_effective_wizard?
+= wizard_card(applicant) do
+  %table.table
+    %tbody
+      -# %tr
+      -#   %th CV / Resume Upload
+      -#   %td
+      -#     - if applicant.cv.attached?
+      -#       = link_to(applicant.cv.filename, url_for(applicant.cv), target: '_blank')
+      -#     - else
+      -#       None
 
-    %table.table
-      %tbody
-        -# %tr
-        -#   %th CV / Resume Upload
-        -#   %td
-        -#     - if applicant.cv.attached?
-        -#       = link_to(applicant.cv.filename, url_for(applicant.cv), target: '_blank')
-        -#     - else
-        -#       None
+      %tr
+        %th Total Months
+        %td= applicant.applicant_experiences_months
 
-        %tr
-          %th Total Months
-          %td= applicant.applicant_experiences_months
+  - datatable = EffectiveApplicantExperiencesDatatable.new(applicant: applicant)
+  .mb-4= render_simple_datatable(datatable)
 
-    - datatable = EffectiveApplicantExperiencesDatatable.new(applicant: applicant)
-    .mb-4= render_simple_datatable(datatable)
-
-    - if applicant.applicant_experiences_details.present?
-      %h6 Additional Experiences Details
-      = simple_format(applicant.applicant_experiences_details)
+  - if applicant.applicant_experiences_details.present?
+    %h6 Additional Experiences Details
+    = simple_format(applicant.applicant_experiences_details)

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

@@ -1,27 +1,20 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= applicant.wizard_step_title(:files)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:files)) if edit_effective_wizard?
+= wizard_card(applicant) do
+  %table.table.table-sm
+    %tbody
+      - applicant.applicant_files.each do |file|
 
-    %table.table.table-sm
-      %tbody
-        - applicant.applicant_files.each do |file|
+        - url = url_for(file)
+        - title = file.filename.to_s
 
-          - url = url_for(file)
-          - title = file.filename.to_s
+        - image_tag = content_tag(:img, '', class: '', src: url, alt: title) if file.image?
+        - link_tag = link_to('Download', url, target: '_blank')
+        - size_tag = (file.content_type + '<br>' + number_to_human_size(file.byte_size)).html_safe
 
-          - image_tag = content_tag(:img, '', class: '', src: url, alt: title) if file.image?
-          - link_tag = link_to('Download', url, target: '_blank')
-          - size_tag = (file.content_type + '<br>' + number_to_human_size(file.byte_size)).html_safe
+        %tr
+          %td= image_tag
+          %td= title
+          %td= size_tag
+          %td= link_tag
 
-          %tr
-            %td= image_tag
-            %td= title
-            %td= size_tag
-            %td= link_tag
-
-    - if applicant.applicant_files.blank?
-      %p No files attached
+  - if applicant.applicant_files.blank?
+    %p No files attached

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

@@ -1,9 +1,2 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= applicant.wizard_step_title(:organization)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:organization)) if edit_effective_wizard?
-
-    = render 'organizations/demographics', parent: applicant, organization: applicant.organization
+= wizard_card(applicant) do
+  = render 'organizations/demographics', parent: applicant, organization: applicant.organization

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

@@ -1,15 +1,8 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= applicant.wizard_step_title(:references)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:references)) if edit_effective_wizard?
+= wizard_card(applicant) do
+  - applicant.applicant_references.each_with_index do |applicant_reference, index|
+    - if index > 0
+      .mb-4
 
-    - applicant.applicant_references.each_with_index do |applicant_reference, index|
-      - if index > 0
-        .mb-4
+    %h6 Reference ##{index + 1}
 
-      %h6 Reference ##{index + 1}
-
-      = render('effective/applicant_references/applicant_reference', applicant_reference: applicant_reference)
+    = render('effective/applicant_references/applicant_reference', applicant_reference: applicant_reference)

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

@@ -1,36 +1,29 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= applicant.wizard_step_title(:stamp)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:stamp)) if edit_effective_wizard?
+= wizard_card(applicant) do
+  - applicant.stamps.each do |stamp|
+    %table.table.table-sm
+      %tbody
+        %tr
+          %th Name
+          %td= stamp.name
 
-    - applicant.stamps.each do |stamp|
-      %table.table.table-sm
-        %tbody
-          %tr
-            %th Name
-            %td= stamp.name
+        %tr
+          %th Name Confirmation
+          %td= stamp.name_confirmation
 
-          %tr
-            %th Name Confirmation
-            %td= stamp.name_confirmation
+        %tr
+          %th Category
+          %td= stamp.category
 
+        - if stamp.shipping_address.present?
           %tr
-            %th Category
-            %td= stamp.category
-
-          - if stamp.shipping_address.present?
-            %tr
-              %th Shipping Address
-              %td= stamp.shipping_address.to_html
+            %th Shipping Address
+            %td= stamp.shipping_address.to_html
 
-          - if applicant.was_approved?
-            %tr
-              %th Submitted
-              %td= stamp.submitted_at&.strftime('%F') || '-'
+        - if applicant.was_approved?
+          %tr
+            %th Submitted
+            %td= stamp.submitted_at&.strftime('%F') || '-'
 
-            %tr
-              %th Issued
-              %td= stamp.issued_at&.strftime('%F') || 'Not Issued'
+          %tr
+            %th Issued
+            %td= stamp.issued_at&.strftime('%F') || 'Not Issued'