effective_memberships 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b47c4f81099d5e4078814e9f04765ae8b2790ac3fe19ff0a0f5442e9e5f6475
-  data.tar.gz: 727b05c16923003822a9383d3cd3b8f582655cae1e769df98de0245bdd0dedd7
+  metadata.gz: '017428f74b7a9dd16e4d16a8a256ca2cbf510252266908134034cc56eb651c42'
+  data.tar.gz: be01e2eb2f76608ae46b1cfbed55225c3e32f035345e32912db4fcba901da1c4
 SHA512:
-  metadata.gz: fc8454e6c624109974f4f6bbcb65a92a892a9a19ed72565fdc53414017d03a30de766b1609fff6b4dca89a3f93c8800502ba4841032860bf3733fedc9b01da56
-  data.tar.gz: 0db5f5f98ea6271c36fd09c2cd32a3f757ef55ca7cda4f2be130e12f0162aaa6474993062247ef02cdca3dfb1da4df1cc54dc5a3e32f91cf49c412a351de30db
+  metadata.gz: 84ccc24c2f09182b1288da31693dde5500478aa4eb9ba3fe58320a12fd85e113df9eaa7b7e954cf39fad473377ea72d855d2e959f89fdc7c5746f4314bdf9258
+  data.tar.gz: 15e78208b04cc08f90f09056b7fb5a5df92b3b1b55255734751501ca9fe3a2572ddf5448bf5f09139ee0c6b08f133451ed19a2232d8d3cbe5954ddcfddc20102

data/app/controllers/admin/registrar_actions_controller.rb

@@ -14,6 +14,10 @@ module Admin
       success: -> { "#{resource.owner} has been reclassified to #{resource.owner.membership.category}" },
       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) }
+
     submit :remove, 'Remove',
       success: -> { "#{resource.owner} has been removed" },
       redirect: -> { admin_owners_path(resource) }

data/app/datatables/admin/effective_membership_histories_datatable.rb

@@ -14,7 +14,15 @@ module Admin
 
       col :number
 
-      col :categories, label: 'Category'
+      col :categories, label: 'Category' do |history|
+        history.categories.map.with_index do |category, index|
+          category_id = history.category_ids[index]
+          link = link_to(category, effective_memberships.edit_admin_category_path(category_id))
+
+          content_tag(:div, link, class: 'col-resource_item')
+        end.join.html_safe
+      end
+
       col :category_ids, visible: false
 
       col :bad_standing

data/app/models/concerns/effective_memberships_owner.rb

@@ -103,6 +103,10 @@ module EffectiveMembershipsOwner
     membership_histories.find { |history| history.removed? }.start_on
   end
 
+  def registrar_action_categories(action)
+    EffectiveMemberships.Category.sorted.all
+  end
+
   # Instance Methods
   def additional_fee_attributes(fee)
     raise('expected an Effective::Fee') unless fee.kind_of?(Effective::Fee)

data/app/models/effective/registrar_action.rb

@@ -17,6 +17,9 @@ module Effective
     attr_accessor :membership_number
     attr_accessor :skip_fees
 
+    # Assign
+    attr_accessor :category_ids
+
     # All Action Validations
     validates :current_action, presence: true
     validates :current_user, presence: true
@@ -29,10 +32,27 @@ module Effective
     validates :category_id, presence: true,
       if: -> { current_action == :reclassify || current_action == :register }
 
+    validates :category_ids, presence: true, if: -> { current_action == :assign }
+
     def to_s
       'action'
     end
 
+    def register!
+      update!(current_action: :register)
+      EffectiveMemberships.Registrar.register!(owner, to: category, number: membership_number.presence, skip_fees: skip_fees?)
+    end
+
+    def reclassify!
+      update!(current_action: :reclassify)
+      EffectiveMemberships.Registrar.reclassify!(owner, to: category, skip_fees: skip_fees?)
+    end
+
+    def assign!
+      update!(current_action: :assign)
+      EffectiveMemberships.Registrar.assign!(owner, categories: categories, number: membership_number.presence)
+    end
+
     def good_standing!
       update!(current_action: :good_standing)
       EffectiveMemberships.Registrar.good_standing!(owner)
@@ -43,11 +63,6 @@ module Effective
       EffectiveMemberships.Registrar.bad_standing!(owner, reason: bad_standing_reason)
     end
 
