X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/e565b1cd14149c5edc0106407f79e4ae12b56f10..7ee8e40628f6d7b775f48d859dd005de5a5e9afa:/app/views/quickvote/results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index fe2b09a..1fad7ea 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -21,14 +21,14 @@
 
 <p><strong>Number of voters:</strong></p>
    <blockquote>
-     <%= @election.voters.length %> (see below for details) 
+     <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
    </blockquote>
 
 <h2>Winners</h2>
 
 <div class="mainresultbox">
 <h3>Schulze Method Results</h3>
-<%= render :partial => 'result', :object => @ssd_result %>
+<%= render :partial => 'result', :object => @election.ssd_result %>
 
 <div class="rbmoreinfo"
 <h4>About the Schulze Method</h4>
@@ -47,7 +47,7 @@ Beatpath Winner, Path Voting, and Path Winner.</p>
 
 <div class="resultbox">
 <h3>Plurality Results</h3>
-<%= render :partial => 'result', :object => @plurality_result %>
+<%= render :partial => 'result', :object => @election.plurality_result %>
 
 <div class="rbmoreinfo"
 <h4>About Plurality Voting</h4>
@@ -67,7 +67,7 @@ voting.</p>
 <div class="resultbox">
 <h3>Approval Result</h3>
 <p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>
-<%= render :partial => 'result', :object => @approval_result %>
+<%= render :partial => 'result', :object => @election.approval_result %>
 
 <div class="rbmoreinfo"
 <h4>About Approval Voting</h4>
@@ -85,7 +85,7 @@ accept or not.</p>
 
 <div class="resultbox">
 <h3>Simple Condorcet Results</h3>
-<%= render :partial => 'result', :object => @condorcet_result %>
+<%= render :partial => 'result', :object => @election.condorcet_result %>
 
 <div class="rbmoreinfo"
 <h4>About Simple Cordorcet Voting</h4>
@@ -105,7 +105,7 @@ another Condorcet system.</p>
 
 <div class="resultbox">
 <h3>Borda Count Results</h3>
-<%= render :partial => 'result', :object => @borda_result %>
+<%= render :partial => 'result', :object => @election.borda_result %>
 
 <div class="rbmoreinfo"
 <h4>About Borda Count</h4>
@@ -123,7 +123,6 @@ points is the winner.</p>
 
 <div class="resultbox">
 <h3>Instant Runoff (IRV) Results</h3>
-<%= render :partial => 'result', :object => @runoff_result %>
 
 <div class="rbmoreinfo"
 <h4>About Instant Runoff Voting</h4>
@@ -154,6 +153,7 @@ by several other names.</p>
 <th>Vote</th>
 </tr>
 <% for voter in @election.voters %>
+  <% next unless voter.voted? %>
   <tr>
   <td><%= voter.ipaddress %></td>
   <td><%= `host #{voter.ipaddress}`.sub(/^.*pointer (.*)\.$/, '\1') %></td>
@@ -161,3 +161,9 @@ by several other names.</p>
   </tr>
 <% end %>
 </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 ) ) %>
+