effective_memberships 0.17.8 → 0.17.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02b881930550198b6c2e18381683543910d16534b7766768661eb4f91cf96214
-  data.tar.gz: e30e3b80c39e484178561cd7aba32e4157c735d831afb80ca16758ca748c9479
+  metadata.gz: 1ce6118d2ee3305019612e18f63990abffeca7345b0f55b420a500b76f3fcb1c
+  data.tar.gz: cc0dd908ae8d05fd5f53038b67be0744cf045edf76f613fccc5f5d4d889db44f
 SHA512:
-  metadata.gz: 95040d97dfc5aadc8816a2fb6cc2111336306df360a05622386a9db87848a12921449970c9f8f63b5a4ffdd5e54b6a5cced0b7c4cef59e188c850f6ded76dc59
-  data.tar.gz: 15fc30fe1419f2c9443e19d07620b63180195995472b5fb86040ac4d1e46eadc906ff07b70fb3356b1c42ace9870e523c3afaf0cbd62b41724208e22e1b1c3c4
+  metadata.gz: 889c672b4c30ff42b47faa11f0dbe5bd1e1c4e816eeaa100798482f01fca5f06dc3565ef63fed7c86a26bf4f929d4e5895865c5f4b0f76646fa20e0cec4ea3f3
+  data.tar.gz: bfc6d2f12222988da2b3017ca52315da6580279da29ff1a02d887e2b0b55a270c1928d43a4e7dbd84dd037dc3670c2766b2b37bd1847ef7666c4f6f4b83cd48a

data/app/models/concerns/effective_memberships_applicant.rb

@@ -192,7 +192,7 @@ module EffectiveMembershipsApplicant
 
     # effective_reports
     def reportable_scopes
-      { draft: nil, submitted: nil, in_progress: nil, done: nil }
+      { draft: nil, submitted: nil, missing_info: nil, completed: nil, reviewed: nil, declined: nil, approved: nil, in_progress: nil, done: nil }
     end
 
     scope :deep, -> { includes(:user, :organization, :category, :from_category, :from_status, :orders) }
@@ -202,7 +202,6 @@ module EffectiveMembershipsApplicant
     scope :done, -> { where(status: [:approved, :declined]) }
 
     scope :not_draft, -> { where.not(status: :draft) }
-
     scope :reviewable, -> { where.not(status: [:draft, :submitted, :declined, :approved]) }
 
     scope :for, -> (user) {

data/app/models/concerns/effective_memberships_applicant_review.rb

@@ -29,6 +29,7 @@ module EffectiveMembershipsApplicantReview
 
   included do
     log_changes(to: :applicant) if respond_to?(:log_changes)
+    acts_as_reportable if respond_to?(:acts_as_reportable)
 
     acts_as_tokened
 
@@ -59,6 +60,15 @@ module EffectiveMembershipsApplicantReview
       timestamps
     end
 
+    # effective_reports
+    def reportable_scopes
+      { in_progress: nil, done: nil }
+    end
+
+    def reportable_email
+      reviewer.try(:email)
+    end
+
     scope :deep, -> { includes(:reviewer, applicant: [:user, :applicant_reviews]) }
 
     scope :for, -> (user) {

data/app/models/effective/applicant_reference.rb

@@ -11,6 +11,7 @@ module Effective
     )
 
     log_changes(to: :applicant) if respond_to?(:log_changes)
+    acts_as_reportable if respond_to?(:acts_as_reportable)
 
     belongs_to :applicant, polymorphic: true, optional: true
 
@@ -52,6 +53,20 @@ module Effective
       timestamps
     end
 
+    # effective_reports
+    def reportable_scopes
+      { in_progress: nil, done: nil, expired: nil }
+    end
+
+    scope :in_progress, -> { with_submitted_applicants.where(status: :submitted) }
+    scope :done, -> { where(status: :completed) }
+
+    scope :expired, -> { where(status: :submitted).where.not(with_submitted_applicants) }
+
+    scope :with_submitted_applicants, -> {
+      where(applicant_id: EffectiveMemberships.Applicant.submitted)
+    }
+
     scope :deep, -> { all }
 
     # All step validations

data/app/models/effective/membership.rb

@@ -11,6 +11,7 @@ module Effective
     has_many :membership_statuses, -> { order(:id) }, inverse_of: :membership, dependent: :delete_all
     accepts_nested_attributes_for :membership_statuses
 
+    acts_as_reportable if respond_to?(:acts_as_reportable)
     log_changes(to: :owner) if respond_to?(:log_changes)
 
     effective_resource do
@@ -35,7 +36,23 @@ module Effective
     scope :deep, -> { includes(:owner, membership_categories: :category, membership_statuses: :status) }
     scope :sorted, -> { order('lower(owner_name)') }
 
+    # effective_reports
+    def reportable_scopes
+      {
+        with_category: :string,
+        with_status: :string,
+        joined_before: :date,
+        joined_after: :date,
+        with_paid_fees_through: :date,
+        with_unpaid_fees_through: :date,
+        in_good_standing: nil,
+        not_in_good_standing: nil
+      }
+    end
+
     scope :with_status, -> (statuses) {
+      statuses = Resource.new(EffectiveMemberships.Status).search_any(statuses) if statuses.kind_of?(String)
+
       raise('expected an EffectiveMemberships.Status') unless statuses.class.respond_to?(:effective_memberships_status?) || Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
       where(id: MembershipStatus.where(status_id: statuses).select(:membership_id))
     }
@@ -46,6 +63,8 @@ module Effective
     }
 
     scope :with_category, -> (categories) {
+      categories = Resource.new(EffectiveMemberships.Category).search_any(categories) if categories.kind_of?(String)
+
       raise('expected an EffectiveMemberships.Category') unless categories.class.respond_to?(:effective_memberships_category?) || Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
       where(id: MembershipCategory.where(category_id: categories).select(:membership_id))
     }

data/app/models/effective/membership_history.rb

@@ -2,6 +2,8 @@ module Effective
   class MembershipHistory < ActiveRecord::Base
     belongs_to :owner, polymorphic: true
 
+    acts_as_reportable if respond_to?(:acts_as_reportable)
+
     effective_resource do
       start_on        :date
       end_on          :date
@@ -13,6 +15,9 @@ module Effective
       categories      :text
       category_ids    :text
 
+      statuses        :text
+      status_ids      :text
+
       notes           :text
 
       timestamps
@@ -27,9 +32,15 @@ module Effective
     serialize :statuses, Array
     serialize :status_ids, Array
 
+    # effective_reports
+    def reportable_scopes
+      { removed: nil, not_removed: nil }
+    end
+
     scope :deep, -> { includes(:owner) }
     scope :sorted, -> { order(:start_on).order(:id) }
 
+    scope :not_removed, -> { where(removed: false) }
     scope :removed, -> { where(removed: true) }
 
     validates :owner, presence: true

data/app/views/admin/applicants/_form_approve.html.haml

@@ -5,14 +5,14 @@
     %p The #{applicant} will be <strong>approved</strong>
     %p Their membership will be removed and they will be marked as resigned.
 
-  - elsif f.object.reinstatement?
+  - elsif f.object.reinstatement? && applicant.owner.reinstatement_membership_history.present?
     - reinstatement = applicant.owner.reinstatement_membership_history
 
     %p The #{applicant} will be <strong>approved</strong>
     %p Their membership will be reinstated and they will regain the following category, number and status:
 
     %ul
-      %li Category: #{reinstatement.membership_categories.to_sentence}
+      %li Category: #{reinstatement.membership_categories.try(:to_sentence)}
       %li Number: #{reinstatement.number}
       %li Status: #{badges(reinstatement.membership_statuses).presence || 'None'}
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.17.8'
+  VERSION = '0.17.10'
 end

metadata

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