The user model has been modified so that it stores the user object itself in the...

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
old mode 100644 (file)
new mode 100755 (executable)
index e3644c8..7152072
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -21,53 +21,139 @@
 
 <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">
-<center><h3>Condorcet (w/ Cloneproof SSD) Results</h3></center>
+<h3>Schulze Method Results</h3>
 <%= render :partial => 'result', :object => @ssd_result %>
+
+<div class="rbmoreinfo"
+<h4>About the Schulze Method</h4>
+
+<p>The <%= link_to "Schulze method",
+"http://en.wikipedia.org/wiki/Schulze_method" %> is a preferential
+voting system. It is based on the Condorcet method but includes a set of
+methods for resolving "circular" defeats.</p>
+
+<p>The Schulze method is also known as Schwartz Sequential Dropping
+(SSD), Cloneproof Schwartz Sequential Dropping (CSSD), Beatpath Method,
+Beatpath Winner, Path Voting, and Path Winner.</p>
+</div>
+
 </div>
 
 <div class="resultbox">
 <h3>Plurality Results</h3>
 <%= render :partial => 'result', :object => @plurality_result %>
+
+<div class="rbmoreinfo"
+<h4>About Plurality Voting</h4>
+
+<p><%= link_to "Plurality voting",
+"http://en.wikipedia.org/wiki/Plurality_electoral_system" %> selects the
+winner who has received the most "number one" votes, regardless of
+whether or not he or she has a majority of votes.</p>
+
+<p>Plurality voting is also variously referred to as, "first past the
+post," "winner-take-all," "majoritarian" or "simple majority"
+voting.</p>
+
+</div>
 </div>
 
 <div class="resultbox">
 <h3>Approval Result</h3>
-<p><font size="-1">(Assuming top two choices are "approved.")</font></p>
+<p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>
 <%= render :partial => 'result', :object => @approval_result %>
+
+<div class="rbmoreinfo"
+<h4>About Approval Voting</h4>
+
+<p><%= link_to "Approval voting",
+"http://en.wikipedia.org/wiki/Approval_voting" %> is a voting system in
+which each voter can vote for as many or as few candidates as the voter
+chooses.  Approval voting is a limited form of range voting, where the
+range that voters are allowed to express is extremely constrained:
+accept or not.</p>
+
+</div>
+
 </div>
 
 <div class="resultbox">
 <h3>Simple Condorcet Results</h3>
 <%= render :partial => 'result', :object => @condorcet_result %>
+
+<div class="rbmoreinfo"
+<h4>About Simple Cordorcet Voting</h4>
+
+<p><%= link_to "Condorcet",
+"http://en.wikipedia.org/wiki/Condorcet_method" %> allows voters to rank
+candidates in order of preference.  If there is a choice whom voters
+prefer to each other choice when compared to one at a time, that choice
+will be the winner.</p>
+
+<p>There is a family of Condorcet methods. This method is referred to as
+"Simple Condorcet" to distinguish it from the Schulze method which is
+another Condorcet system.</p>
+
+</div>
 </div>
 
 <div class="resultbox">
 <h3>Borda Count Results</h3>
 <%= render :partial => 'result', :object => @borda_result %>
+
+<div class="rbmoreinfo"
+<h4>About Borda Count</h4>
+
+<p><%= link_to "Borda count",
+"http://en.wikipedia.org/wiki/Borda_count" %> 
+is an election method in which voters rank
+candidates in order of preference. The Borda count determines the winner
+of an election by giving each candidate a certain number of points
+corresponding to the position in which he or she is ranked by each
+voter. Once all votes have been counted the candidate with the most
+points is the winner.</p>
+</div>
 </div>
 
 <div class="resultbox">
 <h3>Instant Runoff (IRV) Results</h3>
-<%= render :partial => 'result', :object => @runoff_result %>
+
+<div class="rbmoreinfo"
+<h4>About Instant Runoff Voting</h4>
+
+<p><%= link_to "Instant runoff voting",
+"http://en.wikipedia.org/wiki/Instant_Runoff_Voting" %> is an electoral
+system in which voters rank candidates in order of preference. In an IRV
+election, if no candidate receives an overall majority of first
+preferences the candidates with fewest votes are eliminated one by one,
+and their votes transferred according to their second and third
+preferences (and so on), until one candidate achieves a majority.</p>
+
+<p>Instant-runoff voting (IRV) is also known as the Alternative Vote (AV) and
+by several other names.</p>
+
+</div>
+
 </div>
 
 <div class="clearbox"></div>
 
 <h2>Voters</h2>
 
-<table border="1">
+<table class="voterbox">
 <tr>
 <th>IP Address</th>
 <th>DNS/Host</th>
 <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>
@@ -75,3 +161,7 @@
   </tr>
 <% end %>
 </table>
+
+<img src="<% url_for(:action => 'day_votes', :id => @election)%>" />
+<%= image_tag( graph_url( :action => 'day_votes', :id => @election ) ) %>
+<%= image_tag( graph_url( :action => 'show' ) ) %>