effective_memberships 0.4.16 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 774b42acc07d3dae76bd17888dd5c323b3a47463cb339caa96162ea323ddf4a7
-  data.tar.gz: e9ee1f7769177827ad627d61e68d294a6d868ac26ec133396b8c861b221a0b2f
+  metadata.gz: 1394fcdd25d9322f467e1392a9efeec60cc028e424ee85d3baa464d4d185a46a
+  data.tar.gz: 6c4660193bb2e98b113a4ba1e7372b469dcda714f2d78d712b635a497b488d3c
 SHA512:
-  metadata.gz: 7684254166c10f7f1c826e2e5d2a747f0d8061818355e45242303bdd8438f612a1836228298416f7f6d5bb7ee132cd92a09ecd4334fc72301755e6432d57811c
-  data.tar.gz: 555d6bbfd89c287031d106998548f76a0d26a5c5e560a018cabb1f82ae8344126e26bdb398a8ff3508ac7e51cca6d8dfc7137d08f0784da4bd43670065719f01
+  metadata.gz: 4f4bd2c3f2f544a65d9bbace898fc5538ec115175a635d2895e399597d1687850b8cbf4824bf28517c9b8cd96bee3c96fdd03fcf6224efe39db03650a85881c8
+  data.tar.gz: 9dd8b11979d28592083378f98ab4d69a3c452f156c0698e3eb717273321d4aefe20069accfe00272afc945e0791fffc202fcf3cec526b008922339a5b334f9fb

data/app/models/concerns/effective_memberships_category.rb

@@ -101,6 +101,7 @@ module EffectiveMembershipsCategory
 
     serialize :can_apply_restricted_ids, Array
     serialize :applicant_wizard_steps, Array
+    serialize :applicant_review_wizard_steps, Array
     serialize :fee_payment_wizard_steps, Array
 
     scope :deep, -> { includes(:rich_texts) }

data/app/models/effective/applicant_experience.rb

@@ -34,7 +34,7 @@ module Effective
     validates :position, presence: true
     validates :employer, presence: true
     validates :start_on, presence: true
-    validates :end_on, presence: true
+    validates :end_on, presence: true, unless: -> { still_work_here? }
     validates :level, presence: true, inclusion: { in: LEVELS }
     validates :months, presence: true
 

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

@@ -1,54 +1 @@
-= tabs do
-  - # Done applicants have the Applicant tab first. In progress ones the Status tab
-  - if applicant.done?
-    = tab 'Applicant' do
-      .mb-4= render 'effective/applicants/summary', applicant: applicant, namespace: :admin
-      = render 'effective/applicants/applicant', applicant: applicant, namespace: :admin
-
-    = tab 'Status' do
-      = render 'admin/applicants/status', applicant: applicant, namespace: :admin
-
-  - if applicant.in_progress?
-    = tab 'Status' do
-      = render 'admin/applicants/status', applicant: applicant, namespace: :admin
-
-    = tab 'Applicant' do
-      .mb-4= render 'effective/applicants/summary', applicant: applicant, namespace: :admin
-      = render 'effective/applicants/applicant', applicant: applicant, namespace: :admin
-
-  - # Just normal tabs now
-  - if applicant.was_submitted? && !applicant.was_approved?
-    = tab 'Process' do
-      = render 'admin/applicants/form_process', applicant: applicant
-
-  - if applicant.applicant_references.present?
-    = tab 'References' do
-      .mb-4= render_inline_datatable(Admin::EffectiveApplicantReferencesDatatable.new(applicant: applicant))
-
-  - if applicant.applicant_endorsements.present?
-    = 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
-        %h2 Fees
-        - datatable = Admin::EffectiveFeesDatatable.new(applicant: applicant, total: false)
-        = render_datatable(datatable, simple: true, inline: true)
-
-      .mb-4
-        %h2 Orders
-        - datatable = Admin::EffectiveOrdersDatatable.new(parent: applicant, owner: applicant.owner, user: applicant.owner, total: false)
-        = render_datatable(datatable, simple: true)
-
-  - if applicant.owner.applicants.any? { |other| other.was_submitted? && other.id != applicant.id }
-    = tab 'Other Applications' do
-      = render_datatable(Admin::EffectiveApplicantsDatatable.new(owner: applicant.owner, except_id: applicant.id))
-
-  - if applicant.persisted? && applicant.respond_to?(:log_changes_datatable)
-    = tab 'Logs' do
-      = render_inline_datatable(applicant.log_changes_datatable)
+= render('admin/applicants/form_applicant', applicant: applicant)

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

@@ -0,0 +1,56 @@
+= tabs do
+  - # Done applicants have the Applicant tab first. In progress ones the Status tab
+  - if applicant.done?
+    = tab 'Applicant' do
+      .mb-4= render 'effective/applicants/summary', applicant: applicant, namespace: :admin
+      = render 'effective/applicants/applicant', applicant: applicant, namespace: :admin
+
+    = tab 'Status' do
+      = render 'admin/applicants/status', applicant: applicant, namespace: :admin
+
+  - if applicant.in_progress?
+    = tab 'Status' do
+      = render 'admin/applicants/status', applicant: applicant, namespace: :admin
+
+    = tab 'Applicant' do
+      .mb-4= render 'effective/applicants/summary', applicant: applicant, namespace: :admin
+      = render 'effective/applicants/applicant', applicant: applicant, namespace: :admin
+
+  - # Just normal tabs now
+  - if applicant.was_submitted? && !applicant.was_approved?
+    = tab 'Process' do
+      = render 'admin/applicants/form_process', applicant: applicant
+
+  - if applicant.applicant_references.present?
+    = tab 'References' do
+      .mb-4= render_inline_datatable(Admin::EffectiveApplicantReferencesDatatable.new(applicant: applicant))
+
+  - if applicant.applicant_endorsements.present?
+    = 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.fees.present? || applicant.orders.present?
+    = tab 'Fees' do
+      .mb-4
+        %h2 Fees
+        - datatable = Admin::EffectiveFeesDatatable.new(applicant: applicant, total: false)
+        = render_datatable(datatable, simple: true, inline: true)
+
+      .mb-4
+        %h2 Orders
+        - datatable = Admin::EffectiveOrdersDatatable.new(parent: applicant, owner: applicant.owner, user: applicant.owner, total: false)
+        = render_datatable(datatable, simple: true)
+
+  - if applicant.owner.applicants.any? { |other| other.was_submitted? && other.id != applicant.id }
+    = tab 'Other Applications' do
+      = render_datatable(Admin::EffectiveApplicantsDatatable.new(owner: applicant.owner, except_id: applicant.id))
+
+  - if applicant.persisted? && applicant.respond_to?(:log_changes_datatable)
+    = tab 'Logs' do
+      = render_inline_datatable(applicant.log_changes_datatable)

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

@@ -16,6 +16,7 @@
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id
 
+        = f.hidden_field :stream, value: nil
         = f.hidden_field :organization_id, value: nil
         = f.hidden_field :organization_type, value: nil
         = f.hidden_field :category_type, value: EffectiveMemberships.Category.name

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.16'
+  VERSION = '0.4.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.17
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -337,6 +337,7 @@ files:
 - app/views/admin/applicant_endorsements/_applicant_endorsement.html.haml
 - app/views/admin/applicant_references/_applicant_reference.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
 - app/views/admin/applicants/_form_complete.html.haml
 - app/views/admin/applicants/_form_decline.html.haml