effective_memberships 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7d09ef68f61058a8ee29567caa3a008d887482edab0fa3e8d251ea69f9ea3cb
-  data.tar.gz: 10a88e200464a6d2d7dbb8fbdcaa3aed77337b067e12fc3577b31a8032cbd2ce
+  metadata.gz: a08504cb78fd8324ad3a72904249556ba0761b490a4574e1be3a4f6ac22ef51f
+  data.tar.gz: 409b51e03245bd8e331aeaf2acd038c111eb060e2852ffdfdbd282e4a20d7e9a
 SHA512:
-  metadata.gz: 3adbdb1ab5f18df509ebc6631f39a142f2857213ce9ee0a23b83eec2fa44dda3d8b77c42afe7e4e4b494bb938dac7aee672cc26dacbd398fd9f34cc3c55ed222
-  data.tar.gz: ab80c7ff8b01736429ecabc774b81c45702d21ae521e2e7db276191802fa212171f8e81e448a06e452fb97745c5aec3723fe37537669f3a3ed87b9cd30d03746
+  metadata.gz: ca160549bff37e5194ca4eaea87f1479426b9f019631497892d564ec4e4be828dc41513085418c89a5b08aa3fa5b2190ee7eb30a3b84acec7f6b5f03a15ff82e
+  data.tar.gz: 184c786911efb0309e0d988e288f3d61f7ce9cb440e850e45a2c6fb13903e9a2f5eb79ef6b414a4b9f1365c3af9dfdd5536e050f780d1f50f60b19fd47008586

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

@@ -96,6 +96,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
 
@@ -251,6 +254,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
@@ -540,6 +553,11 @@ module EffectiveMembershipsApplicant
     category&.min_applicant_endorsements.to_i
   end
 
+  # Equivalences Step
+  def min_applicant_equivalences
+    category&.min_applicant_equivalences.to_i
+  end
+
   # Files Step
   def min_applicant_files
     category&.min_applicant_files.to_i

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/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/applicants/_equivalences.html.haml

@@ -0,0 +1,10 @@
+.card
+  .card-body
+    .row
+      .col-sm
+        %h5.card-title= applicant.wizard_step_title(:equivalences)
+      .col-sm-auto.text-right
+        = link_to('Edit', wizard_path(:equivalences)) if edit_effective_wizard?
+
+    - datatable = EffectiveApplicantEquivalencesDatatable.new(applicant: applicant)
+    .mb-4= render_simple_datatable(datatable)

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

@@ -47,4 +47,6 @@
             .col
               = f.static_field :min_applicant_courses, label: 'Required Courses'
 
+        = render_if_exists("effective/applicants/course_amounts_fields", f: f)
+
         = f.save 'Save and Continue'

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

@@ -16,4 +16,6 @@
         = f.check_box :declare_truth,
           label: 'Yes, I hereby certify that the statements and information contained herein are correct'
 
+        = render_if_exists("effective/applicants/declarations_fields", f: f)
+
         = f.save 'Save and Continue'

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

@@ -22,6 +22,6 @@
 
           = aef.text_field :degree_obtained, label: 'Degree, diploma or program'
 
-        /= f.text_area :applicant_educations_details, label: 'Additional Education Details'
+        = render_if_exists("effective/applicants/education_fields", f: f)
 
         = f.save 'Save and Continue'

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

@@ -9,17 +9,26 @@
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id
 
+        - endorders_collection = Effective::ApplicantEndorsement.endorser_collection(resource)
+
         = f.has_many(:applicant_endorsements, cards: true) do |aef|
+          - aef.object.endorser_type ||= endorders_collection.klass.name
+
           %h4 Endorsement
 
-          = aef.select :endorser, Effective::ApplicantEndorsement.endorser_collection(resource), required: false,
+          = aef.hidden_field :endorser_id
+          = aef.hidden_field :endorser_type
+
+          = aef.select :endorser_id, endorders_collection, required: false,
             ajax_url: effective_memberships.select2_ajax_endorser_applicant_endorsement_path(applicant_id: resource)
 
           = aef.check_box :unknown_member, label: 'I cant find my endorser in the above list'
 
           = aef.show_if(:unknown_member, true) do
-            = aef.email_field :endorser_email, required: true
-            = aef.text_field :name, required: true
+            = aef.text_field :name, label: 'Endorser name', required: true
+            = aef.email_field :endorser_email, label: 'Email', required: true
             = aef.phone_field :phone, required: true
 
+        = render_if_exists("effective/applicants/endorsements_fields", f: f)
+
         = f.save 'Save and Continue'

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

