effective_mentorships 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 984cc756545d2cc193f9653d63ab849aa43b33589b0de88021fa8b554102a6b2
-  data.tar.gz: 3765acfee28560392a86fe6c7f3b4931fee360f8ae0383903f4b1cf842ed7700
+  metadata.gz: d44aadbbf12084b545f6f33ebb05f58b83cb8dbb8fc8f8d74bf3366aeb0a0c7e
+  data.tar.gz: df11f3c39ff546de09a7fcb27dfbd79950102f38cc7801fba57526a2b4a55462
 SHA512:
-  metadata.gz: 96b76f61df6424149c0eb481136d6dde98c05568fd429dc015a6635513e994aef55e272ca63be3ca84167ac7c1d209e4a59c1f8484d7f0645e51c8d8c70633db
-  data.tar.gz: a2be31e21892907cb7448fe8440e93f4da8884bb58730280b5cdfb64aead064a3e107bb15f84cb2e3e1ac9bd011ebe5706b90fda2bb627cf00e6eab2ee523330
+  metadata.gz: 3ed82bb50811e0f2e264f5524c224e0571a6c94eb12b654819151731562696aef9e34f81b932bb10e3aa7fd330f9217bf413de9561b67957457231f954ff0ba7
+  data.tar.gz: 8460ecc93151220f06b4265b745fae908b4ea61b479275b4a5ded946880a2d461b1929b2c0526b0329f1aac54f203125506aad47b6393fadb58bc08851d16b51

data/app/datatables/admin/effective_mentorship_bulk_group_mentees_datatable.rb

@@ -13,11 +13,11 @@ module Admin
       col 'user.last_name', visible: false
       col 'user.email', visible: false
 
-      if defined?(EffectiveMemberships)
+      if defined?(EffectiveMemberships) && EffectiveMemberships.Membership
         col(:member_number, label: 'Member #', sort: false, visible: false) do |registration|
         registration.user.try(:membership).try(:number)
         end.search do |collection, term|
-          memberships = Effective::Membership.where(owner_type: current_user.class.name).where('number ILIKE ?', "%#{term}%")
+          memberships = EffectiveMemberships.Membership.where(owner_type: current_user.class.name).where('number ILIKE ?', "%#{term}%")
           collection.where(user_id: memberships.select('owner_id'))
         end
 
@@ -26,7 +26,7 @@ module Admin
             content_tag(:div, membership_category, class: 'col-resource')
           end.join.html_safe
         end.search do |collection, term|
-          memberships = Effective::Membership.where(owner_type: current_user.class.name).with_category(term)
+          memberships = EffectiveMemberships.Membership.where(owner_type: current_user.class.name).with_category(term)
           collection.where(user_id: memberships.select('owner_id'))
         end
 
@@ -35,7 +35,7 @@ module Admin
             content_tag(:div, status, class: 'col-resource')
           end.join.html_safe
         end.search do |collection, term|
-          memberships = Effective::Membership.where(owner_type: current_user.class.name).with_status(term)
+          memberships = EffectiveMemberships.Membership.where(owner_type: current_user.class.name).with_status(term)
           collection.where(user_id: memberships.select('owner_id'))
         end
       end

data/app/datatables/admin/effective_mentorship_bulk_group_mentors_datatable.rb

@@ -13,11 +13,11 @@ module Admin
       col 'user.last_name', visible: false
       col 'user.email', visible: false
 
-      if defined?(EffectiveMemberships)
+      if defined?(EffectiveMemberships) && EffectiveMemberships.Membership
         col(:member_number, label: 'Member #', sort: false, visible: false) do |registration|
         registration.user.try(:membership).try(:number)
         end.search do |collection, term|
-          memberships = Effective::Membership.where(owner_type: current_user.class.name).where('number ILIKE ?', "%#{term}%")
+          memberships = EffectiveMemberships.Membership.where(owner_type: current_user.class.name).where('number ILIKE ?', "%#{term}%")
           collection.where(user_id: memberships.select('owner_id'))
         end
 
@@ -26,7 +26,7 @@ module Admin
             content_tag(:div, membership_category, class: 'col-resource')
           end.join.html_safe
         end.search do |collection, term|
-          memberships = Effective::Membership.where(owner_type: current_user.class.name).with_category(term)
+          memberships = EffectiveMemberships.Membership.where(owner_type: current_user.class.name).with_category(term)
           collection.where(user_id: memberships.select('owner_id'))
         end
 
@@ -35,7 +35,7 @@ module Admin
             content_tag(:div, status, class: 'col-resource')
           end.join.html_safe
         end.search do |collection, term|
-          memberships = Effective::Membership.where(owner_type: current_user.class.name).with_status(term)
+          memberships = EffectiveMemberships.Membership.where(owner_type: current_user.class.name).with_status(term)
           collection.where(user_id: memberships.select('owner_id'))
         end
       end

data/app/datatables/admin/effective_mentorship_group_users_datatable.rb

@@ -11,6 +11,9 @@ module Admin
       col :mentorship_group
       col :mentorship_role
       col :user
+      col :email do |registration|
+        registration.user.email
+      end
 
       actions_col
     end

data/app/datatables/admin/effective_mentorship_registrations_datatable.rb

@@ -4,6 +4,7 @@ module Admin
       scope :all
       scope :opt_in
       scope :opt_out
+      scope :opt_in_with_groups
       scope :opt_in_without_groups
     end
 
@@ -17,6 +18,9 @@ module Admin
 
       col :mentorship_cycle, search: :select
       col :user
+      col :email do |registration|
+        registration.user.email
+      end
 
       col :opt_in, visible: attributes[:opt_in_without_groups].blank?
 

data/app/models/concerns/effective_mentorships_registration.rb

@@ -96,27 +96,23 @@ module EffectiveMentorshipsRegistration
     scope :mentees, -> { where(mentorship_role: :mentee) }
     scope :opt_in, -> { where(opt_in: true) }
     scope :opt_out, -> { where(opt_in: false) }
+    scope :opt_in_with_groups, -> { opt_in.with_groups }
     scope :opt_in_without_groups, -> { opt_in.without_groups }
 
     scope :in_person, -> { where(venue: 'In-person') }
     scope :virtual, -> { where(venue: 'Virtual') }
     scope :either, -> { where(venue: 'Either') }
 
-    scope :with_groups, -> { 
-      group_users = Effective::MentorshipGroupUser.all
+    scope :with_groups, -> {
+      group_users = Effective::MentorshipGroupUser.where.not(mentorship_registration_id: nil)
       where(id: group_users.select(:mentorship_registration_id))
     }
 
     scope :without_groups, -> {
-      group_users = Effective::MentorshipGroupUser.all
+      group_users = Effective::MentorshipGroupUser.where.not(mentorship_registration_id: nil)
       where.not(id: group_users.select(:mentorship_registration_id))
     }
 
-    scope :with_groups, -> { 
-      group_users = Effective::MentorshipGroupUser.all
-      where(id: group_users.select(:mentorship_registration_id))
-    }
-
     scope :with_groups_from, -> (mentorship_bulk_group) { 
       groups = EffectiveMentorships.MentorshipGroup.where(mentorship_bulk_group: mentorship_bulk_group)
       group_users = Effective::MentorshipGroupUser.where(mentorship_group_id: groups.select(:mentorship_group_id))

data/lib/effective_mentorships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMentorships
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_mentorships
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Code and Effect