effective_mentorships 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 171010bae5f93974f5ba6044bd82f880f2b552bd913c7ca0137122b362859262
-  data.tar.gz: cffbb49649eff6aba7a73456241ef7a8e86e3521225144230534bdbba6955b31
+  metadata.gz: f5d908c2df40071246bda994a3d01f59dd7ffe19d8d049a49c2b919c27f1da5f
+  data.tar.gz: 8711f45d78bf283c55925e4e407e83d9980426339d704f7c71e8df410921bd05
 SHA512:
-  metadata.gz: e6e1290b4d9b47a3518db1d17e22cb003ffe6bb1e5fdb5e3453671c2fe006b4d0c32f239f6df299b88932b2f30884c9a2e5e24a21c78282effa16ef805784d9b
-  data.tar.gz: 599848b64d0f1c77f2141a6de91d748443c9f00c18531fb2c27c0e9fa86236e92280842394013da0d41b37e1578addaab5162f23fde71ab485430900568be1ab
+  metadata.gz: 90da1bb4d514e38e396f06cbd1cc621cdd9576cb390e2b8af151b49a71dbd500db3ccc2ebf4e08acab60f01412c4ed982ccf696f239d33da8981677725a73638
+  data.tar.gz: 4dcbfa64d08ccc64903eedd2f585310a3301ff13376d60dd83472afeaac7a26d89807936b98301e44ed6601c4382a23b1ee4c2fbc59bcdd2f73964852fccc0b0

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

@@ -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/admin/mentorship_cycles/_form_mentorship_cycle.html.haml

@@ -27,15 +27,19 @@
   %h2 Content
 
   - if defined?(EffectiveArticleEditor)
-    = f.article_editor :rich_text_registration_content, label: "#{mentorship_registration_label} opt-in content", hint: "Will be displayed to the user when registering for this #{mentorship_cycle_label.downcase}"
+    = f.article_editor :rich_text_registration_content, label: "#{mentorship_registration_label} opt-in content", hint: "Will be displayed to the user when registering for this #{mentorship_cycle_label.downcase}."
   - else
-    = f.rich_text_area :rich_text_registration_content, label: "#{mentorship_registration_label} opt-in content", hint: "Will be displayed to the user when registering for this #{mentorship_cycle_label.downcase}"
+    = f.rich_text_area :rich_text_registration_content, label: "#{mentorship_registration_label} opt-in content", hint: "Will be displayed to the user when registering for this #{mentorship_cycle_label.downcase}."
 
   - if defined?(EffectiveArticleEditor)
-    = f.article_editor :rich_text_group_content, label: "#{mentorship_group_label} content", hint: "Will be displayed to the user when viewing their #{mentorship_group_label.downcase} for this #{mentorship_cycle_label.downcase}"
+    = f.article_editor :rich_text_agreement_content, label: "#{mentorship_registration_label} agreement", hint: "Will be displayed to the user above a checkbox to accept."
   - else
-    = f.rich_text_area :rich_text_group_content, label: "#{mentorship_group_label} opt-in content", hint: "Will be displayed to the user when viewing their #{mentorship_group_label.downcase} for this #{mentorship_cycle_label.downcase}"
+    = f.rich_text_area :rich_text_agreement_content, label: "#{mentorship_registration_label}  agreement", hint: "Will be displayed to the user above a checkbox to accept."
 
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :rich_text_group_content, label: "#{mentorship_group_label} content", hint: "Will be displayed to the user when viewing their #{mentorship_group_label.downcase} for this #{mentorship_cycle_label.downcase}."
+  - else
+    = f.rich_text_area :rich_text_group_content, label: "#{mentorship_group_label} opt-in content", hint: "Will be displayed to the user when viewing their #{mentorship_group_label.downcase} for this #{mentorship_cycle_label.downcase} and after opt-in."
 
   = f.submit do
     = f.save 'Save'

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

@@ -1,6 +1,9 @@
 - unless local_assigns[:namespace] == :admin
   = f.hidden_field :mentorship_cycle_id
 
+- if f.object.mentorship_cycle.rich_text_registration_content.present?
+  = f.object.mentorship_cycle.rich_text_registration_content
+
 = 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
@@ -13,8 +16,9 @@
   = f.select :location, f.object.class.locations(), required: 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
+  - if f.object.mentorship_cycle.rich_text_agreement_content.present?
+    = card do
+      = f.object.mentorship_cycle.rich_text_agreement_content
 
   = f.check_box :accept_declaration, label: "Yes, I accept the #{et('effective_mentorships.name')} agreement", required: true
 

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

@@ -3,9 +3,14 @@
 
 - url = (mentorship_registration.persisted? ? effective_mentorships.mentorship_cycle_mentorship_registration_path(mentorship_cycle, mentorship_registration) : effective_mentorships.mentorship_cycle_mentorship_registrations_path(mentorship_cycle, mentorship_registration))
 
-= card do
-  %h2= et('effective_mentorships.name')
+%h1= et('effective_mentorships.name')
+
+- if mentorship_registration.persisted?
+  - if mentorship_registration.mentorship_cycle.rich_text_group_content.present?
+    = card do
+      = mentorship_registration.mentorship_cycle.rich_text_group_content
 
+= card do
   = 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/lib/effective_mentorships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMentorships
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

metadata

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