effective_mentorships 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af5b8d49906510d97169771e8f5985984e994bda968cabe721bb32a59ccf689b
-  data.tar.gz: 79c113198b921e58b0f1347765586681ff2a918286ddd323fda9a35261136139
+  metadata.gz: 569706e1dab213ee7cb6102a5242270b5b7586ffdb8d12ce5997635eb2e589dd
+  data.tar.gz: 28d54e0d12f669d3f376496c40605d00e979d29c981737416c17455e53ca0989
 SHA512:
-  metadata.gz: 7b84f6d4bfc332fdd2c03e71b5a88c02715447f08ecb458e729b16f17f556e686720e7fa8e6d682d9be3d24424417007ea09359b22a64ed77a88316b7baff11c
-  data.tar.gz: df7d47bbfffd6e6916012dacfee9339bb193fd716721be7c722949fbf84ebfd48d56dbccc363621b265bdb3ddb76b92066e9c468cb7f81e4f526cc046a7c1247
+  metadata.gz: 2372c9a3629dc4b2258309dc6b2353e930e3a2f804c9332a038154d2bbeca0189b76f79b52a5419c0d2216dcc4798ae2269c5b1d3eb08264e73dc679c9efc7aa
+  data.tar.gz: 58dd46785e9737b00690408040bdbdbbf04b194d0b34da1479647eb0aee8b4eed68a001f453c922c1acdbf7ae93d7147f018002633968564446839b7b7a18a07

data/app/datatables/admin/effective_mentorship_registrations_datatable.rb

@@ -26,7 +26,6 @@ module Admin
       col :category, search: EffectiveMentorships.MentorshipRegistration.categories
       col :venue, search: EffectiveMentorships.MentorshipRegistration.venues
       col :location, search: EffectiveMentorships.MentorshipRegistration.locations
-      col :mentor_multiple_mentees, visible: false
       col :mentor_multiple_mentees_limit, visible: false
 
       col :parent, visible: false

data/app/models/concerns/effective_mentorships_registration.rb

@@ -29,7 +29,7 @@ module EffectiveMentorshipsRegistration
     end
 
     def venues
-      ['virtual', 'in person', 'either']
+      ['Virtual', 'In-person', 'Either']
     end
   end
 
@@ -61,7 +61,6 @@ module EffectiveMentorshipsRegistration
       location           :string # Closest city of residence
 
       # Mentor only fields
-      mentor_multiple_mentees         :boolean
       mentor_multiple_mentees_limit   :integer
 
       # Mentee only fields
@@ -84,7 +83,7 @@ module EffectiveMentorshipsRegistration
       validates :accept_declaration, acceptance: true
     end
 
-    validates :mentor_multiple_mentees_limit, numericality: { greater_than: 0 }, if: -> { opt_in? && mentor_multiple_mentees? }
+    validates :mentor_multiple_mentees_limit, numericality: { greater_than: 0 }, if: -> { opt_in? && mentor? }
 
     scope :deep, -> { includes(:rich_texts, :user, :mentorship_cycle) }
     scope :sorted, -> { order(:id) }

data/app/views/effective/mentorship_registrations/_fields.html.haml

@@ -1,19 +1,20 @@
 - unless local_assigns[:namespace] == :admin
   = f.hidden_field :mentorship_cycle_id
 
-= f.radios :opt_in, :boolean, label: "Do you wish to register in the #{f.object.mentorship_cycle || et('effective_mentorships.name')}?", inline: true
+= f.radios :opt_in, :boolean, label: "Do you wish to register in the #{f.object.mentorship_cycle || et('effective_mentorships.name')}?"
 
 = f.hide_if(:opt_in, false) do
-  = f.radios :mentorship_role, mentorship_roles_collection(), label: "Register as", required: true, inline: true
+  = f.radios :mentorship_role, mentorship_roles_collection(), label: "Register as a:", required: true
 
   = f.show_if(:mentorship_role, 'mentor') do
-    = card(mentorships_mentor_label) do
-      = f.radios :mentor_multiple_mentees, :boolean, label: "Are you willing to #{mentorships_mentor_label.downcase} more than one #{mentorships_mentee_label.downcase}?", required: true, inline: true
-      = f.number_field :mentor_multiple_mentees_limit, label: "Please indicate how many #{mentorships_mentee_label.downcase.pluralize} you could accommodate", required: true
+    = f.radios :mentor_multiple_mentees_limit, [1, 2, 3, 4, 5], label: "How many #{mentorships_mentee_label.downcase.pluralize} are you willing to #{mentorships_mentor_label.downcase}?"
 
   = f.select :category, f.object.class.categories(), required: true
   = f.select :location, f.object.class.locations(), required: true
-  = f.radios :venue, f.object.class.venues(), required: true, inline: true
+  = f.radios :venue, f.object.class.venues(), required: true
+
+  - if mentorship_cycle.rich_text_registration_content.present?
+    .my-4= mentorship_cycle.rich_text_registration_content
 
   = f.check_box :accept_declaration, label: "Yes, I accept the #{et('effective_mentorships.name')} agreement", required: true
 
@@ -21,4 +22,3 @@
   = f.article_editor :rich_text_comments, label: "Comments"
 - else
   = f.rich_text_area :rich_text_comments, label: "Comments"
-

data/app/views/effective/mentorship_registrations/_form.html.haml

@@ -6,9 +6,6 @@
 = card do
   %h2= et('effective_mentorships.name')
 
-  - if mentorship_cycle.rich_text_registration_content.present?
-    .mt-4= mentorship_cycle.rich_text_registration_content
-
   = effective_form_with(model: mentorship_registration, url: url) do |f|
     = f.hidden_field :user_id, value: current_user.id
     = render('effective/mentorship_registrations/fields', f: f)

data/app/views/effective/mentorships/_dashboard.html.haml

@@ -6,21 +6,15 @@
 - if groups.present?
   %p You are a member of the following #{mentorship_groups_label.downcase}:
   = render_datatable(groups, simple: true)
-- else
-  %p You are not a member of any #{mentorship_groups_label.downcase}. When you are, we'll show them here.
-
-%hr
 
 -# Available Registrations
 - registered = EffectiveResources.best('EffectiveMentorshipsRegistrationsDatatable').new(self, namespace: :effective)
 - available = EffectiveResources.best('EffectiveMentorshipsAvailableCyclesDatatable').new(self, namespace: :effective)
 
 - if registered.present?
-  %p You have registered for the following #{etsd(Effective::MentorshipCycle)}:
   = render_datatable(registered, simple: true)
 
 - if available.present?
-  %p You can register for the following #{etsd(Effective::MentorshipCycle)}:
   = render_datatable(available, simple: true)
 
 - if available.blank? && registered.blank?

data/db/migrate/101_create_effective_mentorships.rb

@@ -59,7 +59,7 @@ class CreateEffectiveMentorships < ActiveRecord::Migration[6.0]
 
       t.string :title
 
-      t.boolean :opt_in
+      t.boolean :opt_in, default: false
       t.boolean :accept_declaration, default: false
 
       t.string :mentorship_role
@@ -68,7 +68,6 @@ class CreateEffectiveMentorships < ActiveRecord::Migration[6.0]
       t.string :venue
       t.string :location
 
-      t.boolean :mentor_multiple_mentees
       t.integer :mentor_multiple_mentees_limit
 
       t.string :token

data/lib/effective_mentorships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMentorships
-  VERSION = '0.1.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mentorships
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-22 00:00:00.000000000 Z
+date: 2024-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails