effective_memberships 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d55b0a5c31e8f259614c649af1fe89e2d36cb412652dc6d5ac96f051a925a7ee
-  data.tar.gz: 3850e9a4d2ba175becb4e0f487bc041c726516d9462470ee6c464a19ece0d559
+  metadata.gz: 9f9d47f303cc8f5ebcf269093828d5369969b288673007f98fa7589bd92f3c78
+  data.tar.gz: 2b2c1d4f6b31e31cc3e45dfe05a6a6666935a542623b85c2a6072460f7969f96
 SHA512:
-  metadata.gz: d6b197509eb8ce44fd7b15230c8b55171eccf2b017017f6e38eb45917453abf96a210118fd25df35d962cf448efc3625db45f1dafe720da32c18d1ee68ab7569
-  data.tar.gz: 7c2e9ecd43439c7abf4a174ef1adae97938704a941e8338225b3905b38fb0e7d10aae5d075ce169b1140b77f193dc055349751569524163d5a301d65801848cf
+  metadata.gz: b7e4b227ffb1bf4798e8d87f7651a14c9d40ba0107c3a58501249380f66475e0ba883d46036958528b077d325722602c69bee535d2a7e90fd0e8714c31f94c07
+  data.tar.gz: 64007536a52a3ac533f5b69c122889b3fc804a908da5d7633e1a47bbae6c754cecdb36ea6568abfdefc174a55706134c0aa714c92910bf82154a901aea2730be

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -8,9 +8,15 @@ 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

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/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) {

data/app/views/effective/applicants/equivalences.html.haml

@@ -6,12 +6,15 @@
       %p You must include #{resource.min_applicant_equivalences} or more equivalent memberships.
 
     - if resource.min_applicant_equivalences == 0
-      %p Equivalent memberships are not required. Click the Remove button to skip adding memberships.
+      %p Equivalent memberships are not required.
+
+    - if resource.applicant_equivalences.blank?
+      %p Click Add Another to add an equivalent membership.
 
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
 
-      = f.has_many(:applicant_equivalences, cards: true) do |aef|
+      = f.has_many(:applicant_equivalences, cards: true, build: false) do |aef|
         %h4.mb-4 Equivalent Membership
 
         = aef.text_field :name

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.8.2'
+  VERSION = '0.8.4'
 end

metadata

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