X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/d6d44b7c8dc1d8ea3e425116caadca43c9412fed..c5ca3aa0771719286fb9f1a468c28a83af52292b:/app/views/quickvote/_pref_tables.rhtml

diff --git a/app/views/quickvote/_pref_tables.rhtml b/app/views/quickvote/_pref_tables.rhtml
index 66e0cbf..588ec22 100644
--- a/app/views/quickvote/_pref_tables.rhtml
+++ b/app/views/quickvote/_pref_tables.rhtml
@@ -1,23 +1,25 @@
-<% candidates = @election.condorcet_result.ranked_candidates.flatten -%>
+<% candidates = @election.ssd_result.ranked_candidates.flatten -%>
 <% voters = @election.voters.size %>
-<% matrix = @election.condorcet_result.matrix %>
-<% victories = @election.condorcet_result.victories_and_ties %>
-<% names = @election.names_by_id %>
-
+<% matrix = @election.ssd_result.matrix %>
+<% victories = @election.ssd_result.victories_and_ties %>
 
+<% if candidates.size <= 7 -%>
 <!-- This table shows how many times each choice was ranked above the other, 
 	with percentages-->
-<table class="voterbox">
+<table class="preftable">
+<caption>Each number shows how many times the candidate on the left beat the 
+matching candidate on the top. The Schulze/Condorcet winner is on the top of the 
+left column.</caption>
   <tr>
-	<td> </td>
+	<td></td>
 	<% candidates.each do |candidate| -%>
-	  <th><%=h names[candidate] -%></th>
+	  <th><%=h @names[candidate] -%></th>
   <% end -%>
  </tr>
 
 <% candidates.each do |winner| -%>
   <tr>
-	<th><%=h names[winner] %></th>
+	<th><%=h @names[winner] %></th>
   <% candidates.each do |loser| -%> 
     <% if winner == loser -%>
       <td> -- </td>
@@ -32,23 +34,27 @@
  </tr>
 <% end -%>
 </table>
-
+<br />
 <!-- This table generates a margin of victory -->
-<table class="voterbox">
+<table class="preftable">
+<caption>A simplification of the above data. The winner is on the left; each cell
+names the defeated candidate and the magnitude of the victory in parenthesis.
+</caption>
   <% candidates.each do |victor| %>
   <tr>
-    <th><%=h names[victor] %></th>
+    <th><%=h @names[victor] %></th>
 	<% victories[victor].keys.each do |loser| %>
 	<% margin = victories[victor][loser]%>
-	<td><%=h names[loser] %> 
+	<td><%=h @names[loser] %> 
 	    <% if margin == 0%>
 		  Tied!
 		<% else -%>
 		  (<%= margin%>)
 		<% end -%>
-		  </td>
+	</td>
 	<% end -%>
   </tr>
   <% end -%>
 </table>
+<% end -%>