The defeats lsit partial contains the display logic for the mehtod added to condorcet...

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 98a71e54c97cdf8f05368832506b5b5ba8f5327d..cba32d08f66761ffad948f64a949e0feb884505f 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,3 +1,4 @@
+<%  %>
 <%require 'IPAddr' %>
 <h1>Results</h1>
 
@@ -145,7 +146,6 @@ by several other names.</p>
 <div class="clearbox"></div>
 
 <h2>Voters</h2>
-
 <table class="voterbox">
 <tr>
 <th>IP Address</th>
@@ -160,7 +160,7 @@ by several other names.</p>
       <%= `host #{IPAddr.new(voter.ipaddress).to_s}`.sub(/^.*pointer (.*)\.$/, '\1') %>
     
     <% rescue ArgumentError => err %>
-      <%= " - " %>
+      <%= voter.ipaddress %>
     <% end %>
     </td>
   <td><%= voter.vote.votestring %></td>
@@ -168,8 +168,10 @@ by several other names.</p>
 <% end %>
 </table>
 
+<%= render :partial => 'defeats_list' %>
+<%= render :partial => 'pref_table' %>
+
 <%= image_tag( graph_url( :action => 'votes_per_day', :id => @election ) ) %><br />
 <%= image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%><br />
 <%= image_tag( graph_url( :action => 'borda_bar', :id => @election ) ) %><br />
 <%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %>
-