X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/c5fda1e5174238779afd496014379d6446d1e3c1..dc7d60a0de460c72d292b43616eb97a8b34741c8:/app/views/elections/detailed_results.rhtml

diff --git a/app/views/elections/detailed_results.rhtml b/app/views/elections/detailed_results.rhtml
index 48296d6..4668570 100644
--- a/app/views/elections/detailed_results.rhtml
+++ b/app/views/elections/detailed_results.rhtml
@@ -1,31 +1,54 @@
-<p>The voting rolls for the last election are are follows.</p>
+<% %>
 
-<h2>Voters</h2>
-<table>
-<% for voter in @voting_rolls.randomize %>
+<h2>Result</h2>
+
+<%= render_partial 'winner' %>
+
+<h2>Result Details</h2>
+
+<%= render_partial 'winner_details' %>
+
+<h2>Election Rolls for Voter Verification</h2>
+
+<p>The voting rolls -- displayed here in alphabetical order -- for the
+last election are are follows.</p>
+
+<p>Information is displayed here to help voters verify that their own
+vote was recorded correctly and that the election was not tampered
+with.</p>
+
+<h3>Voters</h3>
+<table border="1">
+<th>Voters (A-Z)</th>
+<% for email in @voter_list %>
 <tr>
-<td><%= voter.email %></td>
+<td><%= email %></td>
 </tr>
 <% end %>
 </table>
 
-<h2>Votes (by Token)</h2>
+<h3>Votes by Token</h3>
+
+<p>The votes, listed in alphabetical order by token.</p>
+
 <table border="1">
 <tr>
-  <th rowspan="2">Token</th>
+  <th rowspan="2">Token (0-9, A-Z)</th>
   <th colspan="<%= @election.candidates.length %>">Rank of Candidates</th>
 </tr>
 <tr>
-<% for candidate in @election.candidates.sort %>
+
+<% for candidate in @election.candidates.sort.reverse %>
   <th><%= candidate %></th>
 <% end %>
+
 </tr>
-<% for voter in @voting_rolls.randomize %>
-<tr>
-<td><%= voter.vote.token %></td>
-<% for ranking in voter.vote %>
-<td><%= ranking %></td>
-<% end %>
-</tr>
+<% for vote in @vote_list %>
+  <tr>
+  <td><%= vote.token %></td>
+  <% for ranking in vote.rankings %>
+    <td><%= ranking %></td>
+  <% end %>
+  </tr>
 <% end %>
 </table>