Merge pull request #250 from rubymonsters/coach_improvements

simaofreitas · web-flow · commit 90d6feca79fd · 2020-02-24T20:20:09.000+01:00
Change gender selection closes #242
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -17,6 +17,9 @@ Layout/HashAlignment:
 Naming/PredicateName:
   Enabled: false
 
+Style/MutableConstant:
+  Enabled: false
+
 Style/HashEachMethods:
   Enabled: false
 
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -219,6 +219,13 @@ input[type=submit].button_link {
   margin-top: 100px;
 }
 
+#info-for-coaches {
+  background-color: #e7f6fd;
+  text-align: center;
+  border: thin solid #1e64b4;
+  color: #1e64b4;
+}
+
 /*Table*/
 
 table {
diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb
@@ -71,7 +71,13 @@ def event_params
         :copy_templates_from_event_id,
         :confirmation_deadline,
         :reminder_date,
-        :coach_registration_enabled)
+        :coach_registration_enabled,
+        :coach_the_coaches_date,
+        :coach_the_coaches_start_time,
+        :coach_the_coaches_end_time,
+        :installation_get_together_date,
+        :installation_get_together_start_time,
+        :installation_get_together_end_time)
   end
 
   def send_selection_emails(applications)
diff --git a/app/controllers/coach_applications_controller.rb b/app/controllers/coach_applications_controller.rb
@@ -56,7 +56,7 @@ def find_coach_application
 
   def create_coach_application_params
     params.require(:coach_application).
-      permit(:installationparty, :workshopday, :lightningtalk, :notes, :first_time_coaching)
+      permit(:installationparty, :workshopday, :lightningtalk, :notes, :first_time_coaching, :coach_the_coaches, :sponsor)
   end
 
   def check_application_status
