effective_memberships 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3936f6e8acaea0e3aea19acfb6ab2919eed75cf533997d7d3ceb9423acb67c1
-  data.tar.gz: d23bdf6c67f07b6d0558a4f03e40237b6a93a2a55603e9d534d4a9d63464f182
+  metadata.gz: 16aad89a828aaadb74afcdcfa17f49674b3ad9a44fb387c61c173feb875cf16b
+  data.tar.gz: dff6f1dd922e27485e915337f3646aa94de945686f4a3310a596c59f625d1ae2
 SHA512:
-  metadata.gz: 9245f8060285f526b024a616fe0125460fe59567140fd106c6f657f1504b9e5385157ef24f3e3ca5f1ca27ac78280929ee9ea87021ef1ad202bfd03d39d1d526
-  data.tar.gz: 76586e73e7f04ff55343be3012169d5afb6b8fe3265279b46aab16c9f32f6798b7582282fe63bef73cc37278376538ac004b3a21691b4a0da932270786e22664
+  metadata.gz: 80d38ebb32070e8cf15314d1e51d35f37f54482c548d2e4d9e2ae7125e93148b3bffbfac913ba4069fdf172b37a03ed75a8764e5799ba6d4ae2719164ad16d8b
+  data.tar.gz: 7a3637bf9aeb9a36097f19cafd6b03b61019c60b373e10e68f182cb351175c44e58a6fa439d0c101ed8cf5c212f088121b524f0a28608b5c3d2588253ed9078d

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -8,15 +8,21 @@ module Admin
       col :owner_id, visible: false
       col :owner_type, visible: false
 
-      val :owner
-      col :categories, search: EffectiveMemberships.Category.sorted.map(&:to_s)
-      col :statuses, search: EffectiveMemberships.Status.sorted.map(&:to_s)
+      col :owner
+
+      col(:categories, search: EffectiveMemberships.Category.sorted, sql_column: true, sort: false).search do |collection, term|
+        collection.with_category(EffectiveMemberships.Category.find(term))
+      end
+
+      col(:statuses, search: EffectiveMemberships.Status.sorted, sql_column: true, sort: false).search do |collection, term|
+        collection.with_status(EffectiveMemberships.Status.find(term))
+      end
 
       col :number
       col :number_as_integer, visible: false
 
       col :joined_on
-      col :registration_on
+      col :registration_on, label: 'Last changed'
 
       col :fees_paid_period, visible: false, label: 'Fees Paid'
       col :fees_paid_through_period, label: 'Fees Paid Through'

data/app/models/concerns/effective_memberships_category.rb

@@ -157,6 +157,10 @@ module EffectiveMembershipsCategory
     title.presence || 'New Membership Category'
   end
 
+  def membership_directory_title
+    to_s
+  end
+
   def can_apply?
     can_apply_new? || can_apply_existing? || can_apply_restricted?
   end

data/app/models/concerns/effective_memberships_owner.rb

@@ -342,7 +342,7 @@ module EffectiveMembershipsOwner
 
     # Check that there is a membership history row if the registered date is unique
     if membership.joined_on != membership.registration_on && membership_histories.none? { |mh| mh.start_on == membership.registration_on }
-      errors << "The registered date #{membership.registration_on.strftime('%F')} is missing a history with this date. Please create a history with a start date of #{membership.registration_on.strftime('%F')} or update the registered date above."
+      errors << "The last changed date #{membership.registration_on.strftime('%F')} is missing a history with this date. Please create a history with a start date of #{membership.registration_on.strftime('%F')} or update the last changed date above."
     end
 
     # Check numbers

data/app/models/concerns/effective_memberships_registrar.rb

@@ -99,6 +99,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

data/app/models/concerns/effective_memberships_status.rb

@@ -60,6 +60,10 @@ module EffectiveMembershipsStatus
     title.presence || 'New Membership Status'
   end
 
+  def membership_directory_title
+    to_s
+  end
+
   def individual?
     status_type == 'Individual'
   end

data/app/models/effective/membership.rb

@@ -27,7 +27,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:owner, membership_categories: :category) }
+    scope :deep, -> { includes(:owner, membership_categories: :category, membership_statuses: :status) }
     scope :sorted, -> { order(:id) }
 
     scope :with_status, -> (statuses) {
@@ -116,7 +116,7 @@ module Effective
         'member',
         ("##{number_was}" if number_was.present?),
         "who joined #{joined_on&.strftime('%F') || '-'}",
-        ("and last registered #{registration_on.strftime('%F')}" if registration_on > joined_on)
+        ("and last changed on #{registration_on.strftime('%F')}" if registration_on > joined_on)
       ].compact.join(' ')
 
       (summary + '.').html_safe

data/app/views/admin/memberships/_form_membership.html.haml

@@ -14,7 +14,7 @@
 
   = f.show_if :current_action, true do
     = f.date_field :joined_on, label: 'Joined', hint: 'When the member first received any membership category'
-    = f.date_field :registration_on, label: 'Registered', hint: 'When the membership category last changed'
+    = f.date_field :registration_on, label: 'Last changed', hint: 'When the membership category or status last changed'
     = f.text_field :number, hint: 'The membership number. Must be unique.'
 
     - registrar = EffectiveMemberships.Registrar

data/app/views/effective/membership_directory/_membership_owner.html.haml

@@ -1,4 +1,7 @@
 = card do
   %h6= owner
-  %p= membership.categories.to_sentence
-  %p= membership.statuses.to_sentence
+  %p= membership.categories.map(&:membership_directory_title).to_sentence
+  %p= membership.statuses.map(&:membership_directory_title).to_sentence
+
+  - if owner.try(:email).present?
+    %p= reveal_mail_to(owner.email)

data/app/views/effective/memberships/_dashboard.html.haml

@@ -28,7 +28,7 @@
     %p You joined on #{membership.joined_on.strftime('%F')} and have not been assigned a membership number.
 
   - if membership.registration_on > membership.joined_on
-    %p You last changed categories on #{membership.registration_on.strftime('%F')}.
+    %p Your last category or status change was on #{membership.registration_on.strftime('%F')}.
 
   - if membership.not_in_good_standing?
     %p Your membership is Not In Good Standing because of unpurchased fees or dues. Please purchase these dues or contact us.

data/app/views/effective/memberships/_membership.html.haml

@@ -5,7 +5,7 @@
       %td= membership.joined_on.strftime('%F')
 
     %tr
-      %th Registered
+      %th Last Changed
       %td= membership.registration_on.strftime('%F')
 
     - if membership.categories.length == 0

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.8.3'
+  VERSION = '0.8.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails