Merge from head

[selectricity-live] / app / views / quickvote / _pref_table.rhtml

diff --git a/app/views/quickvote/_pref_table.rhtml b/app/views/quickvote/_pref_table.rhtml
index 32f5de4bc81254afef3a36fbae12a82ab331d21b..011fcbe8ac2d29aa7b2147797e249f99c3b57389 100644 (file)
--- a/app/views/quickvote/_pref_table.rhtml
+++ b/app/views/quickvote/_pref_table.rhtml
@@ -1,4 +1,6 @@
 <% candidates = @election.candidates.sort.collect {|candidate| candidate.id}-%>
+<% voters = @election.voters.size %>
+<% matrix = @election.condorcet_result.matrix %>
 <% names = Hash.new -%>
 <% candidates.each do |candidate| -%>
        <%names[candidate] = Candidate.find(candidate).name -%>
@@ -7,18 +9,24 @@
   <tr>
        <td> </td>
        <% candidates.each do |candidate| -%>
-         <th><%= names[candidate] -%></th>
-       <% end -%>
+         <th><%=h names[candidate] -%></th>
+  <% end -%>
+</tr>
+
 <% candidates.each do |winner| -%>
   <tr>
-       <th><%= names[winner] %></th>
+       <th><%=h names[winner] %></th>
   <% candidates.each do |loser| -%> 
     <% if winner == loser -%>
       <td> -- </td>
-    <% else %>         
-      <td><%= @election.condorcet_result.matrix[winner][loser] %></td>
+    <% else %>        
+      <td><% wins = matrix[winner][loser] unless matrix[winner].nil?%>
+          <%= wins %>
+             <%= sparkline_tag [(wins.to_f/voters.to_f)*100.0], :type => 'pie', 
+                                :diameter => 25, :share_color => '#74ce00' %>
+         </td>
     <% end -%>
   <% end -%>
  </tr>
 <% end -%>
-
+</table>