Pref_tables now use the Schulze ssd_result object, and they own't display if

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

diff --git a/app/views/quickvote/_pref_tables.rhtml b/app/views/quickvote/_pref_tables.rhtml
index 18e5aa38f81f3cc5d91aa23c76f4d4063fbb585f..3479167d226296cc14a0864c47b1299d2efb452a 100644 (file)
--- a/app/views/quickvote/_pref_tables.rhtml
+++ b/app/views/quickvote/_pref_tables.rhtml
@@ -1,22 +1,22 @@
-<% 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="preftable">
   <tr>
        <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>
@@ -31,15 +31,15 @@
  </tr>
 <% end -%>
 </table>
-
+<br />
 <!-- This table generates a margin of victory -->
 <table class="preftable">
   <% 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 -%>
@@ -50,3 +50,5 @@
   </tr>
   <% end -%>
 </table>
+<% end -%>
+