@@ -0,0 +1,25 @@
+= render 'layout' do
+  = render 'effective/applicants/content', resource: resource
+
+  .card
+    .card-body
+      - if resource.min_applicant_equivalences > 0
+        .alert.alert-danger You must include #{resource.min_applicant_equivalences} or more equivalent memberships.
+
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
+
+        = f.has_many(:applicant_equivalences, cards: true) do |aef|
+          %h4.mb-4 Equivalent Membership
+
+          = aef.text_field :name
+
+          .row
+            .col= aef.date_field :start_on, label: 'Start Date'
+            .col= aef.date_field :end_on, label: 'End Date'
+
+          = aef.text_area :notes
+
+        = render_if_exists("effective/applicants/equivalences_fields", f: f)
+
+        = f.save 'Save and Continue'

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

@@ -21,7 +21,7 @@
           .row
             .col= aef.date_field :start_on, label: 'Start Date', 'data-applicant-experiences-month': true
             .col
-              = aef.date_field :end_on, label: 'End Date', 'data-applicant-experiences-month': true
+              = aef.date_field :end_on, label: 'End Date', required: false, 'data-applicant-experiences-month': true
               = aef.check_box :still_work_here, label: 'I still work here'
 
           .row
@@ -46,6 +46,6 @@
 
         = f.error :applicant_experiences_months
 
-        /= f.text_area :applicant_experiences_details, label: 'Additional Experiences Details'
+        = render_if_exists("effective/applicants/experience_fields", f: f)
 
         = f.save 'Save and Continue'

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

@@ -11,4 +11,6 @@
 
         = f.file_field :applicant_files, attachment_style: :table
 
+        = render_if_exists("effective/applicants/files_fields", f: f)
+
         = f.save 'Save and Continue'

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

@@ -21,4 +21,6 @@
             .col= arf.select :relationship, Effective::ApplicantReference::RELATIONSHIPS
             .col= arf.select :known, Effective::ApplicantReference::KNOWNS, label: 'Known for'
 
+        = render_if_exists("effective/applicants/references_fields", f: f)
+
         = f.save 'Save and Continue'

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

@@ -25,6 +25,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :min_applicant_experiences_months
       t.integer :min_applicant_references
       t.integer :min_applicant_endorsements
+      t.integer :min_applicant_equivalences
       t.integer :min_applicant_courses
       t.integer :min_applicant_files
 
@@ -325,6 +326,24 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     add_index :applicant_endorsements, :applicant_id
     add_index :applicant_endorsements, :token
 
+    # Applicant Equivalences
+    create_table :applicant_equivalences do |t|
+      t.integer :applicant_id
+      t.string :applicant_type
+
+      t.string :name
+
+      t.date :start_on
+      t.date :end_on
+
+      t.text :notes
+
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+
+    add_index :applicant_equivalences, :applicant_id
+
     # Applicant Courses
     create_table :applicant_course_areas do |t|
       t.string :title

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.10'
+  VERSION = '0.4.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -290,6 +290,7 @@ files:
 - app/datatables/effective_applicant_courses_datatable.rb
 - app/datatables/effective_applicant_educations_datatable.rb
 - app/datatables/effective_applicant_endorsements_datatable.rb
+- app/datatables/effective_applicant_equivalences_datatable.rb
 - app/datatables/effective_applicant_experiences_datatable.rb
 - app/datatables/effective_applicant_references_datatable.rb
 - app/datatables/effective_applicants_datatable.rb
@@ -314,6 +315,7 @@ files:
 - app/models/effective/applicant_course_name.rb
 - app/models/effective/applicant_education.rb
 - app/models/effective/applicant_endorsement.rb
+- app/models/effective/applicant_equivalence.rb
 - app/models/effective/applicant_experience.rb
 - app/models/effective/applicant_reference.rb
 - app/models/effective/applicant_review.rb
@@ -393,6 +395,7 @@ files:
 - app/views/effective/applicants/_demographics.html.haml
 - app/views/effective/applicants/_education.html.haml
 - app/views/effective/applicants/_endorsements.html.haml
+- app/views/effective/applicants/_equivalences.html.haml
 - app/views/effective/applicants/_experience.html.haml
 - app/views/effective/applicants/_files.html.haml
 - app/views/effective/applicants/_layout.html.haml
@@ -411,6 +414,7 @@ files:
 - app/views/effective/applicants/demographics.html.haml
 - app/views/effective/applicants/education.html.haml
 - app/views/effective/applicants/endorsements.html.haml
+- app/views/effective/applicants/equivalences.html.haml
 - app/views/effective/applicants/experience.html.haml
 - app/views/effective/applicants/files.html.haml
 - app/views/effective/applicants/organization.html.haml