X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/fc0a6a8d7ea15bcdb27ebdd58721401c7045c6e0..597c27db39d8b36e623a9d6573e75edf657142c0:/app/views/quickvote/results.rhtml diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml old mode 100755 new mode 100644 index ef2ffd9..98a71e5 --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@ -1,4 +1,4 @@ -<% %> +<%require 'IPAddr' %>

Results

<% if @election.shortdesc %> @@ -21,14 +21,14 @@

Number of voters:

- <%= @election.voters.length %> (see below for details) + <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details)

Winners

Schulze Method Results

-<%= render :partial => 'result', :object => @ssd_result %> +<%= render :partial => 'result', :object => @election.ssd_result %>
About the Schulze Method @@ -47,7 +47,7 @@ Beatpath Winner, Path Voting, and Path Winner.

Plurality Results

-<%= render :partial => 'result', :object => @plurality_result %> +<%= render :partial => 'result', :object => @election.plurality_result %>
About Plurality Voting @@ -67,7 +67,7 @@ voting.

Approval Result

(This algorithm assumes that top two choices are "approved.")

-<%= render :partial => 'result', :object => @approval_result %> +<%= render :partial => 'result', :object => @election.approval_result %>
About Approval Voting @@ -85,7 +85,7 @@ accept or not.

Simple Condorcet Results

-<%= render :partial => 'result', :object => @condorcet_result %> +<%= render :partial => 'result', :object => @election.condorcet_result %>
About Simple Cordorcet Voting @@ -105,7 +105,7 @@ another Condorcet system.

Borda Count Results

-<%= render :partial => 'result', :object => @borda_result %> +<%= render :partial => 'result', :object => @election.borda_result %>
About Borda Count @@ -156,8 +156,20 @@ by several other names.

<% next unless voter.voted? %> <%= voter.ipaddress %> - <%= `host #{voter.ipaddress}`.sub(/^.*pointer (.*)\.$/, '\1') %> + <% begin %> + <%= `host #{IPAddr.new(voter.ipaddress).to_s}`.sub(/^.*pointer (.*)\.$/, '\1') %> + + <% rescue ArgumentError => err %> + <%= " - " %> + <% end %> + <%= voter.vote.votestring %> <% end %> + +<%= image_tag( graph_url( :action => 'votes_per_day', :id => @election ) ) %>
+<%= image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
+<%= image_tag( graph_url( :action => 'borda_bar', :id => @election ) ) %>
+<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %> +