merged changes back from live

[selectricity-live] / app / controllers / voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index f4e0e7e7d782e9d67c13518d15758f616b8c9764..ac57f1b6d7d9d2fa6895f4f3ce35e001bfbf93e7 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -5,25 +5,75 @@ class VoterController < ApplicationController
   require_dependency "election"
 
   def index
-    password = params[:id]
-    password = params[:vote][:password] if params[:vote]
-    if @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0]
-      render :action => 'fullvote'
+    if params[:urlpassword]
+      password = params[:urlpassword]
+
+      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?
+
+        @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
+
+  def login
+    if params[:vote] and params[:vote][:password]
+      redirect_to votepassword_url( :action => 'index', :urlpassword => params[:vote][:password])
+    else
+      redirect_to :action => 'index'
     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
-      # remove any existing votes and reload
-      if @voter.vote
-        @voter.vote.destroy
-        @voter.reload
-      end
-    
-      @vote = Vote.new
-      @voter.vote = @vote
-      @vote.votestring = params[:vote][:votestring] 
-      @vote.save
+      @voter.vote.time = Time.now
+      @voter.vote.save
+      @voter.reload
     else
       redirect_to :action => 'index'
     end
@@ -37,7 +87,19 @@ class VoterController < ApplicationController
       redirect_to :action => 'index'
     end
   end
-
+  
+  def reminder
+    if params[:email]
+      voter_array= FullVoter.find(:all, :conditions => ["email = ?", params[:email]])
+      voter_array.delete_if {|voter| voter.election.active == 0}
+      unless voter_array.empty?
+        VoterNotify.deliver_reminder(voter_array)
+      end
+      render :action => 'reminder_sent'
+    end
+  end
+  
+  
   private
   def authenticate
     password = params[:id]