effective_memberships 0.4.16 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 774b42acc07d3dae76bd17888dd5c323b3a47463cb339caa96162ea323ddf4a7
-  data.tar.gz: e9ee1f7769177827ad627d61e68d294a6d868ac26ec133396b8c861b221a0b2f
+  metadata.gz: e719afd32d55f610b718c370497cceb43760450cfca029e618efc99dd73a8d28
+  data.tar.gz: 4564cce2a02072ad8db4c81b4c7507b522a4a1a03683899797d9c2d8aa1f89b5
 SHA512:
-  metadata.gz: 7684254166c10f7f1c826e2e5d2a747f0d8061818355e45242303bdd8438f612a1836228298416f7f6d5bb7ee132cd92a09ecd4334fc72301755e6432d57811c
-  data.tar.gz: 555d6bbfd89c287031d106998548f76a0d26a5c5e560a018cabb1f82ae8344126e26bdb398a8ff3508ac7e51cca6d8dfc7137d08f0784da4bd43670065719f01
+  metadata.gz: 0d711bedd67af762919f71c2d52a3848c70c14af8e756cab24018a4b45d616f92f42510329f53c2e5f886bfceb248e522a9d87f62a89f24641add4b208f8d0c8
+  data.tar.gz: 0f11ce742fc500785d1203c87fe3dae05d855deb4f7a51953de4a6efe3e1dff4dc12b06f72631da580cdda039552265abcf2d3c94bdc0291fb787e76c69773c8

data/app/controllers/admin/registrar_actions_controller.rb

@@ -14,6 +14,14 @@ module Admin
       success: -> { "#{resource.owner} has been reclassified to #{resource.owner.membership.category}" },
       redirect: -> { admin_owners_path(resource) }
 
+    submit :status_change, 'Change Status',
+      success: -> { "#{resource.owner} has been status changed to #{resource.owner.membership.status || 'None'}" },
+      redirect: -> { admin_owners_path(resource) }
+
+    submit :status_remove, 'Remove Status',
+      success: -> { "#{resource.owner} has had their status removed" },
+      redirect: -> { admin_owners_path(resource) }
+
     submit :assign, 'Assign',
       success: -> { "#{resource.owner} has been assigned to #{resource.owner.membership.categories.to_sentence}" },
       redirect: -> { admin_owners_path(resource) }

data/app/controllers/admin/statuses_controller.rb

@@ -0,0 +1,19 @@
+module Admin
+  class StatusesController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+    resource_scope -> { EffectiveMemberships.Status.deep.all }
+    datatable -> { Admin::EffectiveStatusesDatatable.new }
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_status) ? :effective_status : :status)
+      params.require(model).permit!
+    end
+
+  end
+end

data/app/datatables/admin/effective_membership_histories_datatable.rb

@@ -21,9 +21,19 @@ module Admin
         end.join.html_safe
       end
 
+      col :statuses, label: 'Status' do |history|
+        history.statuses.map.with_index do |status, index|
+          status_id = history.status_ids[index]
+          link = link_to(status, effective_memberships.edit_admin_status_path(status_id))
+
+          content_tag(:div, link, class: 'col-resource_item')
+        end.join.html_safe
+      end
+
       col :number
 
       col :category_ids, visible: false
+      col :status_ids, visible: false
 
       col :bad_standing
       col :removed

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -9,7 +9,8 @@ module Admin
       col :owner_type, visible: false
 
       val :owner
-      col :categories
+      col :categories, search: EffectiveMemberships.Category.sorted.map(&:to_s)
+      col :statuses, search: EffectiveMemberships.Status.sorted.map(&:to_s)
 
       col :number
       col :number_as_integer, visible: false

data/app/datatables/admin/effective_statuses_datatable.rb

@@ -0,0 +1,21 @@
+module Admin
+  class EffectiveStatusesDatatable < Effective::Datatable
+    datatable do
+      reorder :position
+
+      col :updated_at, visible: false
+      col :created_at, visible: false
+      col :id, visible: false
+
+      col :title
+      col :status_type, search: EffectiveMemberships.Status.status_types
+
+      actions_col
+    end
+
+    collection do
+      EffectiveMemberships.Status.deep.all
+    end
+
+  end
+end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -92,7 +92,9 @@ module EffectiveMembershipsApplicant
     accepts_nested_attributes_for :organization
 
     belongs_to :category, polymorphic: true, optional: true
+
     belongs_to :from_category, polymorphic: true, optional: true
+    belongs_to :from_status, polymorphic: true, optional: true
 
     has_many :applicant_reviews, -> { order(:id) }, as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_reviews, reject_if: :all_blank, allow_destroy: true
