X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/58fb91dde4b0a16c1a764dda66e31bc57565e41f:/app/views/quickvote/_pref_table.rhtml..6a1c545f073430dd46bf5ad89b0450a16c659b00:/app/views/quickvote/_pref_tables.rhtml

diff --git a/app/views/quickvote/_pref_table.rhtml b/app/views/quickvote/_pref_tables.rhtml
similarity index 50%
rename from app/views/quickvote/_pref_table.rhtml
rename to app/views/quickvote/_pref_tables.rhtml
index 011fcbe..66e0cbf 100644
--- a/app/views/quickvote/_pref_table.rhtml
+++ b/app/views/quickvote/_pref_tables.rhtml
@@ -1,17 +1,19 @@
-<% candidates = @election.candidates.sort.collect {|candidate| candidate.id}-%>
+<% candidates = @election.condorcet_result.ranked_candidates.flatten -%>
 <% voters = @election.voters.size %>
 <% matrix = @election.condorcet_result.matrix %>
-<% names = Hash.new -%>
-<% candidates.each do |candidate| -%>
-	<%names[candidate] = Candidate.find(candidate).name -%>
-<% end -%>
+<% victories = @election.condorcet_result.victories_and_ties %>
+<% names = @election.names_by_id %>
+
+
+<!-- This table shows how many times each choice was ranked above the other, 
+	with percentages-->
 <table class="voterbox">
   <tr>
 	<td> </td>
 	<% candidates.each do |candidate| -%>
 	  <th><%=h names[candidate] -%></th>
   <% end -%>
-</tr>
+ </tr>
 
 <% candidates.each do |winner| -%>
   <tr>
@@ -30,3 +32,23 @@
  </tr>
 <% end -%>
 </table>
+
+<!-- This table generates a margin of victory -->
+<table class="voterbox">
+  <% candidates.each do |victor| %>
+  <tr>
+    <th><%=h names[victor] %></th>
+	<% victories[victor].keys.each do |loser| %>
+	<% margin = victories[victor][loser]%>
+	<td><%=h names[loser] %> 
+	    <% if margin == 0%>
+		  Tied!
+		<% else -%>
+		  (<%= margin%>)
+		<% end -%>
+		  </td>
+	<% end -%>
+  </tr>
+  <% end -%>
+</table>
+