Merge head

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

diff --git a/app/views/quickvote/_pref_tables.rhtml b/app/views/quickvote/_pref_tables.rhtml
index 66e0cbf2df1fbf7870581ca6ed849b66db2c7f21..3479167d226296cc14a0864c47b1299d2efb452a 100644 (file)
--- a/app/views/quickvote/_pref_tables.rhtml
+++ b/app/views/quickvote/_pref_tables.rhtml
@@ -1,23 +1,22 @@
-<% candidates = @election.condorcet_result.ranked_candidates.flatten -%>
+<% candidates = @election.ssd_result.ranked_candidates.flatten -%>

 <% voters = @election.voters.size %>
 <% 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-->
 <!-- This table shows how many times each choice was ranked above the other, 
        with percentages-->

-<table class="voterbox">
+<table class="preftable">

   <tr>
   <tr>

-       <td> </td>
+       <td></td>

        <% candidates.each do |candidate| -%>
        <% candidates.each do |candidate| -%>

-         <th><%=h names[candidate] -%></th>
+         <th><%=h @names[candidate] -%></th>

   <% end -%>
  </tr>
 
 <% candidates.each do |winner| -%>
   <tr>
   <% 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>
   <% candidates.each do |loser| -%> 
     <% if winner == loser -%>
       <td> -- </td>


@@ -32,23 +31,24 @@
  </tr>
 <% end -%>
 </table>
  </tr>
 <% end -%>
 </table>

-
+<br />

 <!-- This table generates a margin of victory -->
 <!-- This table generates a margin of victory -->

-<table class="voterbox">
+<table class="preftable">

   <% candidates.each do |victor| %>
   <tr>
   <% 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]%>
        <% 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 -%>
            <% if margin == 0%>
                  Tied!
                <% else -%>
                  (<%= margin%>)
                <% end -%>

-                 </td>
+       </td>

        <% end -%>
   </tr>
   <% end -%>
 </table>
        <% end -%>
   </tr>
   <% end -%>
 </table>

+<% end -%>