X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/4ab69ea7afaeff96714961139e7c696e7c7141ab..4c5046ffa16ea77da4e4b69517dcb33bc6ec2646:/app/views/quickvote/_pref_table.rhtml?ds=sidebyside

diff --git a/app/views/quickvote/_pref_table.rhtml b/app/views/quickvote/_pref_table.rhtml
index 4576a0f..011fcbe 100644
--- a/app/views/quickvote/_pref_table.rhtml
+++ b/app/views/quickvote/_pref_table.rhtml
@@ -1,6 +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 -%>
@@ -9,16 +9,18 @@
   <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><% wins = @election.condorcet_result.matrix[winner][loser]%>
+    <% 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' %>
@@ -27,4 +29,4 @@
   <% end -%>
  </tr>
 <% end -%>
-
+</table>