effective_mentorships 0.3.7 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683fa787d733db8ba81c4826d39621c2138ddb7e742449ca5ffa6b59548dd7a4
-  data.tar.gz: f5f48039a10ecc2bb12739218eded5501cc0d8b15dd3e984035b8c08409d1a12
+  metadata.gz: d44aadbbf12084b545f6f33ebb05f58b83cb8dbb8fc8f8d74bf3366aeb0a0c7e
+  data.tar.gz: df11f3c39ff546de09a7fcb27dfbd79950102f38cc7801fba57526a2b4a55462
 SHA512:
-  metadata.gz: a23dcd55f980831229066dc7788dfa165c6e835a141aa200dd2b840843971f79e0cac17dba5501b3cee0267bdb72f6ecd692afac06078f2362f82a996ed7e53e
-  data.tar.gz: f6e30fac5aa08b3198ef62988fd211647c98a9d5ff1ce7dde7f3db2ab151eb71ba275868297b12ce66470f5a8fccfc54376e018e2669c2c3f403e1eb29d69f2d
+  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/config/effective_mentorships.rb

@@ -1,10 +1,7 @@
 EffectiveMentorships.setup do |config|
   # Layout Settings
   # Configure the Layout per controller, or all at once
-  config.layout = {
-    mentorships: 'application',
-    admin: 'admin'
-  }
+  # config.layout = { mentorships: 'application', admin: 'admin' }
 
   # Mentorship Class Settings
   # Configure the class responsible for the mentorships

data/lib/effective_mentorships/version.rb

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

data/lib/effective_mentorships.rb

@@ -21,15 +21,15 @@ module EffectiveMentorships
   end
 
   def self.MentorshipBulkGroup
-    mentorship_bulk_group_class_name&.constantize || Effective::MentorshipBulkGroup
+    klass(:mentorship_bulk_group)
   end
 
   def self.MentorshipGroup
-    mentorship_group_class_name&.constantize || Effective::MentorshipGroup
+    klass(:mentorship_group)
   end
 
   def self.MentorshipRegistration
-    mentorship_registration_class_name&.constantize || Effective::MentorshipRegistration
+    klass(:mentorship_registration)
   end
 
   def self.MentorshipCycle

metadata

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