effective_memberships 0.15.3 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2cafda7d6dc70a59ef3d1589f5cab97c69d5b42af028d79828286b2303761b4
-  data.tar.gz: 8e9cab71adbb73b888f9910466e08c987c81c8e4861744cee471968cd24f9832
+  metadata.gz: f05f20be1f211e1d0a3d17270820752b3015ac6790c635c32973c6c928b2f1b1
+  data.tar.gz: b8273500b7e6af71968a2ed83195a5a380f0563ab2750c1b6a0624e87ec5c9e5
 SHA512:
-  metadata.gz: 9018813c526f99303b07116a8a431658cf47866cc1c1dfa31f85074f9d68450a714d8c0dc420240d725ef73ac0b3c428c6a3c2fd05639f4d2aacbe35371d929f
-  data.tar.gz: b3143712b61f5f7691c46b017db9901eb6fcf5ffcc6288f43767d7525298702f864f4e4220b4486d522a0fc05813f8dd139abaa1aca70a2fa365a097ec3b265b
+  metadata.gz: c298a6e323ce94af492a00ed1aa8addfd1777a1b2023f7715f66d0231868e813d09f59b13adcb14d80da2519b3bf294b52c4eb68ff08c1c466d07a5b257c1ccd
+  data.tar.gz: c7bcfdb569352928092df90df69ec4fcd735354e71a68676721c139eb1f38b5f7bd0b874bdacadebb641309ff7c1cb425c570a31d806d9ffe227082650c5e7cf

data/app/datatables/admin/effective_applicants_datatable.rb

@@ -30,7 +30,7 @@ module Admin
       col :user
       col :organization, visible: false
 
-      col :applicant_type
+      col :applicant_type, search: EffectiveMemberships.Applicant.categories
       col :category, label: 'Applicant Category', search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
       col :stream
       col :from_category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }

data/app/datatables/admin/effective_representatives_datatable.rb

@@ -12,6 +12,7 @@ module Admin
       end
 
       col :roles, search: roles_collection
+      col :display_on_directory, label: 'Directory'
 
       actions_col
     end

data/app/datatables/effective_applicants_datatable.rb

@@ -5,6 +5,7 @@ class EffectiveApplicantsDatatable < Effective::Datatable
 
     col :id, visible: false
 
+    col :applicant_type, label: 'Type'
     col :category, label: 'Category'
     col :status, search: effective_memberships_status_collection()
 

data/app/datatables/effective_representatives_datatable.rb

@@ -12,6 +12,7 @@ class EffectiveRepresentativesDatatable < Effective::Datatable
     end
 
     col :roles, search: roles_collection
+    col :display_on_directory, label: 'Directory'
 
     unless attributes[:actions] == false
       actions_col

data/app/models/concerns/effective_memberships_applicant.rb

@@ -24,7 +24,7 @@ module EffectiveMembershipsApplicant
     # Apply for Reinstatement - Must have a removed membership. Membership history.
 
     def categories
-      ['Apply to Join', 'Apply to Reclassify', 'Apply for Reinstatement']
+      ['Apply to Join', 'Apply to Reclassify', 'Apply for Resignation', 'Apply for Reinstatement']
     end
 
     def transcripts_statuses
@@ -54,6 +54,7 @@ module EffectiveMembershipsApplicant
       demographics: 'Demographics',         # Individual only. Users fields.
       organization: 'Organization',         # Organization only. Organization fields.
       reinstatement: 'Reinstatement',       # Apply for Reinstatement only
+      resignation: 'Resignation',           # Apply for Resignation only
       education: 'Education',
       course_amounts: 'Courses',
       equivalences: 'Equivalent Memberships',
@@ -89,6 +90,9 @@ module EffectiveMembershipsApplicant
     # Reinstatements Step
     attr_accessor :declare_reinstatement
 
+    # Resignations Step
+    attr_accessor :declare_resignation
+
     # CPD Step
     attr_accessor :declare_cpd
 
@@ -375,6 +379,11 @@ module EffectiveMembershipsApplicant
       validates :declare_reinstatement, acceptance: true
     end
 
+    # Resignations step
+    with_options(if: -> { current_step == :resignation }) do
+      validates :declare_resignation, acceptance: true
+    end
+
     # Admin Approve
     validate(if: -> { approved_membership_date.present? }) do
       if approved_membership_date.to_date > Time.zone.now.to_date
@@ -405,17 +414,25 @@ module EffectiveMembershipsApplicant
     def default_applicant_required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
 
-      # All required
+      # All required steps
       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)
