Major integration of Courtland's design into the QuickVotes.

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index ad71fa65b686bc1fd3da70dba2f409bcfd207ced..8b658f77a3c86dcae036916f5c7ddee82322fb6c 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,36 +1,98 @@
-<% %>
+<% require 'whois/whois' %>

 
 

-<h1><em><%= @election.name %></em> Results</h1>
-
-<p>Total Votes: <strong><%= @election.voters.length %></strong></p>
-<div class="mainresultbox">
-<h2>Condorcet (w/ Cloneproof SSD) Results</h2>
-<%= render :partial => 'result', :object => @ssd_result %>
+<div id="page-title">
+  <span class="header">Quickvote</span>
+  <span class="subheader">Results</span>

 </div>
 
 </div>
 

-<div class="resultbox">
-<h2>Plurality Results</h2>
-<%= render :partial => 'result', :object => @plurality_result %>
-</div>
+<div class="main-content">

 
 

-<div class="resultbox">
-<h2>Approval Result</h2>
-<p><font size="-1">(Assuming top two choices are "approved.")</font></p>
-<%= render :partial => 'result', :object => @approval_result %>
+<% if @election.shortdesc %>
+  <p><strong>Vote Description:</strong></p>
+  <blockquote><em><%=h @election.shortdesc %></em>
+    <% if @election.longdesc -%>
+      <br />
+      <%= h(@election.longdesc) -%>
+    <% end -%>
+  </blockquote>
+<% end %>
+
+<p><strong>Candidates/choices:</strong></p>
+
+<ol>
+  <% for candidate in @election.candidates.sort %>
+    <li><%=h candidate.name.capitalize %></li>
+  <% end %>
+</ol>
+
+<p><strong>Number of voters:</strong></p>
+   <blockquote>
+     <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
+   </blockquote>
+
+<div class="plain-header">
+  <span class="header">Winner</span>
+  <span class="subheader"></span>

 </div>
 
 </div>
 

-<div class="resultbox">
-<h2>Simple Condorcet Results</h2>
-<%= render :partial => 'result', :object => @condorcet_result %>
+<div class="mainresultbox">
+<%= render :partial => 'result_' + @election.election_method,
+           :object => @results[@election.election_method] %>

 </div>
 
 </div>
 

-<div class="resultbox">
-<h2>Borda Count Results</h2>
-<%= render :partial => 'result', :object => @borda_result %>
+<div class="plain-header">
+  <span class="header">Other Voting Methods</span>
+  <span class="subheader"></span>

 </div>
 
 </div>
 

+<% for result_type in @election.other_methods %>

 <div class="resultbox">
 <div class="resultbox">

-<h2>Instant Runoff (IRV) Results</h2>
-<%= render :partial => 'result', :object => @runoff_result %>
+<%= render :partial => 'result_' + result_type, 
+           :object => @results[result_type] %>

 </div>
 </div>

+<% end %>
+
+
+<div class="clear-div"></div>
+
+<h2>Voters <%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></h2>
+<table class="voterbox">
+<tr>
+<th>IP/Host</th>
+<th>Origin</th>
+<th>Vote</th>
+</tr>
+<% for voter in @election.voters %>
+  <% next unless voter.voted? %>
+  <tr>
+    <td><% begin %>
+        <% raise ArgumentError.new, "Local Server" if voter.ipaddress == "127.0.0.1" %>
+        <% raise ArgumentError.new, "XML-RPC Voter" if voter.ipaddress == "XMLRPC Request" %>
+        <% w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)%>
+        <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%>
+      </td>
+      <td>
+        <%w.search_whois%>
+        <%=h (w.all.grep(/^(OrgName|org-name)/)[0] or "").sub(/^(OrgName|org-name)\:/,'').strip -%> - <%=  (w.all.grep(/^(NetName|netname)/)[0] or "").sub(/^(NetName|netname)\:/,'').strip %>
+    
+    <% rescue ArgumentError => err %>
+      <%=h err %>
+    </td>
+    <td><%=h err%>
+    <% rescue NoMethodError %>
+      DNS Unreachable
+    </td>
+    <td> DNS Unreachable
+    <% end %>
+    </td>
+  <td><%= voter.vote.votestring %></td>
+  </tr>
+<% end %>
+</table>
+
+<%=image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
+<br />
+
+<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
+

 </div>
 </div>