diff --git a/app/controllers/coaches_controller.rb b/app/controllers/coaches_controller.rb
@@ -36,7 +36,7 @@ def update
 
   def coach_params
     params.require(:coach).permit(:name,
-                                  :female,
+                                  :gender,
                                   :language_en,
                                   :language_de,
                                   :notifications,
diff --git a/app/helpers/coaches_helper.rb b/app/helpers/coaches_helper.rb
@@ -0,0 +1,7 @@
+module CoachesHelper
+  def genders_for_form
+    Coach::GENDERS.map do |gender|
+      [gender.to_s.humanize, gender]
+    end
+  end
+end
diff --git a/app/models/coach.rb b/app/models/coach.rb
@@ -1,4 +1,5 @@
 class Coach < ApplicationRecord
+  GENDERS = [:female, :male, :other, :prefer_not_to_say]
   belongs_to :user
   accepts_nested_attributes_for :user
   has_many :coach_applications
diff --git a/app/views/admin/coach_applications/index.html.erb b/app/views/admin/coach_applications/index.html.erb
@@ -10,7 +10,7 @@
       <th><%= link_to("Email", order: order("upper(email)"), class: "table-header-link") %></th>
       <th><div class="tooltip"><span class="tooltiptext">English</span><%= link_to("🇬🇧", order: order("language_en")) %></div></th>
       <th><div class="tooltip"><span class="tooltiptext">German</span><%= link_to("🇩🇪", order: order("language_de")) %></div></th>
-      <th><div class="tooltip"><span class="tooltiptext">Female</span>👩</div></th>
+      <th><div class="tooltip"><span class="tooltiptext">Gender</span>Gender</div></th>
       <th><div class="tooltip"><span class="tooltiptext">Installation party</span>🖥</div></th>
       <th><div class="tooltip"><span class="tooltiptext">Workshop day</span>🎓</div></th>
       <th><div class="tooltip"><span class="tooltiptext">Lightning talk approved</span>🆗</div></th>
@@ -28,7 +28,7 @@
       <td><%= application.coach.user.email %></td>
       <td class="center"><% if application.coach.language_en %> ✅ <% end %></td>
       <td class="center"><% if application.coach.language_de %> ✅ <% end %></td>
-      <td class="center"><% if application.coach.female %> ✅ <% end %></td>
+      <td class="center"><%= application.coach.gender.humanize %></td>
       <td class="center"><% if application.installationparty %> ✅ <% end %></td>
       <td class="center"><% if application.workshopday %> ✅ <% end %></td>
       <td>
diff --git a/app/views/admin/events/edit.html.erb b/app/views/admin/events/edit.html.erb
@@ -22,6 +22,30 @@
   <%= error_message(@event, :end_time) %>
   <p><%= f.text_field :end_time %></p>
 
+  <p><%= f.label(:coach_the_coaches_date, "Coach the Coaches date:") %></p>
+  <%= error_message(@event, :coach_the_coaches_date) %>
+  <p><%= f.date_select :coach_the_coaches_date %></p>
+
+  <p><%= f.label(:coach_the_coaches_start_time, "Coach the coaches starts at:") %></p>
+  <%= error_message(@event, :coach_the_coaches_start_time) %>
+  <p><%= f.time_select :coach_the_coaches_start_time %></p>
+
+  <p><%= f.label(:coach_the_coaches_end_time, "Coach the coaches ends at:") %></p>
+  <%= error_message(@event, :coach_the_coaches_end_time) %>
+  <p><%= f.time_select :coach_the_coaches_end_time %></p>
+
+  <p><%= f.label(:installation_get_together_date, "Installation Get-Together date:") %></p>
+  <%= error_message(@event, :installation_get_together_date) %>
+  <p><%= f.date_select :installation_get_together_date %></p>
+
+  <p><%= f.label(:installation_get_together_start_time, "Installation Get-Together starts at:") %></p>
+  <%= error_message(@event, :installation_get_together_start_time) %>
+  <p><%= f.time_select :installation_get_together_start_time %></p>
+
+  <p><%= f.label(:installation_get_together_end_time, "Installation Get-Together ends at:") %></p>
+  <%= error_message(@event, :installation_get_together_end_time) %>
+  <p><%= f.time_select :installation_get_together_end_time %></p>
+
   <p><%= f.label(:application_start, "Applications start on:") %></p>
   <%= error_message(@event, :application_start) %>
   <p><%= f.date_select :application_start %></p>
diff --git a/app/views/applications/_info.html.erb b/app/views/applications/_info.html.erb
@@ -1,4 +1,4 @@
-<h1><%= @event.name %> <%= l @event.scheduled_at %> </h1>
+<h1><%= @event.name %> <%= l @event.installation_get_together_date, format: :short %> & <%= l @event.scheduled_at %> </h1>
 
 <article>
   <% if @application.nil? || @application.errors.empty? %>
diff --git a/app/views/coach_applications/new.html.erb b/app/views/coach_applications/new.html.erb
@@ -1,24 +1,64 @@
+<h1><%= @event.name %> <%= l @event.installation_get_together_date, format: :short %> & <%= l @event.scheduled_at %> </h1>
+<section id="info-for-coaches">
+  <h3>Dear code curious (former Rails Girls Berlin) coaches,</h3>
+  <p>We are looking for helping hands for our next <%= @event.name %>.</p>
+  <div>
+    <p><b>When:</b></p>
+    <p>Coach the coaches:
+    <%= l @event.coach_the_coaches_date, format: :long %>,
+    <%= l @event.coach_the_coaches_start_time, format: :short %> -
+    <%= l @event.coach_the_coaches_end_time, format: :short %></p>
+    <p>Installation get-together:
+    <%= l @event.installation_get_together_date, format: :long %>,
+    <%= l @event.installation_get_together_start_time, format: :short %> -
+    <%= l @event.installation_get_together_end_time, format: :short %></p>
+    <p>Workshop day:
+    <%= l @event.scheduled_at, format: :long %>,
+    <%= @event.start_time %> -
+    <%= @event.end_time %></p>
+  </div>
+  <div>
+    <p><b>Where for all events:</b></p>
+    <%= @event.place %>
+  </div>
+</section>
+
 <%= form_for [@event, @coach_application] do |f| %>
   <h2>I can help on the</h2>
     <p class="note">Please select one or both.</p>
     <p>
       <%= f.check_box :installationparty %>
-      <%= f.label(:installationparty, "installation party") %>
+      <%= f.label(:installationparty, "installation get-together") %>
     </p>
     <p>
       <%= f.check_box :workshopday %>
       <%= f.label(:workshopday, "workshop day") %>
     </p>
   <h2>Are you coaching for the first time?</h2>
+  <p class="note">First-time coach = someone who has never coached at a code curious or Rails Girls Berlin beginner workshop.</p>
   <p>
     <%= f.check_box :first_time_coaching %>
-    <%= f.label(:first_time_coaching, "yes, coaching for the first time") %>
+    <%= f.label(:first_time_coaching, "Yes, I'm coaching for the first time.") %>
   </p>
   <h2>Would you like to give a lightning talk? What topic do you have in mind?</h2>
-  <p class="note">The talk should be understandable for beginners and no longer than 5 minutes.</p>
+  <p class="note">
+    The talk should be understandable for beginners and no longer than 5 minutes.
+    We especially welcome more inspirational talks, from women/under-represented groups in tech.
+    This could be about what got you into tech or what cool projects you've done or are interested in doing.
+  </p>
   <p>
     <%= f.text_field :lightningtalk %>
   </p>
+  <h2>Will you attend the coach the coaches?</h2>
+  <p class="note">This is to help and familiarize you with the topics of the workshop. We suggest every coach be present, especially first-time coaches.</p>
+  <p>
+    <%= f.check_box :coach_the_coaches %>
+    <%= f.label(:coach_the_coaches, "Yes, I will attend the coach-the-coaches workshop.") %>
+  </p>
+  <h2>Is your company interested in sponsoring code curious?</h2>
+  <p>
+    <%= f.text_field :sponsor %>
+  </p>
   <h2>Notes</h2>
   <p class="note">including if you would like to help the organizers on the day or even become an organizer in the future</p>
   <p>
diff --git a/app/views/coaches/_form.html.erb b/app/views/coaches/_form.html.erb
@@ -11,8 +11,8 @@
       <p><%= f.label(:name, "Name") %></p><p class="note">No official name necessary, you can use the name you want to be called. Just be sure to remember what you picked. *</p>
       <p><%= f.text_field :name %></p>
       <p>
-        <%= f.check_box :female %>
-        <%= f.label(:female, "female/I have some female sex characteristics.") %>
+        <%= f.label(:gender, "I identify as") %>
+        <%= f.select :gender, genders_for_form, include_blank: true %>
       </p>
     </fieldset>
     <fieldset>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -34,9 +34,12 @@ en:
   date:
     formats:
       default: "%d.%m.%Y"
+      short: "%d.%m."
+      long: "%A, %d.%m.%Y"
   time:
     formats:
       date: "%d.%m.%Y"
+      short: "%H:%M"
   activerecord:
     attributes:
       application/state:
diff --git a/db/migrate/20200217190649_add_gender_to_coaches.rb b/db/migrate/20200217190649_add_gender_to_coaches.rb
@@ -0,0 +1,5 @@
+class AddGenderToCoaches < ActiveRecord::Migration[5.2]
+  def change
+    add_column :coaches, :gender, :string, default: "female", null: false
+  end
+end
diff --git a/db/migrate/20200217190804_remove_female_from_coaches.rb b/db/migrate/20200217190804_remove_female_from_coaches.rb
@@ -0,0 +1,5 @@
+class RemoveFemaleFromCoaches < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :coaches, :female, :boolean
+  end
+end
diff --git a/db/migrate/20200217195541_add_new_columns_to_events.rb b/db/migrate/20200217195541_add_new_columns_to_events.rb
@@ -0,0 +1,10 @@
+class AddNewColumnsToEvents < ActiveRecord::Migration[5.2]
+  def change
+    add_column :events, :coach_the_coaches_date, :date
+    add_column :events, :coach_the_coaches_start_time, :time
+    add_column :events, :coach_the_coaches_end_time, :time
+    add_column :events, :installation_get_together_date, :date
+    add_column :events, :installation_get_together_start_time, :time
+    add_column :events, :installation_get_together_end_time, :time
+  end
+end
diff --git a/db/migrate/20200222144800_add_coach_the_coaches_to_coach_applications.rb b/db/migrate/20200222144800_add_coach_the_coaches_to_coach_applications.rb
@@ -0,0 +1,5 @@
+class AddCoachTheCoachesToCoachApplications < ActiveRecord::Migration[5.2]
+  def change
+    add_column :coach_applications, :coach_the_coaches, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20200222150918_add_sponsor_to_coach_applications.rb b/db/migrate/20200222150918_add_sponsor_to_coach_applications.rb
@@ -0,0 +1,5 @@
+class AddSponsorToCoachApplications < ActiveRecord::Migration[5.2]
+  def change
+    add_column :coach_applications, :sponsor, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_02_10_194758) do
+ActiveRecord::Schema.define(version: 2020_02_22_150918) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -52,6 +52,8 @@
     t.boolean "lightningtalk_approved", default: false
     t.datetime "contacted_at"
     t.boolean "first_time_coaching", default: false
