spelling and superficial errors

[selectricity] / app / controllers / voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index 461be29d252d480831413544e449e66bb2d024da..ac57f1b6d7d9d2fa6895f4f3ce35e001bfbf93e7 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -7,20 +7,33 @@ class VoterController < ApplicationController
   def index
     if params[:urlpassword]
       password = params[:urlpassword]
-    else
-      password = nil
-    end
 
-    if @voter = FullVoter.find(:all, :conditions =>
-                                       [ "password = ?", password ] )[0]
-      @voter.vote = Vote.new if @voter.vote.nil?
-      @voter.vote.set_defaults! if @voter.vote.rankings.empty?
+      if @voter = FullVoter.find(:all,
+        :conditions => [ "password = ?", password ] )[0]
 
-      @election = @voter.election
-      @sidebar_content = render_to_string(:partial => 'sortable_vote')
-      render :action => 'full_vote'
-    elsif params[:urlpassword] 
-      redirect_to :action => 'index'
+        @voter.vote = Vote.new if @voter.vote.nil?
+        @voter.vote.set_defaults! if @voter.vote.rankings.empty?
+
+        @election = @voter.election
+        
+        # if the election is now finished 
+        if @election.enddate < Time.now
+          # compute and display results
+    
+          @results = @election.results
+          @candidates = {}
+          @election.candidates.each {|c| @candidates[c.id] = c}
+          @names = @election.names_by_id
+          
+          @sidebar_content = render_to_string(:partial => 'results_sidebar')
+          render :action => 'results'
+        else
+          @sidebar_content = render_to_string(:partial => 'vote_sidebar')
+          render :action => 'full_vote'
+        end
+      elsif params[:urlpassword] 
+        redirect_to :action => 'index'
+      end
     end
   end
 
@@ -32,6 +45,30 @@ class VoterController < ApplicationController
     end
   end
   
+  def pref_tables
+    if authenticate
+      @election = @voter.election
+      @results = @election.results
+      @candidates = {}
+      @election.candidates.each {|c| @candidates[c.id] = c}
+      @names = @election.names_by_id
+      render :template => 'common/pref_tables', :layout => 'basic'
+    else
+      redirect_to :action => 'index'
+    end
+  end
+
+  def details
+    if authenticate
+      @election = @voter.election
+      @votes = @election.votes.select {|v| v.confirmed? }.randomize
+      @voters = @votes.collect {|v| v.voter}.randomize
+      render :action => 'details'
+    else
+      redirect_to :action => 'index'
+    end
+  end
+
   def review
     if authenticate
       @voter.vote.time = Time.now