@@ -186,6 +188,7 @@ module EffectiveMembershipsApplicant
     before_validation(if: -> { (new_record? || current_step == :select) && owner.present? }) do
       self.applicant_type = (owner.membership.blank? ? 'Apply to Join' : 'Apply to Reclassify')
       self.from_category = owner.membership&.category
+      self.from_status = owner.membership&.status
     end
 
     before_validation(if: -> { current_step == :experience }) do

data/app/models/concerns/effective_memberships_category.rb

@@ -42,7 +42,7 @@ module EffectiveMembershipsCategory
       category_type         :string
 
       title                 :string
-      category              :string
+      category              :string                 # Unused but must belong to self.class.categories
       position              :integer
 
       # Applicants
@@ -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/concerns/effective_memberships_fee_payment.rb

@@ -56,8 +56,8 @@ module EffectiveMembershipsFeePayment
     belongs_to :organization, polymorphic: true, optional: true
     accepts_nested_attributes_for :organization
 
-    # Like maybe optionally it makes sense.
     belongs_to :category, polymorphic: true, optional: true
+    belongs_to :from_status, polymorphic: true, optional: true
 
     # Effective Namespace
     has_many :fees, -> { order(:id) }, as: :parent, class_name: 'Effective::Fee', dependent: :nullify
@@ -102,6 +102,7 @@ module EffectiveMembershipsFeePayment
 
     before_validation(if: -> { current_step == :start && user && user.membership }) do
       self.category ||= user.membership.categories.first if user.membership.categories.length == 1
+      self.from_status ||= user.membership.statuses.first if user.membership.statuses.length == 1
     end
 
     # All Steps validations

data/app/models/concerns/effective_memberships_owner.rb

@@ -53,6 +53,24 @@ module EffectiveMembershipsOwner
       where(id: with_paid_fees_through.select(:owner_id))
     }
 
+    scope :members_with_category, -> (categories) {
+      raise('expected an EffectiveMemberships.Category') unless Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
+
+      membership_categories = Effective::MembershipCategory.where(category: categories)
+      memberships = Effective::Membership.where(id: membership_categories.select(:membership_id))
+
+      where(id: memberships.where(owner_type: name).select(:owner_id))
+    }
+
+    scope :members_with_status, -> (statuses) {
+      raise('expected an EffectiveMemberships.Status') unless Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
+
+      membership_statuses = Effective::MembershipStatus.where(status: statuses)
+      memberships = Effective::Membership.where(id: membership_statuses.select(:membership_id))
+
+      where(id: memberships.where(owner_type: name).select(:owner_id))
+    }
+
   end
 
   def assign_member_role
@@ -103,6 +121,10 @@ module EffectiveMembershipsOwner
     EffectiveMemberships.Category.sorted.all
   end
 
+  def registrar_action_statuses(action)
+    EffectiveMemberships.Status.sorted.all
+  end
+
   # Instance Methods
   def build_prorated_fee(date: nil)
     raise('must have an existing membership') unless membership.present?
@@ -271,21 +293,29 @@ module EffectiveMembershipsOwner
 
     # The date of change
     start_on ||= Time.zone.now
-    removed = membership.marked_for_destruction?
 
     # End the other membership histories
     membership_histories.each { |history| history.end_on ||= start_on }
 
     # Snapshot of the current membership at this time
-    membership_histories.build(
+    history = membership_histories.build(
       start_on: start_on,
       end_on: nil,
-      removed: removed,
-      bad_standing: membership.bad_standing?,
-      categories: (membership.categories.map(&:to_s) unless removed),
-      category_ids: (membership.categories.map(&:id) unless removed),
-      number: (membership.number unless removed)
+      removed: membership.marked_for_destruction?,
+      bad_standing: membership.bad_standing?
     )
+
+    unless history.removed?
+      history.assign_attributes(
+        number: membership.number,
+        categories: membership.categories.map(&:to_s),
+        category_ids: membership.categories.map(&:id),
+        statuses: membership.statuses.map(&:to_s),
+        status_ids: membership.statuses.map(&:id)
+      )
+    end
+
+    history
   end
 
   def membership_history_on(date)

data/app/models/concerns/effective_memberships_registrar.rb

@@ -42,11 +42,14 @@ module EffectiveMembershipsRegistrar
     period(date: date).end_of_year
   end
 
-  def assign!(owner, categories:, date: nil, number: nil)
+  # Category is required, statuses are optional
+  def assign!(owner, categories:, statuses: nil, date: nil, number: nil)
     categories = Array(categories)
+    statuses = Array(statuses)
 
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
-    raise('expecting a membership category') unless categories.present? && categories.all? { |cat| cat.class.respond_to?(:effective_memberships_category?) }
+    raise('expecting a membership category') if categories.blank? || categories.any? { |cat| !cat.class.respond_to?(:effective_memberships_category?) }
+    raise('expecting an membership status (optional)') if statuses.present? && statuses.any? { |status| !status.class.respond_to?(:effective_memberships_status?) }
 
     # Default Date and next number
     date ||= Time.zone.now
@@ -64,6 +67,17 @@ module EffectiveMembershipsRegistrar
     membership.number ||= number
     membership.number_as_integer ||= (Integer(number) rescue nil)
 
+    # Delete any removed statuses
+    membership.membership_statuses.each do |membership_status|
+      next if statuses.include?(membership_status.status)
+      membership_status.mark_for_destruction
+    end
+
+    # Build any additional statuses
+    statuses.each do |status|
+      membership.build_membership_status(status: status)
+    end
+
     # Delete any removed categories
     membership.membership_categories.each do |membership_category|
       next if categories.include?(membership_category.category)
@@ -76,6 +90,7 @@ module EffectiveMembershipsRegistrar
     end
 
     changed = membership.membership_categories.any? { |mc| mc.new_record? || mc.marked_for_destruction? }
+    changed ||= membership.membership_statuses.any? { |ms| ms.new_record? || ms.marked_for_destruction? }
 
     if changed
       membership.registration_on = date # Always new registration_on
@@ -88,9 +103,10 @@ module EffectiveMembershipsRegistrar
     owner.update_membership_status!
   end
 
-  def register!(owner, to:, date: nil, number: nil, skip_fees: false)
+  def register!(owner, to:, status: nil, date: nil, number: nil, skip_fees: false)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('expecting a memberships category') unless to.class.respond_to?(:effective_memberships_category?)
+    raise('expecting a memberships status') unless status.nil? || status.class.respond_to?(:effective_memberships_status?)
     raise('owner has existing membership. use reclassify! instead.') if owner.membership.present?
 
     # Default Date and next number
@@ -113,6 +129,9 @@ module EffectiveMembershipsRegistrar
     # Assign Category
     membership.build_membership_category(category: to)
 
+    # Assign Status
+    membership.build_membership_status(status: status) if status.present?
+
     # Assign fees paid through period
     if skip_fees
       membership.fees_paid_period = period
@@ -164,6 +183,34 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
+  # This clears the status entirely from user
+  def status_remove!(owner, date: nil)
+    status_change!(owner, to: nil, date: date)
+  end
+
+  # To can be nil to clear the status entirely
+  def status_change!(owner, to:, date: nil)
+    raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
+    raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
+
+    from = owner.membership.status
+
+    raise('expecting a to memberships status') if to.present? && !to.class.respond_to?(:effective_memberships_status?)
+    raise('expecting a from memberships status') if from.present? && !from.class.respond_to?(:effective_memberships_status?)
+    raise('expected to and from to be different') if from == to
+
+    date ||= Time.zone.now
+
+    membership = owner.membership
+
+    # Assign Status
+    membership.build_membership_status(status: to) if to.present?
+    membership.membership_status(status: from).mark_for_destruction if from.present?
+
+    # Save
+    save!(owner, date: date)
+  end
+
   def remove!(owner, date: nil)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('expected a member') unless owner.membership.present?

data/app/models/concerns/effective_memberships_status.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+# EffectiveMembershipsStatus
+#
+# Mark your status model with effective_memberships_status to get all the includes
+
+module EffectiveMembershipsStatus
+  extend ActiveSupport::Concern
+
+  module Base
+    def effective_memberships_status
+      include ::EffectiveMembershipsStatus
+    end
+  end
+
+  module ClassMethods
+    def effective_memberships_status?; true; end
+
+    def status_types
+      ['Individual', 'Organization']
+    end
+
+    def statuses
+      []
+    end
+  end
+
+  included do
+    log_changes(except: :memberships) if respond_to?(:log_changes)
+
+    has_many :membership_statuses, class_name: 'Effective::MembershipStatus', as: :status
+
+    effective_resource do
+      status_type           :string
+
+      title                 :string
+      status                :string         # Unused but must belong to self.class.statuses
+      position              :integer
+
+      timestamps
+    end
+
+    scope :deep, -> { all }
+    scope :sorted, -> { order(:position) }
+
+    validates :title, presence: true, uniqueness: true
+    validates :status_type, presence: true
+    validates :position, presence: true
+
+    before_validation do
+      self.position ||= (self.class.pluck(:position).compact.max || -1) + 1
+      self.status_type ||= self.class.status_types.first
+    end
+
+  end
+
+  # Instance Methods
+
+  def to_s
+    title.presence || 'New Membership Status'
+  end
+
+  def individual?
+    status_type == 'Individual'
+  end
+
+  def organization?
+    status_type == 'Organization'
+  end
+
+end

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/models/effective/membership.rb

@@ -7,6 +7,9 @@ module Effective
     has_many :membership_categories, -> { order(:id) }, inverse_of: :membership, dependent: :delete_all
     accepts_nested_attributes_for :membership_categories
 
+    has_many :membership_statuses, -> { order(:id) }, inverse_of: :membership, dependent: :delete_all
+    accepts_nested_attributes_for :membership_statuses
+
     log_changes(to: :owner) if respond_to?(:log_changes)
 
     effective_resource do
@@ -74,7 +77,8 @@ module Effective
       summary = [
         owner.to_s,
         'is',
-        (categories.to_sentence),
+        (statuses.to_sentence if statuses.present?),
+        (categories.to_sentence if categories.present?),
         'member',
         "##{number_was}",
         "who joined #{joined_on&.strftime('%F') || '-'}",
@@ -85,6 +89,8 @@ module Effective
       (summary + '.').html_safe
     end
 
+    ## Membership Categories
+
     # We can't use the polymorphic has_many. So this is a helper.
     def categories
       membership_categories.reject(&:marked_for_destruction?).map(&:category)
@@ -96,12 +102,12 @@ module Effective
 
     # We might want to use singular memberships.
     def category
-      raise('expected singular usage but there are more than one membership') if categories.length > 1
+      raise('expected singular usage but there are more than one membership category') if categories.length > 1
       categories.first
     end
 
     def category_id
-      raise('expected singular usage but there are more than one membership') if categories.length > 1
+      raise('expected singular usage but there are more than one membership category') if categories.length > 1
       categories.first.id
     end
 
@@ -115,6 +121,38 @@ module Effective
       membership_category(category: category) || membership_categories.build(category: category)
     end
 
+    ## Membership Statuses
+
+    # We can't use the polymorphic has_many. So this is a helper.
+    def statuses
+      membership_statuses.reject(&:marked_for_destruction?).map(&:status)
+    end
+
+    def status_ids
+      membership_statuses.reject(&:marked_for_destruction?).map(&:status_id)
+    end
+
+    # We might want to use singular memberships.
+    def status
+      raise('expected singular usage but there are more than one membership status') if statuses.length > 1
+      statuses.first
+    end
+
+    def status_id
+      raise('expected singular usage but there are more than one membership status') if statuses.length > 1
+      statuses.first.id
+    end
+
+    def membership_status(status:)
+      raise('expected a status') unless status.class.respond_to?(:effective_memberships_status?)
+      membership_statuses.find { |ms| ms.status_id == status.id && ms.status_type == status.class.name }
+    end
+
+    # find or build
+    def build_membership_status(status:)
+      membership_status(status: status) || membership_statuses.build(status: status)
+    end
+
     def good_standing?
       !bad_standing?
     end

data/app/models/effective/membership_history.rb

@@ -22,16 +22,15 @@ module Effective
     serialize :categories, Array
     serialize :category_ids, Array
 
+    serialize :statuses, Array
+    serialize :status_ids, Array
+
     scope :deep, -> { includes(:owner) }
     scope :sorted, -> { order(:start_on) }
 
     scope :removed, -> { where(removed: true) }
 
     validates :owner, presence: true
-
-    # validates :categories, presence: true, unless: -> { removed? }
-    # validates :category_ids, presence: true, unless: -> { removed? }
-
     validates :start_on, presence: true
 
     def to_s
@@ -44,6 +43,10 @@ module Effective
       category_ids.present? ? EffectiveMemberships.Category.where(id: category_ids) : []
     end
 
+    def membership_statuses
+      status_ids.present? ? EffectiveMemberships.Status.where(id: status_ids) : []
+    end
+
     def membership_category_ids
       membership_categories.map(&:id)
     end
@@ -53,5 +56,15 @@ module Effective
       assign_attributes(categories: categories.map(&:to_s), category_ids: categories.map(&:id))
     end
 
+    def membership_status_ids
+      membership_statuses.map(&:id)
+    end
+
+    def membership_status_ids=(ids)
+      statuses = EffectiveMemberships.Status.where(id: ids)
+      assign_attributes(statuses: statuses.map(&:to_s), status_ids: statuses.map(&:id))
+    end
+
+
   end
 end

data/app/models/effective/membership_status.rb

@@ -0,0 +1,13 @@
+module Effective
+  class MembershipStatus < ActiveRecord::Base
+    belongs_to :status, polymorphic: true
+    belongs_to :membership, polymorphic: true
+
+    log_changes(to: :membership) if respond_to?(:log_changes)
+
+    def to_s
+      status&.to_s || 'membership status'
+    end
+
+  end
+end

data/app/models/effective/registrar_action.rb

@@ -12,13 +12,21 @@ module Effective
     # Bad Standing
     attr_accessor :bad_standing_reason
 
+    # Register
+    attr_accessor :status_id
+
     # Reclassify & Register
     attr_accessor :category_id
     attr_accessor :membership_number
     attr_accessor :skip_fees
 
+    # Status Change
+    attr_accessor :status_id
+    attr_accessor :status_remove_action
+
     # Assign
     attr_accessor :category_ids
+    attr_accessor :status_ids
 
     # Mark Fees Paid - Order Attributes
     attr_accessor :payment_provider
@@ -38,6 +46,10 @@ module Effective
     validates :category_id, presence: true,
       if: -> { current_action == :reclassify || current_action == :register }
 
+    # Status Change
+    validates :status_id, presence: true, if: -> { current_action == :status_change }
+
+    # Assign
     validates :category_ids, presence: true, if: -> { current_action == :assign }
 
     def to_s
@@ -46,7 +58,7 @@ module Effective
 
     def register!
       update!(current_action: :register)
-      EffectiveMemberships.Registrar.register!(owner, to: category, number: membership_number.presence, skip_fees: skip_fees?)
+      EffectiveMemberships.Registrar.register!(owner, to: category, status: status, number: number, skip_fees: skip_fees?)
     end
 
     def reclassify!
@@ -54,9 +66,19 @@ module Effective
       EffectiveMemberships.Registrar.reclassify!(owner, to: category, skip_fees: skip_fees?)
     end
 
+    def status_change!
+      update!(current_action: :status_change)
+      EffectiveMemberships.Registrar.status_change!(owner, to: status)
+    end
+
+    def status_remove!
+      update!(current_action: :status_remove)
+      EffectiveMemberships.Registrar.status_remove!(owner)
+    end
+
     def assign!
       update!(current_action: :assign)
-      EffectiveMemberships.Registrar.assign!(owner, categories: categories, number: membership_number.presence)
+      EffectiveMemberships.Registrar.assign!(owner, categories: categories, statuses: statuses, number: number)
     end
 
     def good_standing!
@@ -102,11 +124,23 @@ module Effective
     private
 
     def category
-      EffectiveMemberships.Category.find(@category_id) if @category_id
+      EffectiveMemberships.Category.find(@category_id) if @category_id.present?
     end
 
     def categories
-      EffectiveMemberships.Category.where(id: @category_ids) if @category_ids
+      EffectiveMemberships.Category.where(id: @category_ids) if @category_ids.present?
+    end
+
+    def status
+      EffectiveMemberships.Status.find(@status_id) if @status_id.present?
+    end
+
+    def statuses
+      EffectiveMemberships.Status.where(id: @status_ids) if @status_ids.present?
+    end
+
+    def number
+      membership_number.presence
     end
 
     def order_attributes

data/app/models/effective/status.rb

@@ -0,0 +1,7 @@
+module Effective
+  class Status < ActiveRecord::Base
+    self.table_name = EffectiveMemberships.statuses_table_name.to_s
+
+    effective_memberships_status
+  end
+end

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/admin/membership_histories/_form.html.haml

@@ -11,7 +11,9 @@
 
   = f.date_field :end_on, hint: 'The end date of this period in history. Must be present for all past histories. Must be blank in the most recent history, unless membership removed.'
   = f.text_field :number, hint: 'The membership number'
+
   = f.select :membership_category_ids, EffectiveMemberships.Category.all.sorted, label: 'Membership Categories', hint: 'The membership category or categories held during this period in history.'
+  = f.select :membership_status_ids, EffectiveMemberships.Status.all.sorted, label: 'Membership Statuses', hint: 'The membership status or statuses held during this period in history.'
 
   = f.check_box :bad_standing, hint: 'Membership in bad standing'
   = f.check_box :removed, hint: 'Membership removed'

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

@@ -1,10 +1,17 @@
 - registrar_action = Effective::RegistrarAction.new(current_user: current_user, owner: owner)
 
+-# This form is great if we want to do multiple categories or statuses
+-#.mb-4= render 'admin/registrar_actions/form_assign', registrar_action: registrar_action
+
 - if owner.membership.blank?
   .mb-4= render 'admin/registrar_actions/form_register', registrar_action: registrar_action
 
 - if owner.membership.present?
   .mb-4= render 'admin/registrar_actions/form_reclassify', registrar_action: registrar_action
+
+  - if owner.registrar_action_statuses(:status_change).present?
+    .mb-4= render 'admin/registrar_actions/form_status_change', registrar_action: registrar_action
+
   .mb-4= render 'admin/registrar_actions/form_bad_standing', registrar_action: registrar_action
   .mb-4= render 'admin/registrar_actions/form_fees_paid', registrar_action: registrar_action
   .mb-4= render 'admin/registrar_actions/form_remove', registrar_action: registrar_action

data/app/views/admin/registrar_actions/_form_assign.html.haml

@@ -8,21 +8,41 @@
 
       - membership = f.object.owner.membership
 
+      - categories = f.object.owner.registrar_action_categories(:assign)
+      - statuses = f.object.owner.registrar_action_statuses(:assign)
+      - label = [('categories' if categories.present?), ('statuses' if statuses.present?)].join(' or ')
+
+      - if membership.present?
+        - f.object.category_ids = membership.category_ids
+        - f.object.status_ids = membership.status_ids
+
       %p.text-muted
-        Assign to one or more categories.
+        Assign to #{label}.
+
+      - if categories.present?
+        = f.static_field :current_action, label: 'Current Categories' do
+          - Array(membership&.categories).each do |category|
+            %div= link_to(category, effective_memberships.edit_admin_category_path(category))
 
-      = f.static_field :current_action, label: 'Current Categories' do
-        - Array(membership&.categories).each do |category|
-          %div= link_to(category, effective_memberships.edit_admin_category_path(category))
+          - if membership&.categories.blank?
+            None
 
-        - if membership.blank?
-          None
+      - if statuses.present?
+        = f.static_field :current_action, label: 'Current Statuses' do
+          - Array(membership&.statuses).each do |status|
+            %div= link_to(status, effective_memberships.edit_admin_status_path(status))
 
-      = f.check_box :current_action, label: 'Yes, assign this member to categories'
+          - if membership&.statuses.blank?
+            None
+
+      = f.check_box :current_action, label: "Yes, assign this member to #{label}"
 
       = f.show_if :current_action, true do
-        - categories = f.object.owner.registrar_action_categories(:assign)
-        = f.select :category_ids, categories, label: 'Assign to', required: true, multiple: true
+        - if categories.present?
+          = f.select :category_ids, categories, label: 'Assign to', required: true, multiple: true
+
+        - if statuses.present?
+          = f.select :status_ids, statuses, label: false, required: true, multiple: true
 
         - if membership.present?
           %p The member will keep their existing membership number: #{membership.number}.

data/app/views/admin/registrar_actions/_form_register.html.haml

@@ -7,6 +7,8 @@
       = f.hidden_field :owner_type
 
       - period = EffectiveMemberships.Registrar.current_period
+      - categories = f.object.owner.registrar_action_categories(:register)
+      - statuses = f.object.owner.registrar_action_statuses(:register)
 
       %p.text-muted
         Register into a new category and optionally create fees.
@@ -17,8 +19,11 @@
       = f.check_box :current_action, label: 'Yes, register to a membership'
 
       = f.show_if :current_action, true do
-        - categories = f.object.owner.registrar_action_categories(:register)
-        = f.select :category_id, categories, label: 'Register to'
+        - if categories.present?
+          = f.select :category_id, categories, label: 'Register to'
+
+        - if statuses.present?
+          = f.select :status_id, statuses, label: false
 
         = f.text_field :membership_number, hint: "leave blank to assign the next number"
 

data/app/views/admin/registrar_actions/_form_status_change.html.haml

@@ -0,0 +1,41 @@
+.card
+  .card-body
+    %h5.card-title Status Change
+
+    = effective_form_with(model: [:admin, registrar_action], url: effective_memberships.admin_registrar_actions_path) do |f|
+      = f.hidden_field :owner_id
+      = f.hidden_field :owner_type
+
+      - membership = f.object.owner.membership
+      - period = EffectiveMemberships.Registrar.current_period
+
+      %p.text-muted
+        Change or remove a member's existing status.
+
+      = f.static_field :current_action, label: 'Current Status' do
+        = (membership.status || 'None').to_s
+
+      = f.check_box :current_action, label: 'Yes, change member status'
+
+      = f.show_if :current_action, true do
+        %p The member will keep their existing membership number: #{membership.number}.
+
+        - statuses = f.object.owner.registrar_action_statuses(:status_change) - membership.statuses
+        = f.select :status_id, statuses, label: 'Change status to', required: true
+
+        %p No fees will be created
+
+        = f.submit 'Change Status', border: false, center: true, 'data-confirm': "Really change #{f.object.owner}?"
+
+      - # Remove Action
+      - if membership.status.present?
+        = f.check_box :status_remove_action, label: "Yes, remove #{membership.status} status"
+
+        = f.show_if :status_remove_action, true do
+          %p The member will keep their existing membership number: #{membership.number}
+
+          %p This action will remove the #{membership.status} status
+
+          %p No fees will be created
+
+          = f.submit 'Remove Status', border: false, center: true, 'data-confirm': "Really remove status #{f.object.owner}?"

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

@@ -0,0 +1,8 @@
+= tabs do
+  = tab 'Status' do
+    = render 'admin/statuses/form_status', status: status
+
+  - if status.persisted?
+    - if status.respond_to?(:log_changes_datatable)
+      = tab 'Logs' do
+        = render_inline_datatable(status.log_changes_datatable)

data/app/views/admin/statuses/_form_status.html.haml

@@ -0,0 +1,9 @@
+= effective_form_with(model: [:admin, status], engine: true) do |f|
+  = f.text_field :title
+
+  = f.select :status_type, f.object.class.status_types
+
+  - if f.object.class.statuses.present?
+    = f.select :status, f.object.class.statuses
+
+  = f.submit

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/config/effective_memberships.rb

@@ -5,6 +5,7 @@ EffectiveMemberships.setup do |config|
   config.fee_payments_table_name = :fee_payments
   config.organizations_table_name = :organizations
   config.representatives_table_name = :representatives
+  config.statuses_table_name = :statuses
 
   # Layout Settings
   # Configure the Layout per controller, or all at once
@@ -17,8 +18,11 @@ EffectiveMemberships.setup do |config|
   # config.category_class_name = 'Effective::Category'
   # config.applicant_class_name = 'Effective::Applicant'
   # config.applicant_review_class_name = 'Effective::ApplicantReview'
+  # config.fee_payment_class_name = 'Effective::FeePayment'
+  # config.membership_card_class_name = 'Effective::MembershipCard'
   # config.registrar_class_name = 'Effective::Registrar'
   # config.organization_class_name = 'Effective::Organization'
+  # config.status_class_name = 'Effective::Status'
 
   # Fee Categories
   # The defaults include: Applicant, Prorated, Renewal, Late, Admin

data/config/routes.rb

@@ -46,7 +46,7 @@ EffectiveMemberships::Engine.routes.draw do
     end
 
     resources :fees
-    resources :categories, except: [:show]
+    resources :categories, only: [:index, :edit, :update]
 
     resources :applicant_course_areas, except: [:show]
     resources :applicant_course_names, except: [:show]
@@ -62,6 +62,7 @@ EffectiveMemberships::Engine.routes.draw do
     end
 
     resources :representatives, except: [:show]
+    resources :statuses, only: [:index, :edit, :update]
   end
 
 end

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

@@ -65,6 +65,22 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     add_index :categories, :title
     add_index :categories, :position
 
+    # Statuses
+    create_table :statuses do |t|
+      t.string :status_type         # Individual or Organization
+
+      t.string :title
+      t.string :status              # Freeform
+
+      t.integer :position
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
+    add_index :statuses, :title
+    add_index :statuses, :position
+
     # Memberships
     create_table :memberships do |t|
       t.integer :owner_id
@@ -98,6 +114,15 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.string :membership_type
     end
 
+    # Membership Statuses Join table
+    create_table :membership_statuses do |t|
+      t.integer :status_id
+      t.string :status_type
+
+      t.integer :membership_id
+      t.string :membership_type
+    end
+
     # Membership Histories
     create_table :membership_histories do |t|
       t.integer :owner_id
@@ -106,6 +131,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.text :categories
       t.text :category_ids
 
+      t.text :statuses
+      t.text :status_ids
+
       t.date :start_on
       t.date :end_on
 
@@ -182,6 +210,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :from_category_id
       t.string :from_category_type
 
+      t.integer :from_status_id
+      t.string :from_status_type
+
       # Acts as Statused
       t.string :status
       t.text :status_steps

data/lib/effective_memberships/engine.rb

@@ -12,6 +12,7 @@ module EffectiveMemberships
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.extend(EffectiveMembershipsOwner::Base)
         ActiveRecord::Base.extend(EffectiveMembershipsCategory::Base)
+        ActiveRecord::Base.extend(EffectiveMembershipsStatus::Base)
 
         ActiveRecord::Base.extend(EffectiveMembershipsUser::Base)
         ActiveRecord::Base.extend(EffectiveMembershipsOrganization::Base)

data/lib/effective_memberships/version.rb

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

data/lib/effective_memberships.rb

@@ -6,8 +6,8 @@ module EffectiveMemberships
 
   def self.config_keys
     [
-      :categories_table_name, :applicants_table_name, :applicant_reviews_table_name, :fee_payments_table_name, :organizations_table_name, :representatives_table_name,
-      :category_class_name, :organization_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name, :membership_card_class_name,
+      :categories_table_name, :applicants_table_name, :applicant_reviews_table_name, :fee_payments_table_name, :organizations_table_name, :representatives_table_name, :statuses_table_name,
+      :category_class_name, :organization_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name, :membership_card_class_name, :status_class_name,
       :additional_fee_types, :applicant_reviews, :applicant_endorsements_endorser_collection,
       :layout,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates
@@ -40,14 +40,13 @@ module EffectiveMemberships
     membership_card_class_name&.constantize || Effective::MembershipCard
   end
 
-  def self.applicant_reviews?
-    applicant_reviews == true
+  def self.Status
+    status_class_name&.constantize || Effective::Status
   end
 
   # Singleton
   def self.Registrar
-    klass = registrar_class_name&.constantize || Effective::Registrar
-    klass.new
+    (registrar_class_name&.constantize || Effective::Registrar).new
   end
 
   def self.mailer_class
@@ -66,4 +65,8 @@ module EffectiveMemberships
     ['Admin']
   end
 
+  def self.applicant_reviews?
+    applicant_reviews == true
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.5.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -267,6 +267,7 @@ files:
 - app/controllers/admin/organizations_controller.rb
 - app/controllers/admin/registrar_actions_controller.rb
 - app/controllers/admin/representatives_controller.rb
+- app/controllers/admin/statuses_controller.rb
 - app/controllers/effective/applicant_endorsements_controller.rb
 - app/controllers/effective/applicant_references_controller.rb
 - app/controllers/effective/applicants_controller.rb
@@ -287,6 +288,7 @@ files:
 - app/datatables/admin/effective_memberships_datatable.rb
 - app/datatables/admin/effective_organizations_datatable.rb
 - app/datatables/admin/effective_representatives_datatable.rb
+- app/datatables/admin/effective_statuses_datatable.rb
 - app/datatables/effective_applicant_courses_datatable.rb
 - app/datatables/effective_applicant_educations_datatable.rb
 - app/datatables/effective_applicant_endorsements_datatable.rb
@@ -308,6 +310,7 @@ files:
 - app/models/concerns/effective_memberships_organization.rb
 - app/models/concerns/effective_memberships_owner.rb
 - app/models/concerns/effective_memberships_registrar.rb
+- app/models/concerns/effective_memberships_status.rb
 - app/models/concerns/effective_memberships_user.rb
 - app/models/effective/applicant.rb
 - app/models/effective/applicant_course.rb
@@ -326,10 +329,12 @@ files:
 - app/models/effective/membership_card.rb
 - app/models/effective/membership_category.rb
 - app/models/effective/membership_history.rb
+- app/models/effective/membership_status.rb
 - app/models/effective/organization.rb
 - app/models/effective/registrar.rb
 - app/models/effective/registrar_action.rb
 - app/models/effective/representative.rb
+- app/models/effective/status.rb
 - app/views/admin/applicant_course_areas/_form.html.haml
 - app/views/admin/applicant_course_areas/_form_applicant_course_area.html.haml
 - app/views/admin/applicant_course_areas/index.html.haml
@@ -337,6 +342,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
@@ -373,8 +379,11 @@ files:
 - app/views/admin/registrar_actions/_form_reclassify.html.haml
 - app/views/admin/registrar_actions/_form_register.html.haml
 - app/views/admin/registrar_actions/_form_remove.html.haml
+- app/views/admin/registrar_actions/_form_status_change.html.haml
 - app/views/admin/representatives/_form.html.haml
 - app/views/admin/representatives/_user_fields.html.haml
+- app/views/admin/statuses/_form.html.haml
+- app/views/admin/statuses/_form_status.html.haml
 - app/views/admin/users/_col.html.haml
 - app/views/effective/applicant_endorsements/_applicant_endorsement.html.haml
 - app/views/effective/applicant_endorsements/_datatable_actions.html.haml