+    t.boolean "coach_the_coaches", default: false
+    t.string "sponsor"
     t.index ["coach_id"], name: "index_coach_applications_on_coach_id"
     t.index ["event_id"], name: "index_coach_applications_on_event_id"
   end
@@ -60,11 +62,11 @@
     t.string "name"
     t.boolean "language_de"
     t.boolean "language_en"
-    t.boolean "female"
     t.boolean "notifications", default: false
     t.bigint "user_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "gender", default: "female", null: false
     t.index ["user_id"], name: "index_coaches_on_user_id"
   end
 
@@ -123,6 +125,12 @@
     t.boolean "coach_registration_enabled", default: true
     t.text "coach_approval_mail"
     t.text "coach_approval_mail_subject"
+    t.date "coach_the_coaches_date"
+    t.time "coach_the_coaches_start_time"
+    t.time "coach_the_coaches_end_time"
+    t.date "installation_get_together_date"
+    t.time "installation_get_together_start_time"
+    t.time "installation_get_together_end_time"
   end
 
   create_table "users", id: :serial, force: :cascade do |t|
diff --git a/test/controllers/applications_controller_test.rb b/test/controllers/applications_controller_test.rb
@@ -8,28 +8,28 @@ class ApplicationsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "Get an event on the day the application period ends" do
-    event = create(:event, name: "Test Me", place: "Testing", scheduled_at: 2.weeks.from_now, application_start: Date.yesterday, application_end: Date.today, confirmation_date: 12.days.from_now)
+    event = create(:event, name: "Test Me", place: "Testing", installation_get_together_date: 13.days.from_now, scheduled_at: 2.weeks.from_now, application_start: Date.yesterday, application_end: Date.today, confirmation_date: 12.days.from_now)
     get "/events/#{event.id}/applications/new"
     assert_response 200
-    assert_select "h1", "Test Me #{2.weeks.from_now.strftime("%d.%m.%Y")}"
+    assert_select "h1", "Test Me #{I18n.l 13.days.from_now.to_date, format: :short} & #{I18n.l 2.weeks.from_now.to_date}"
   end
 
   test "Get an event on the day the application period starts" do
-    event = create(:event, name: "Test Me", place: "Testing", scheduled_at: 2.weeks.from_now, application_start: Date.today, application_end: Date.tomorrow, confirmation_date: 12.days.from_now)
+    event = create(:event, name: "Test Me", place: "Testing", installation_get_together_date: 13.days.from_now, scheduled_at: 2.weeks.from_now, application_start: Date.today, application_end: Date.tomorrow, confirmation_date: 12.days.from_now)
     get "/events/#{event.id}/applications/new"
     assert_response 200
-    assert_select "h1", "Test Me #{2.weeks.from_now.strftime("%d.%m.%Y")}"
+    assert_select "h1", "Test Me #{I18n.l 13.days.from_now.to_date, format: :short} & #{I18n.l 2.weeks.from_now.to_date}"
   end
 
   test "Get an event before application starts" do
-    event = create(:event, name: "Test Me", place: "Testing", scheduled_at: 2.weeks.from_now, application_start: 2.days.from_now, application_end: 10.days.from_now, confirmation_date: 12.days.from_now)
+    event = create(:event, name: "Test Me", place: "Testing", installation_get_together_date: 13.days.from_now, scheduled_at: 2.weeks.from_now, application_start: 2.days.from_now, application_end: 10.days.from_now, confirmation_date: 12.days.from_now)
     get "/events/#{event.id}/applications/new"
     assert_response 200
     assert_select "h3", /Hi, early bird!/
   end
 
   test "Get an event after application ends" do
