effective_memberships 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5a9ac211f2370d13d88ee7b8ce0345c4c8363c530dd60dccbe4bc2da046bf98
-  data.tar.gz: 69f0f40f0116c65bea68c949424921b2a87b821e50e664fc73b1312f90c79a79
+  metadata.gz: 994cc88bc7e75f8660b8af1a9930175493759241323675edc72da9ab53640ab5
+  data.tar.gz: e29658115f728da1b3b33f5776fc24e461f6abe5ac9cb8d1362834153598a96e
 SHA512:
-  metadata.gz: 7edb8681ca649e8aa121cf38add83c1e21277a968682e8b183f5f3197a84dd061f5ebac01c0da824c64f59c93f47e17d46ea43d81ee4b31a1cb485235b24f7e7
-  data.tar.gz: 4fe46479e76c85a356861d4b42f2e1b59675c3726e61c9791044b85133679e87f5d2b66e7a719311fe6c15a6d25a89db04f2b4f20232c462c5a028cf2c013f85
+  metadata.gz: 9b2a8938998de7838aef913e2e4f2262a0cde28fc04de5fb0d74816a1ff9ddc23db3000985aceca51b4578339553c9be2c39b0ca0df11c6bbecd7a620101e17f
+  data.tar.gz: 95f6268d44cc10e4dabe9c4208f5d42ae669533f31876643aa2b31749414dc5cbf68e8368c062c5997cc61261579e6bec5decfb446020c5497fe74cc02a29640

data/app/controllers/admin/registrar_actions_controller.rb

@@ -14,16 +14,16 @@ 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'}" },
+    submit :status_assign, 'Assign Status',
+      success: -> { "#{resource.owner} has been assigned #{resource.owner.membership.statuses_sentence}" },
       redirect: -> { admin_owners_path(resource) }
 
     submit :status_remove, 'Remove Status',
-      success: -> { "#{resource.owner} has had their status removed" },
+      success: -> { "#{resource.owner} has been removed from #{resource.status}" },
       redirect: -> { admin_owners_path(resource) }
 
     submit :assign, 'Assign',
-      success: -> { "#{resource.owner} has been assigned to #{resource.owner.membership.categories.to_sentence}" },
+      success: -> { "#{resource.owner} has been assigned to #{resource.owner.membership.categories_sentence}" },
       redirect: -> { admin_owners_path(resource) }
 
     submit :remove, 'Remove',

data/app/models/concerns/effective_memberships_registrar.rb

@@ -262,7 +262,7 @@ module EffectiveMembershipsRegistrar
 
   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?
+    raise('expected a member with a membership') unless owner.membership.present?
 
     # Date
     date ||= Time.zone.now

data/app/models/effective/membership.rb

@@ -113,6 +113,10 @@ module Effective
       categories.first.id
     end
 
+    def categories_sentence
+      categories.map(&:to_s).to_sentence.presence || 'None'
+    end
+
     def membership_category(category:)
       raise('expected a category') unless category.class.respond_to?(:effective_memberships_category?)
       membership_categories.find { |mc| mc.category_id == category.id && mc.category_type == category.class.name }
@@ -134,6 +138,10 @@ module Effective
       membership_statuses.reject(&:marked_for_destruction?).map(&:status_id)
     end
 
+    def statuses_sentence
+      statuses.map(&:to_s).to_sentence.presence || 'None'
+    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

data/app/models/effective/registrar_action.rb

@@ -21,8 +21,8 @@ module Effective
     attr_accessor :skip_fees
 
     # Status Change
+    attr_accessor :status_ids
     attr_accessor :status_id
-    attr_accessor :status_remove_action
 
     # Assign
     attr_accessor :category_ids
@@ -46,8 +46,11 @@ 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 }
+    # Status Assign
+    validates :status_ids, presence: true, if: -> { current_action == :status_assign }
+
+    # Status Remove
+    validates :status_id, presence: true, if: -> { current_action == :status_remove }
 
     # Assign
     validates :category_ids, presence: true, if: -> { current_action == :assign }
@@ -66,14 +69,14 @@ 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)
+    def status_assign!
+      update!(current_action: :status_assign)
+      EffectiveMemberships.Registrar.status_assign!(owner, status: statuses)
     end
 
     def status_remove!
       update!(current_action: :status_remove)
-      EffectiveMemberships.Registrar.status_remove!(owner)
+      EffectiveMemberships.Registrar.status_remove!(owner, status: status)
     end
 
     def assign!
@@ -101,6 +104,10 @@ module Effective
       EffectiveMemberships.Registrar.remove!(owner)
     end
 
+    def assign_attributes(atts)
+      super(atts.reject { |k, _| k.to_s.start_with?('status_remove_action_') })
+    end
+
     def update!(atts)
       assign_attributes(atts); save!
     end
@@ -121,8 +128,6 @@ module Effective
       @owner_id || (@owner.id if @owner)
     end
 
-    private
-
     def category
       EffectiveMemberships.Category.find(@category_id) if @category_id.present?
     end

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

@@ -3,6 +3,7 @@
     %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
 
@@ -13,29 +14,33 @@
         Change or remove a member's existing status.
 
       = f.static_field :current_action, label: 'Current Status' do
-        = (membership.status || 'None').to_s
+        = badges(membership.statuses) || 'None'
 
       = 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
+        - statuses = f.object.owner.registrar_action_statuses(:status_change)
+        - f.object.status_ids = membership.status_ids
+
+        = f.select :status_ids, statuses, label: 'Change status to', required: true, multiple: true
 
         %p No fees will be created
 
-        = f.submit 'Change Status', border: false, center: true, 'data-confirm': "Really change #{f.object.owner}?"
+        = f.submit 'Assign Status', border: false, center: true, 'data-confirm': "Really assign #{f.object.owner} status?"
+
+      - # Remove Actions
+      - membership.statuses.each do |status|
+        = f.check_box "status_remove_action_#{status.id}", label: "Yes, remove #{status} status"
 
-      - # Remove Action
-      - if membership.status.present?
-        = f.check_box :status_remove_action, label: "Yes, remove #{membership.status} status"
+        = f.show_if("status_remove_action_#{status.id}", true, validate: false) do
+          = f.hidden_field :status_id, value: status.id
 
-        = 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 This action will remove the #{badge(status)} status
 
           %p No fees will be created
 
-          = f.submit 'Remove Status', border: false, center: true, 'data-confirm': "Really remove status #{f.object.owner}?"
+          = f.submit "Remove Status", border: false, center: true, 'data-confirm': "Remove #{status} from #{f.object.owner}?"

data/db/seeds.rb

@@ -10,6 +10,8 @@ if Rails.env.test?
 end
 
 Effective::Status.where(title: 'Resigned').first_or_create!
+Effective::Status.where(title: 'Deceased').first_or_create!
+Effective::Status.where(title: 'On Leave').first_or_create!
 
 member = Effective::Category.create!(
   title: "Full Member",

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.6.6'
+  VERSION = '0.6.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails