Merge pull request #254 from rubymonsters/av-change-attendee-application-form

Change attendee application form

Author: simaofreitas

app/controllers/applications_controller.rb

@@ -16,7 +16,7 @@ def new
   def create
     @application = @event.applications.build(params.require(:application).permit(:name,
       :email, :language_de, :language_en, :attended_before, :rejected_before, :level,
-      :comments, :os, :needs_computer, :read_coc, :female))
+      :comments, :referred_by, :os, :needs_computer, :read_coc, :female))
 
     @application.random_id = SecureRandom.hex(12)
     @application.sequence_number = @event.applications.count + 1

app/views/applications/_info.html.erb

@@ -2,16 +2,29 @@
 
 <article>
   <% if @application.nil? || @application.errors.empty? %>
-    <p>Code curious want to give total beginners the opportunity and a community to start learning the technology to build their ideas and continue coding.</p>
-    <p>The Beginners Workshop is a hands on introduction to Rails. The workshop has a main focus on women with no previous Ruby on Rails programming experience and who want to be able to build their own applications. The program of the workshop includes
-      an overview of the Rails framework and a practical exercise in which attendees will be guided by coaches through the application building process.</p>
+    <p>
+      Code curious wants to give total beginners the opportunity and a community to start learning the technology to build their ideas and continue coding.
+    </p>
 
-    <p>We provide a completely differently learning environment in order to not only support but also further motivate women who want to code, but don’t have the right environment to do so. We also aim to establish a community, so it’s not a once in a
-      life-time event, we want to help women code and encourage them to continue coding.</p>
+    <p>
+      The Beginners Workshop is a hands-on introduction to Rails. 
+      The workshop is meant for women, non-binary and trans people with no previous programming experience. 
+      The program of the workshop includes an overview of the Rails framework and a practical exercise 
+      in which attendees will be guided by coaches through the application building process.
+    </p>
+    
+    <p>
+      We provide a completely different learning environment in order to not only support but also further motivate women and under-represented groups, 
+      who want to learn how to code, but don’t have the right environment to do so. 
+      We are a community, so this event often is the ignition point for a career change (even if it takes a while) for many of our attendees.
+    </p>
 
     <p>No previous knowledge is required to attend this workshop.</p>
 
-    <p>The first steps of learning how to program can be difficult. Our goal is it to help you with these first steps. We want to show you that programming is fun and creative and that there is a wonderful community that will support you.</p>
+    <p>
+      The first steps of learning how to code can be difficult. Our goal is to help you with these first steps. 
+      We want to show you that programming is fun and creative and that there is a wonderful community ready to support your journey.
+    </p>
 
     <div id="greeting">
       <h3>We are looking forward to seeing you <3</h3>

app/views/applications/new.html.erb

@@ -11,7 +11,11 @@
     <%= error_message(@application, :female) %>
     <p>
       <%= f.check_box :female %>
-      <%= f.label(:female, "I am a woman / non-binary person.") %>
+      <%= f.label(:female, "I identify as a woman (cis or trans) or non-binary person or trans-man.") %>
+      <p class="note">
+        This workshop is only for women, non-binary and trans-people. 
+        Feel free to leave a comment at the bottom of the form, if this line is problematic for you.
+      </p>
     </p>
     <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>
       <%= error_message(@application, :name) %>
@@ -37,7 +41,7 @@
   <fieldset>
       <p>
         <%= f.check_box :attended_before %>
-        <%= f.label(:attended_before, "I have attended a code curious workshop before.") %>
+        <%= f.label(:attended_before, "I have attended a code curious or Rails Girls Berlin workshop before.") %>
       </p>
       <p>
         <%= f.check_box :rejected_before %>
@@ -52,10 +56,19 @@
       <p><%= f.select(:os, options_for_select([["Linux", "linux"], ["Mac", "mac"], ["Windows", "windows"], ["Other", "other"]], @application.os), include_blank: true) %></p>
       <p>
         <%= f.check_box :needs_computer %>
-        <%= f.label(:needs_computer, "Or do you need a computer for the workshop?") %>
+        <%= f.label(:needs_computer, "Or do you need to borrow a laptop for the duration of the workshop?") %>
+        <p class="note">
+          We do not have laptops to lend out for the day, but we will try our best to find you one from the community. 
+          If you have a possibility of borrowing a laptop from a friend, that would be very helpful so you can still 
+          tick this box but make sure to mention that in the bottom comment section.
+        </p>
       </p>
-      <p><%= f.label(:comments, "Is there anything else that you would like to mention?") %></p>
+      <p><%= f.label(:referred_by, "How did you hear about us?") %></p>
+      <p><%= f.text_area :referred_by %></p>
+      
+      <p><%= f.label(:comments, "Is there anything else you would like to mention? For example: why you want to attend?") %></p>
       <p><%= f.text_area :comments %></p>
+      
   </fieldset>
   <fieldset>
     <h2>Please read and accept our <a href="http://berlincodeofconduct.org">Code of Conduct</a></h2>

db/migrate/20200224192634_add_referred_by_to_applications.rb

@@ -0,0 +1,5 @@
+class AddReferredByToApplications < ActiveRecord::Migration[5.2]
+  def change
+    add_column :applications, :referred_by, :text
+  end
+end

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_24_192549) do
+ActiveRecord::Schema.define(version: 2020_02_24_192634) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -36,6 +36,7 @@
     t.integer "sequence_number"
     t.integer "state", default: 0, null: false
     t.boolean "attended", default: false
+    t.text "referred_by"
     t.index ["event_id"], name: "index_applications_on_event_id"
   end
 
@@ -51,7 +52,7 @@
     t.integer "state", default: 0, null: false
     t.boolean "lightningtalk_approved", default: false
     t.datetime "contacted_at"
-    t.boolean "first_time_coaching", default: false
+    t.boolean "first_time_coaching"
     t.boolean "coach_the_coaches", default: false
     t.string "sponsor"
     t.index ["coach_id"], name: "index_coach_applications_on_coach_id"