Merge branch 'master' of https://github.com/lilliealbert/bridge_troll …

…into lilliealbert-master

app/controllers/events_controller.rb

@@ -50,6 +50,15 @@ def volunteer_emails
   end
 
   def organize
+    @volunteer_rsvps = @event.volunteer_rsvps
+    @volunteer_counts = {
+      VolunteerAssignment::UNASSIGNED => 0,
+      VolunteerAssignment::TEACHER => 0,
+      VolunteerAssignment::TA => 0,
+    }
+    @volunteer_rsvps.each do |rsvp|
+      @volunteer_counts[rsvp.volunteer_assignment_id] += 1
+    end
   end
 
   protected

app/views/events/organize.html.erb

@@ -21,7 +21,7 @@
 ] %>
 
 <h2>Volunteer Teaching Preference Totals</h2>
-<p>You can assign people's roles on the Manage Volunteers page.</p>
+<p>You can see individual preferences and assign teaching roles on the <%= link_to('Manage Volunteers', event_volunteers_path(@event)) %> page.</p>
  <table class="table">
   <thead>
     <tr>
@@ -43,21 +43,23 @@
   </tbody>
 </table>
 
-<div>
-  <h4>Willing to Teach: <%= teachers_count(@event.volunteer_rsvps) %></h4>
-  <%= partitioned_volunteer_list(@event.volunteer_rsvps, :teachers) %>
-
-  <h4>Willing to TA: <%= tas_count(@event.volunteer_rsvps) %></h4>
-  <%= partitioned_volunteer_list(@event.volunteer_rsvps, :tas) %>
-
-  <h4>Willing to Teach or TA: <%= teach_or_ta_count(@event.volunteer_rsvps) %></h4>
-  <%= partitioned_volunteer_list(@event.volunteer_rsvps, :teach_or_tas) %>
-
-  <h4>Not Interested in Teaching: <%= not_teach_or_ta_count(@event.volunteer_rsvps) %></h4>
-  <%= partitioned_volunteer_list(@event.volunteer_rsvps, :not_teach_or_tas) %>
-
-  <h4>All Volunteers: <%= @event.volunteer_rsvps.length %></h4>
-</div>
+<h2>Volunteer Assignment Totals</h2>
+ <table class="table">
+  <thead>
+    <tr>
+      <th>Unassigned</th>
+      <th>Teachers</th>
+      <th>TAs</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><%= @volunteer_counts[VolunteerAssignment::UNASSIGNED] %></td>      
+      <td><%= @volunteer_counts[VolunteerAssignment::TEACHER] %></td>
+      <td><%= @volunteer_counts[VolunteerAssignment::TA] %></td>
+    </tr>
+  </tbody>
+</table>
 
 <%= render 'shared/actions', links: [
   ['Back', events_path],

app/views/events/show.html.erb

@@ -1,8 +1,4 @@
-<div class="row-fluid has-giant-header">
-  <div class="span7">
-    <h1><%= @event.title %></h1>
-  </div>
-</div>
+<%= render 'header' %>
 
 <div class="row-fluid">
   <div class="span8">

app/views/events/volunteer_emails.erb

@@ -9,7 +9,6 @@
 <table>
   <% @volunteers.each do |volunteer| %>
     <tr>
-      <td><%= volunteer.first_name %> <%= volunteer.last_name %>: </td>
       <td><%= volunteer.email %></td>
     </tr>
   <% end %>

app/views/rsvps/_form.html.erb

@@ -18,18 +18,19 @@
   </div>
 
   <div class="field">
-    <%= f.label :teaching_experience, "Teaching Experience" %>
+    <%= f.label :teaching_experience, "What's your experience with teaching?" %>
     <%= f.text_area :teaching_experience, rows: 5, cols: 80, 
           maxlength: Rsvp::MAX_EXPERIENCE_LENGTH %>
   </div>
 
   <strong>Teaching preference?</strong>
+  <p>If you're happy to do either, leave this section blank.</p>
   <div class="field">
     <%= f.label :teaching, class: 'checkbox' do %>
       <%= f.check_box :teaching %> Teaching
     <% end %>
     <%= f.label :taing, class: 'checkbox' do %>
-      <%= f.check_box :taing %> Taing
+      <%= f.check_box :taing %> TAing
     <% end %>
   </div>
 

app/views/rsvps/edit.html.erb

@@ -1,3 +1,5 @@
-<h1> Edit RSVP </h1>
+<%= render 'events/header' %>
+
+<h2> Edit RSVP </h2>
 
 <%= render 'form' %>

app/views/rsvps/new.html.erb

@@ -1,4 +1,6 @@
-<h1>RSVP</h1>
+<%= render 'events/header' %>
+
+<h2>RSVP</h2>
 
 <%= render 'form' %>
 

app/views/volunteers/index.html.erb

@@ -1,20 +1,20 @@
 <%= render 'events/header' %>
 
-<h3>Volunteer Assignments</h3>
-<h4>Event: <%= link_to " #{@event.title}", event_path(@event)%></h4>
-<h4>
-  <%= "When: #{formatted_session_datetime(@event.event_sessions.first)}" %>
-</h4>
+<h2>Assign Volunteer Teaching Roles</h2>
 
 <div id="saving_indicator"></div>
 
 <table class='table table-striped table-bordered table-condensed'>
   <th>Name</th>
+  <th>Subject Experience</th>
+  <th>Teaching Experience</th>
   <th>Volunteer's Preference</th>
   <th>Assignment</th>
 <% @volunteer_rsvps.each do |rsvp| %>
   <tr>
     <td><%= rsvp.user.full_name %></td>
+    <td><%= rsvp.subject_experience %></td>
+    <td><%= rsvp.teaching_experience %></td>
     <td><%= rsvp.formatted_preference %></td>
     <td>
       <%= form_for([@event, rsvp], method: :put, url: event_volunteer_path(@event, rsvp.id), remote: true) do %>

spec/requests/event_listing_request_spec.rb

@@ -122,7 +122,7 @@
         it "allows user to edit volunteer responsibilities" do
           click_link("Edit RSVP")
           uncheck 'Teaching'
-          check 'Taing'
+          check 'TAing'
 
           uncheck "Installfest"
           check "Curriculum"

spec/requests/event_organizer_dashboard_request_spec.rb

@@ -25,32 +25,6 @@
     page.should have_content("Volunteer Assignment")
   end
 
-  it "shows all volunteer information" do
-    4.times { create(:rsvp, event: @event, teaching: true) }
-    3.times { create(:rsvp, event: @event, taing: true) }
-    2.times { create(:rsvp, event: @event, teaching: true, taing: true) }
-    1.times { create(:rsvp, event: @event) }
-
-    volunteer = create(:user)
-    create(:rsvp, user: volunteer, event: @event, teaching: true)
-
-    visit organize_event_path(@event)
-    page.should have_content(volunteer.email)
-    page.should have_content(volunteer.full_name)
-    page.should have_content("#{volunteer.full_name} - #{volunteer.email}")
-
-    page.should have_content("Willing to Teach: 5")
-    page.should have_content("Willing to TA: 3")
-    page.should have_content("Willing to Teach or TA: 2")
-    page.should have_content("Not Interested in Teaching: 1")
-    page.should have_content("All Volunteers: 11")
-
-    page.should have_css('.teach', count: 5)
-    page.should have_css('.ta', count: 3)
-    page.should have_css('.both', count: 2)
-    page.should have_css('.none', count: 1)
-  end
-
   it "lets the user check in volunteers", js: true do
     user1 = create(:user, first_name: 'Anthony')
     user2 = create(:user, first_name: 'Bapp')