Add emails to point lists

Author: nygrenh

app/controllers/points_controller.rb

@@ -101,7 +101,7 @@ def summary_hash(course, visible_exercises, sheets, only_for_user = nil)
       end
 
       include_admins = current_user.administrator?
-      users = User.select('login, users.id, administrator').where(login: per_user_and_sheet.keys.sort_by(&:downcase)).includes(:organizations).includes(:user_field_values).order('login ASC')
+      users = User.select('login, email, users.id, administrator').where(login: per_user_and_sheet.keys.sort_by(&:downcase)).includes(:organizations).includes(:user_field_values).order('login ASC')
 
       users = users.where(administrator: false) unless include_admins
 

app/views/points/index.csv.erb

@@ -2,6 +2,7 @@
 <%= PortableCSV.generate(:force_quotes => true) do |csv|
   arr = []
   arr += @user_fields.map(&:label) if @user_fields
+  arr += [:email] if can?(:teach, @course)
   arr += @summary[:sheets].map {|sheet| sheet[:name] } + ["Total"]
   csv << arr
 
@@ -17,6 +18,7 @@
         arr << (user_field_value ? user_field_value.value : '')
       end
     end
+    arr += user.email if can?(:teach, @course)
     arr += points + [total]
     csv << arr
   end

app/views/points/index.html.erb

@@ -50,6 +50,9 @@
                 <th><%= field.label %></th>
               <% end %>
             <% end %>
+            <% if can?(:teach, @course) %>
+              <th>Email</th>
+            <% end %>
           <% @summary[:sheets].map{|s| s[:name]}.each do |sheet| %>
             <th>
               <%= sheet %><br />
@@ -93,6 +96,9 @@
                 <td><%= field_record.value if field_record %></td>
               <% end %>
             <% end %>
+            <% if can?(:teach, @course) %>
+              <td><%= user.email %></td>
+            <% end %>
             <% @summary[:sheets].each do |sheet| %>
               <% user_points_for_this_sheet = @summary[:awarded_for_user_and_sheet][username][sheet[:name]].to_i %>
               <td>

app/views/points/show.html.erb

@@ -32,6 +32,9 @@
                 <th><%= field.label %></th>
               <% end %>
             <% end %>
+            <% if can?(:teach, @course) %>
+              <th>Email</th>
+            <% end %>
             <% @exercises.each do |exercise| %>
               <% points = exercise.available_points.order! %>
               <% if points.size > 0 %>
@@ -41,7 +44,7 @@
           </tr>
         <% end %>
         <tr>
-          <th colspan="<%= 2 + (@user_fields ? @user_fields.length : 0) %>"></th>
+          <th colspan="<%= 2 + (@user_fields ? @user_fields.length : 0) + (can?(:teach, @course) ? 1 : 0) %>"></th>
 
           <% @exercises.each do |exercise| %>
             <% exercise.available_points.sort.each do |point| %>
@@ -71,6 +74,9 @@
                 <td><%= value.value if value %></td>
                 <% end %>
               <% end %>
+              <% if can?(:teach, @course) %>
+                <td><%= user.email %></td>
+              <% end %>
               <% @exercises.each do |exercise| %>
                 <% exercise.available_points.sort.each do |p| %>
                   <td class="point-cell">