effective_memberships 0.17.3 → 0.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 172faa35356355bd3a8d6f2bd51a4d1ec26cac9b58c617713b972096c32ec42d
-  data.tar.gz: fa370c75fcf09fd03134451dc3ffeefb3bd3b0b9032392fb4e9a17c364f810a0
+  metadata.gz: ef70771a4a2a9d5a9664b76dda457120845bd43ead1b684af0d71a8560331cb6
+  data.tar.gz: 585c057a19577bf1f5e4c6abca5e62fe7d55131090dcaa3f0839573b4e3a7bb0
 SHA512:
-  metadata.gz: 1853d32c2a951cc21b34ee224007bed5ca1af849027f3ac398cd99a77c9397e4cc8cce59ba7e26c23ffd4cb006676933a7a208a95b2c55a9f3b48ff0b6218db8
-  data.tar.gz: a5a8f725ca25361aa8424108fc59c4aff507367a895c0f99f94ecdbce30117a6d77049facf8ba255fdacef68a555c5c87172f8c72ca1bc1304f4183fe66362f2
+  metadata.gz: 5f0e3096d63739c7d5e9e4de4c82c5876e8f2b70bd9ce297c23aa71fc54a302d19c7c31c3ba9e64bd53469d1e7e7f44f4afb8bf0529125bc3d9da58b6092852c
+  data.tar.gz: d1b95965cc3993a43f94273802aa8f7199d5107508be1858217a28644ab0fa3df48c003bd47352eef38be325ab1713398de15b2871de1d72f44ec98b526bbb85

data/app/models/concerns/effective_memberships_owner.rb

@@ -432,6 +432,13 @@ module EffectiveMembershipsOwner
     history
   end
 
+  def membership_category_start_on(category: :current)
+    category = membership&.categories&.first if category == :current
+    raise('expected a category') unless category.present?
+
+    membership_histories.find { |history| history.membership_category_ids.include?(category.id) }&.start_on || membership&.joined_on
+  end
+
   def membership_history_on(date)
     raise('expected a date') unless date.respond_to?(:strftime)
     membership_histories.find { |history| (history.start_on..history.end_on).cover?(date) } # Ruby 2.6 supports endless ranges

data/app/models/concerns/effective_memberships_registrar.rb

@@ -103,6 +103,7 @@ module EffectiveMembershipsRegistrar
   end
 
   # This is only used for a form collection on admin memberships
+  # And now for ASPB applicant reinstatement fees
   def periods(from:, to: nil)
     to ||= Time.zone.now
 

data/app/models/effective/membership_history.rb

@@ -69,5 +69,13 @@ module Effective
       assign_attributes(statuses: statuses.map(&:to_s), status_ids: statuses.map(&:id))
     end
 
+    def start_period
+      EffectiveMemberships.Registrar.period(date: start_on)
+    end
+
+    def end_period
+      EffectiveMemberships.Registrar.period(date: end_on)
+    end
+
   end
 end

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

@@ -10,8 +10,7 @@
     .row.mt-4
       - group.each do |membership|
         .col-md
-          - next unless membership
-          = render('effective/membership_directory/membership', membership: membership)
+          = render('effective/membership_directory/membership', membership: membership) if membership
 
   %nav.d-flex.justify-content-center
     = bootstrap_paginate(results, per_page: membership_directory.per_page)

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

@@ -1,26 +1,6 @@
 = render 'layout' do
   .effective-membership
-
-    %h6= @membership.owner
-    %p= @membership.categories.map(&:membership_directory_title).to_sentence
-    %p= @membership.statuses.map(&:membership_directory_title).to_sentence
-    %p= @membership.number
-
-    - if @membership.owner.respond_to?(:rich_text_body)
-      .mb-4= @membership.owner.rich_text_body.to_s
-
-    - if @membership.owner.try(:email).present?
-      %p= reveal_mail_to(@membership.owner.email)
-
-    - if (organizations = @membership.owner.try(:membership_organizations)).present?
-      .mb-4.membership-directory-organizations
-        - organizations.each do |organization|
-          %div= organization
-
-    - if (users = @membership.owner.try(:membership_users)).present?
-      .mb-4.membership-directory-users
-        - users.each do |user|
-          %div= user
+    = render('effective/membership_directory/membership', membership: @membership)
 
   %hr
   = link_to 'Return to Directory', effective_memberships.membership_directory_index_path, class: 'btn btn-primary'

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.17.3'
+  VERSION = '0.17.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.17.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -574,7 +574,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Manage your professional association online. Membership categories, applications