-    event = create(:event, name: "Test Me", place: "Testing", scheduled_at: 2.weeks.from_now, application_start: 10.days.ago, application_end: 1.day.ago, confirmation_date: 5.days.from_now)
+    event = create(:event, name: "Test Me", place: "Testing", installation_get_together_date: 13.days.from_now, scheduled_at: 2.weeks.from_now, application_start: 10.days.ago, application_end: 1.day.ago, confirmation_date: 5.days.from_now)
     get "/events/#{event.id}/applications/new"
     assert_response 200
     assert_select "p", /The application period for this workshop has already ended./
diff --git a/test/factories.rb b/test/factories.rb
@@ -5,7 +5,7 @@
   factory :coach do
     association :user
     name { "Swenja" }
-    female { true }
+    gender { "female" }
     language_de { true }
     language_en { true }
     notifications { true }
@@ -17,6 +17,12 @@
     application_start { Time.now }
     application_end { Time.now }
     confirmation_date { Time.now }
+    coach_the_coaches_date { Time.now }
+    coach_the_coaches_start_time { Time.now }
+    coach_the_coaches_end_time { Time.now }
+    installation_get_together_date { Time.now }
+    installation_get_together_start_time { Time.now }
+    installation_get_together_end_time { Time.now }
     scheduled_at { Time.now }
     start_time { "10:00" }
     end_time { "18:00" }
diff --git a/test/system/add_coach_application_test.rb b/test/system/add_coach_application_test.rb
@@ -4,7 +4,7 @@ class AddCoachApplicationTest < ApplicationSystemTestCase
   setup do
     @event = create(:event, name: "Workshop Code Curious")
     @user = create(:user, email: "test@coach.de", password: "password")
-    @coach = create(:coach, user: @user)
+    @coach = create(:coach, user: @user, gender: "female")
 
     visit coaches_sign_in_path
 
@@ -17,11 +17,14 @@ class AddCoachApplicationTest < ApplicationSystemTestCase
   end
 
   test "Coach application" do
-    check "installation party"
+    check "installation get-together"
     check "workshop day"
+    check "Yes, I'm coaching for the first time."
+    check "Yes, I will attend the coach-the-coaches workshop."
 
     fill_in "coach_application_lightningtalk", with: "Yes"
     fill_in "coach_application_notes", with: "I'm happy"
+    fill_in "coach_application_sponsor", with: "Yes"
 
     click_on "Submit"
 
@@ -33,5 +36,8 @@ class AddCoachApplicationTest < ApplicationSystemTestCase
     assert_equal coach_application.workshopday, true
     assert_equal coach_application.lightningtalk, "Yes"
     assert_equal coach_application.notes, "I'm happy"
+    assert_equal coach_application.first_time_coaching, true
+    assert_equal coach_application.coach_the_coaches, true
+    assert_equal coach_application.sponsor, "Yes"
   end
 end
diff --git a/test/system/cancel_coach_application_test.rb b/test/system/cancel_coach_application_test.rb
@@ -4,7 +4,7 @@ class CancelCoachApplicationTest < ApplicationSystemTestCase
   setup do
     @event = create(:event, name: "Workshop Code Curious")
     @user = create(:user, email: "test@coach.de", password: "password")
-    @coach = create(:coach, user: @user)
+    @coach = create(:coach, user: @user, gender: "female")
     @coach_application = create(:coach_application, event: @event, coach: @coach, state: :pending)
 
     visit coaches_sign_in_path
diff --git a/test/system/create_coach_test.rb b/test/system/create_coach_test.rb
diff --git a/test/system/select_coaches_test.rb b/test/system/select_coaches_test.rb

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`class Coach < ApplicationRecord`
	`2`	`+ GENDERS = [:female, :male, :other, :prefer_not_to_say]`
`2`	`3`	`belongs_to :user`
`3`	`4`	`accepts_nested_attributes_for :user`
`4`	`5`	`has_many :coach_applications`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<h1><%= @event.name %> <%= l @event.scheduled_at %> </h1>`
	`1`	`+<h1><%= @event.name %> <%= l @event.installation_get_together_date, format: :short %> & <%= l @event.scheduled_at %> </h1>`
`2`	`2`
`3`	`3`	`<article>`
`4`	`4`	`<% if @application.nil? \|\| @application.errors.empty? %>`