-    def reclassify!
-      update!(current_action: :reclassify)
-      EffectiveMemberships.Registrar.reclassify!(owner, to: category, skip_fees: skip_fees?)
-    end
-
     def fees_paid!
       update!(current_action: :fees_paid)
       EffectiveMemberships.Registrar.fees_paid!(owner)
@@ -58,11 +73,6 @@ module Effective
       EffectiveMemberships.Registrar.remove!(owner)
     end
 
-    def register!
-      update!(current_action: :register)
-      EffectiveMemberships.Registrar.register!(owner, to: category, number: membership_number.presence, skip_fees: skip_fees?)
-    end
-
     def update!(atts)
       assign_attributes(atts); save!
     end
@@ -89,6 +99,10 @@ module Effective
       EffectiveMemberships.Category.find(@category_id) if @category_id
     end
 
+    def categories
+      EffectiveMemberships.Category.where(id: @category_ids) if @category_ids
+    end
+
     def skip_fees?
       EffectiveResources.truthy?(@skip_fees)
     end

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

@@ -0,0 +1,34 @@
+.card
+  .card-body
+    %h5.card-title Assign
+
+    = 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
+
+      %p.text-muted
+        Assign to one or more categories.
+
+      = 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.blank?
+          None
+
+      = f.check_box :current_action, label: 'Yes, assign this member to categories'
+
+      = 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 membership.present?
+          %p The member will keep their existing membership number: #{membership.number}.
+        - else
+          = f.text_field :membership_number, hint: "leave blank to assign the next number"
+
+        %p No fees will be created
+
+        = f.submit 'Assign', border: false, center: true, 'data-confirm': "Really assign #{f.object.owner}?"

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

@@ -9,13 +9,14 @@
       - membership = f.object.owner.membership
 
       - period = EffectiveMemberships.Registrar.current_period
-      - date = EffectiveMemberships.Registrar.bad_standing_date(period: period)
+      - date = (EffectiveMemberships.Registrar.bad_standing_date(period: period) rescue false)
 
       %p.text-muted
-        Members with outstanding renewal fees are automatically marked
-        not in good standing on #{date.strftime('%B %d')}.
-        The status is cleared when they pay their fees.
-        You can also mark a member as always not in good standing.
+        - if date.present?
+          Members with outstanding renewal fees are automatically marked
+          not in good standing on #{date.strftime('%B %d')}.
+          The status is cleared when they pay their fees.
+          You can also mark a member as always in bad standing.
 
       = f.static_field :current_action, label: 'Current Status' do
 

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

@@ -7,9 +7,7 @@
       = f.hidden_field :owner_type
 
       - membership = f.object.owner.membership
-
       - period = EffectiveMemberships.Registrar.current_period
-      - date = EffectiveMemberships.Registrar.bad_standing_date(period: period)
 
       %p.text-muted
         Change a member's existing category and optionally create fees.
@@ -22,7 +20,8 @@
       = f.show_if :current_action, true do
         %p The member will keep their existing membership number: #{membership.number}.
 
-        - categories = EffectiveMemberships.Category.all.where.not(id: membership.category_id)
+        - categories = f.object.owner.registrar_action_categories(:reclassify) - membership.categories
+
         = f.select :category_id, categories, label: 'Reclassify to', required: true
 
         = f.check_box :skip_fees, label: 'Yes, skip creating fees and just set the category'

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

@@ -17,7 +17,7 @@
       = f.check_box :current_action, label: 'Yes, register to a membership'
 
       = f.show_if :current_action, true do
-        - categories = EffectiveMemberships.Category.all
+        - categories = f.object.owner.registrar_action_categories(:register)
         = f.select :category_id, categories, label: 'Register to'
 
         = f.text_field :membership_number, hint: "leave blank to assign the next number"

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -282,6 +282,7 @@ files:
 - app/views/admin/fees/_form.html.haml
 - app/views/admin/memberships/_status.html.haml
 - app/views/admin/registrar_actions/_form.html.haml
+- app/views/admin/registrar_actions/_form_assign.html.haml
 - app/views/admin/registrar_actions/_form_bad_standing.html.haml
 - app/views/admin/registrar_actions/_form_fees_paid.html.haml
 - app/views/admin/registrar_actions/_form_reclassify.html.haml