+      # The applicant steps
+      applicant_steps = if category.blank?
+        self.class.all_wizard_steps
+      elsif reinstatement?
+        category.applicant_reinstatement_wizard_steps
+      elsif resignation?
+        category.applicant_resignation_wizard_steps
+      else
+        category.applicant_wizard_steps
+      end
 
       # Sanity check
       applicant_steps.delete(:stamp) unless apply_to_join?
       applicant_steps.delete(:organization) unless category&.organization?
       applicant_steps.delete(:reinstatement) unless reinstatement?
+      applicant_steps.delete(:resignation) unless resignation?
 
       # change_wizard_steps is defined in effective_resources acts_as_wizard
       applicant_steps = change_wizard_steps(applicant_steps)
@@ -459,6 +476,8 @@ module EffectiveMembershipsApplicant
 
     def applicant_fee_price
       return category.applicant_reinstatement_fee if reinstatement?
+      return category.applicant_resignation_fee if resignation?
+
       applicant_fee_category.applicant_fee
     end
 
@@ -541,9 +560,13 @@ module EffectiveMembershipsApplicant
 
   # Instance Methods
   def to_s
-    return 'New Applicant' if applicant_type.blank? || category.blank? || owner.blank?
-
-    "#{owner} - #{applicant_type} to #{category}"
+    if applicant_type.blank? || category.blank? || owner.blank?
+      'New Applicant'
+    elsif resignation?
+      "#{owner} - #{applicant_type}"
+    else
+      "#{owner} - #{applicant_type} to #{category}"
+    end
   end
 
   def owner
@@ -566,6 +589,10 @@ module EffectiveMembershipsApplicant
     applicant_type == 'Apply to Reclassify'
   end
 
+  def resignation?
+    applicant_type == 'Apply for Resignation'
+  end
+
   def reinstatement?
     applicant_type == 'Apply for Reinstatement'
   end
@@ -632,6 +659,8 @@ module EffectiveMembershipsApplicant
       ['Apply for Reinstatement', 'Apply to Join']
     elsif owner.membership.blank? || owner.membership.categories.blank?
       ['Apply to Join']
+    elsif all_steps.include?(:resignation)
+      ['Apply to Reclassify', 'Apply for Resignation']
     else
       ['Apply to Reclassify']
     end
@@ -706,6 +735,7 @@ module EffectiveMembershipsApplicant
   end
 
   def applicant_references_required?
+    return false if resignation? || reinstatement?
     min_applicant_references > 0
   end
 
@@ -715,6 +745,7 @@ module EffectiveMembershipsApplicant
   end
 
   def applicant_endorsements_required?
+    return false if resignation? || reinstatement?
     min_applicant_endorsements > 0
   end
 
@@ -729,6 +760,7 @@ module EffectiveMembershipsApplicant
   end
 
   def transcripts_required?
+    return false if resignation? || reinstatement?
     required_steps.include?(:transcripts)
   end
 
@@ -886,6 +918,7 @@ module EffectiveMembershipsApplicant
   end
 
   def to_status
+    return EffectiveMemberships.Registrar.resigned_status! if resignation?
     nil
   end
 
@@ -919,6 +952,12 @@ module EffectiveMembershipsApplicant
         date: approved_membership_date.presence,       # Set by the Admin Process form, or nil
         number: approved_membership_number.presence    # Set by the Admin Process form, or nil
       )
+    elsif resignation?
+      EffectiveMemberships.Registrar.remove!(
+        owner,
+        statuses: to_status,
+        date: approved_membership_date.presence       # Set by the Admin Process form, or nil
+      )
     elsif reinstatement?
       # No status
       EffectiveMemberships.Registrar.reinstate!(

data/app/models/concerns/effective_memberships_category.rb

@@ -224,6 +224,15 @@ module EffectiveMembershipsCategory
     (Array(self[:applicant_wizard_steps]) - [nil, '']).map(&:to_sym)
   end
 
+  # Apply for Resignation
+  def applicant_resignation_wizard_steps
+    [:resignation]
+  end
+
+  def applicant_resignation_fee
+    0
+  end
+
   # Apply for Reinstatement
   def applicant_reinstatement_wizard_steps
     [:reinstatement]

data/app/models/concerns/effective_memberships_registrar.rb

@@ -51,7 +51,15 @@ module EffectiveMembershipsRegistrar
   end
 
   def not_in_good_standing_status!
-    EffectiveMemberships.Status.where(title: 'Not In Good Standing').first!
+    not_in_good_standing_status.first!
+  end
+
+  def resigned_status
+    EffectiveMemberships.Status.where(title: 'Resigned')
+  end
+
+  def resigned_status!
+    resigned_status.first!
   end
 
   # These two could be overridden if we do non 1-year periods

data/app/models/effective/representative.rb

@@ -16,6 +16,7 @@ module Effective
 
     effective_resource do
       roles_mask    :integer
+      display_on_directory :boolean
 
       timestamps
     end

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

@@ -1,38 +1,43 @@
 = effective_form_with(model: [:admin, applicant], engine: true) do |f|
-  %p The #{applicant} will be <strong>approved</strong> to the following membership category:
+  - owner = f.object.owner
 
-  - categories = EffectiveMemberships.Category.all
-  = f.select :category_id, categories, label: 'Approve to'
+  - if f.object.resignation?
+    %p The #{applicant} will be <strong>approved</strong>
+    %p Their membership will be removed and they will be marked as resigned.
 
-  - reinstatement = applicant.owner.reinstatement_membership_history if applicant.reinstatement?
+  - elsif f.object.reinstatement?
+    - reinstatement = applicant.owner.reinstatement_membership_history
 
-  %p
-    - if applicant.owner.membership&.number_was.present?
-      The member will keep their existing membership number: #{applicant.owner.membership.number_was}.
-    - elsif applicant.reinstatement? && reinstatement&.number.present?
-      The member will keep their previous membership number: #{reinstatement.number}.
-    - else
-      - number = EffectiveMemberships.Registrar.next_membership_number(applicant.owner, to: applicant.category)
+    %p The #{applicant} will be <strong>approved</strong>
+    %p Their membership will be reinstated and they will regain the following category, number and status:
 
-      - if number.present?
+    %ul
+      %li Category: #{reinstatement.membership_categories.to_sentence}
+      %li Number: #{reinstatement.number}
+      %li Status: #{badges(reinstatement.membership_statuses).presence || 'None'}
+
+  - else
+    %p The #{applicant} will be <strong>approved</strong> to the following membership category:
+    = f.select :category_id, EffectiveMemberships.Category.all, label: 'Approve to'
+
+    %p
+      - if owner.membership&.number_was.present?
+        They will keep their existing membership number: #{applicant.owner.membership.number_was}.
+      - elsif (number = EffectiveMemberships.Registrar.next_membership_number(applicant.owner, to: applicant.category)).present?
         = f.text_field :approved_membership_number, hint: "leave blank to assign the next number: #{number || 'none'}."
       - else
         No membership number will be assigned.
 
-  - if applicant.reinstatement? && reinstatement.present?
-    %p The member will be reinstated with their previous status: #{badges(reinstatement.membership_statuses) || 'None'}.
-
-  = render('admin/applicants/fees_approve', f: f, applicant: applicant)
-
-  %p The following unpurchased fees will be deleted:
-  - outstanding_fee_payment_fees = applicant.owner.outstanding_fee_payment_fees
+  - unless f.object.resignation?
+    = render('admin/applicants/fees_approve', f: f, applicant: applicant)
 
-  %ul
-    - outstanding_fee_payment_fees.each do |fee|
-      %li= fee
+    %p The following unpurchased fees will be deleted:
+    %ul
+      - applicant.owner.outstanding_fee_payment_fees.each do |fee|
+        %li= fee
 
-    - if outstanding_fee_payment_fees.blank?
-      %li None
+      - if applicant.owner.outstanding_fee_payment_fees.blank?
+        %li None
 
   %h3 Email to send
   - email_templates = applicant.approve_email_templates

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

@@ -11,6 +11,7 @@
       = f.select :organization, { 'Organizations' => EffectiveMemberships.Organization.sorted }, polymorphic: true
 
     = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
+    = f.check_box :display_on_directory
 
     - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
       = f.radios :new_representative_user_action, ['Invite new user', 'Add existing user'], inline: true, label: 'Representative'
@@ -30,9 +31,10 @@
       = f.static_field :user
 
     = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
+    = f.check_box :display_on_directory
 
     - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
       = f.fields_for :user, f.object.user do |fu|
         = render 'admin/representatives/user_fields', f: fu
 
-  = f.submit
+  = f.submit "Save " + et(f.object)

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

@@ -3,7 +3,7 @@
     %tbody
       %tr
         %td= icon('check')
-        %td Yes, I am applying to reinstate from #{applicant.from_status || applicant.from_category}.
+        %td Yes, I am applying for reinstatement to #{applicant.from_status || applicant.from_category}
       %tr
         %td= icon('check')
         %td Yes, I have read, understand and agree to the reinstatement declaration

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

@@ -0,0 +1 @@
+= f.check_box :declare_reinstatement, label: "Yes, I am applying for reinstatement to #{f.object.category}"

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

@@ -0,0 +1,6 @@
+= wizard_card(applicant) do
+  %table.table.table-sm
+    %tbody
+      %tr
+        %td= icon('check')
+        %td Yes, I am applying for resignation from #{applicant.category}

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

@@ -8,8 +8,6 @@
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
 
-      = render_if_exists("effective/applicants/reinstatement_fields", f: f)
-
-      = f.check_box :declare_reinstatement, label: 'Yes, I accept and agree to the above'
+      = render("effective/applicants/reinstatement_fields", f: f)
 
       = f.save 'Save and Continue'

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

@@ -0,0 +1,15 @@
+= render 'layout' do
+  = render 'effective/applicants/content', resource: resource
+
+  - completed = resource.has_completed_step?(:resignation)
+  - resource.declare_resignation = completed
+
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+
+      = render_if_exists("effective/applicants/resignation_fields", f: f)
+
+      = f.check_box :declare_resignation, label: "Yes, I am applying for resignation from #{f.object.category}"
+
+      = f.save 'Save and Continue'

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

@@ -0,0 +1,4 @@
+- membership = f.object.owner.membership
+
+%p Apply for Resignation from #{membership.category}.
+= f.hidden_field :category_id, value: membership.category.id

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

@@ -25,19 +25,26 @@
         = render('effective/applicants/select/apply_to_reclassify', f: f)
         = render('effective/applicants/select/categories', f: f, categories: categories - [existing_category])
 
+      - elsif applicant_types == ['Apply for Resignation']
+        = render('effective/applicants/select/apply_for_resignation', f: f)
+
       - else
         = f.select :applicant_type, applicant_types, label: 'Apply to...'
 
-        - if applicant_types.include?('Apply for Reinstatement')
-          = f.show_if :applicant_type, 'Apply for Reinstatement' do
-            = f.hidden_field :category_id, value: reinstatement_category.id
-            = render('effective/applicants/select/apply_for_reinstatement', f: f)
-
         - if applicant_types.include?('Apply to Join')
           = f.show_if :applicant_type, 'Apply to Join' do
             = render('effective/applicants/select/apply_to_join', f: f)
             = render('effective/applicants/select/categories', f: f, categories: categories)
 
+        - if applicant_types.include?('Apply for Resignation')
+          = f.show_if :applicant_type, 'Apply for Resignation' do
+            = render('effective/applicants/select/apply_for_resignation', f: f)
+
+        - if applicant_types.include?('Apply for Reinstatement')
+          = f.show_if :applicant_type, 'Apply for Reinstatement' do
+            = f.hidden_field :category_id, value: reinstatement_category.id
+            = render('effective/applicants/select/apply_for_reinstatement', f: f)
+
         - if applicant_types.include?('Apply to Reclassify')
           = f.show_if :applicant_type, 'Apply to Reclassify' do
             = render('effective/applicants/select/apply_to_reclassify', f: f)

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

@@ -11,6 +11,7 @@
       = f.select :organization, { 'Organizations' => EffectiveMemberships.Organization.sorted }, polymorphic: true
 
     = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
+    = f.check_box :display_on_directory
 
     - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
       = f.hidden_field :new_representative_user_action, value: 'Invite new user'
@@ -26,8 +27,9 @@
       = f.static_field :user
 
     = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
+    = f.check_box :display_on_directory
 
     = f.fields_for :user, f.object.user do |fu|
       = render 'effective/representatives/user_fields', f: fu
 
-  = f.submit
+  = f.submit "Save " + et(f.object)

data/config/locales/effective_memberships.en.yml

@@ -38,3 +38,7 @@ en:
       effective/membership_history: 'Membership History'
       effective/membership: 'Membership'
       effective/representative: 'Representative'
+
+    attributes:
+      effective/representative:
+        display_on_directory: 'Display this representative on the member directory'

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

@@ -184,6 +184,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.string :user_type
 
       t.integer :roles_mask
+      t.boolean :display_on_directory, :boolean, default: false
 
       t.datetime :updated_at
       t.datetime :created_at

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.15.3'
+  VERSION = '0.16.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.16.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -456,6 +456,8 @@ files:
 - app/views/effective/applicants/_references.html.haml
 - app/views/effective/applicants/_references_requirements.html.haml
 - app/views/effective/applicants/_reinstatement.html.haml
+- app/views/effective/applicants/_reinstatement_fields.html.haml
+- app/views/effective/applicants/_resignation.html.haml
 - app/views/effective/applicants/_select.html.haml
 - app/views/effective/applicants/_select_organization.html.haml
 - app/views/effective/applicants/_stamp.html.haml
@@ -476,8 +478,10 @@ files:
 - app/views/effective/applicants/organization.html.haml
 - app/views/effective/applicants/references.html.haml
 - app/views/effective/applicants/reinstatement.html.haml
+- app/views/effective/applicants/resignation.html.haml
 - app/views/effective/applicants/select.html.haml
 - app/views/effective/applicants/select/_apply_for_reinstatement.html.haml
+- app/views/effective/applicants/select/_apply_for_resignation.html.haml
 - app/views/effective/applicants/select/_apply_to_join.html.haml
 - app/views/effective/applicants/select/_apply_to_reclassify.html.haml
 - app/views/effective/applicants/select/_categories.html.haml