cleaned up minor issues from testing embeddable code

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

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index 868bc4c7d2b994970bb17c0676651b06e9df0a97..cdc045da05c3e680d425918a7c0670685590eff5 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -23,34 +23,48 @@ class VoterController < ApplicationController
   require_dependency "election"
 
   def index
   require_dependency "election"
 
   def index

-    if params[:urlpassword]
+    if params[:election_id]
+      @election = Election.find(params[:election_id])
+      unless @election.authenticated?
+        @voter = Voter.find(:all,
+          :conditions => ["session_id = ? and election_id = ?",
+          session.session_id, @election.id])[0]
+      
+        @voter = Voter.new unless @voter
+
+        @voter.election = @election
+        @voter.session_id = session.session_id
+        @password = "open." + @election.id.to_s
+      end
+    elsif params[:urlpassword]

       password = params[:urlpassword]
 
       if @voter = FullVoter.find(:all,
         :conditions => [ "password = ?", password ] )[0]
       password = params[:urlpassword]
 
       if @voter = FullVoter.find(:all,
         :conditions => [ "password = ?", password ] )[0]

+        @election = @voter.election
+        @password = @voter.password
+      end
+    end

 
 

-        @voter.vote = Vote.new if @voter.vote.nil?
-        @voter.vote.set_defaults! if @voter.vote.rankings.empty?
+    if @voter and @election
+      # initialize things if the vote is blank
+      if @voter.vote.nil?
+        @voter.vote = Vote.new 
+        @voter.save
+      end
+      
+      @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'
+      # if the election is now finished 
+      if @election.enddate < Time.now
+        redirect_to :action => :results, :id => @password
+      else
+        @sidebar_content = render_to_string(:partial => 'vote_sidebar')
+        if @election.embeddable? and params[:embed] == "true"
+          render :template => 'embed/full_vote', :layout => 'embed'

         else
         else

-          @sidebar_content = render_to_string(:partial => 'vote_sidebar')

           render :action => 'full_vote'
         end
           render :action => 'full_vote'
         end

-      elsif params[:urlpassword] 
-        redirect_to :action => 'index'

       end
     end
   end
       end
     end
   end


@@ -100,7 +114,13 @@ class VoterController < ApplicationController
   def confirm
     if authenticate
       @voter.vote.confirm!
   def confirm
     if authenticate
       @voter.vote.confirm!

-      render :action => 'thanks'
+
+      if @voter.election.embeddable? and params[:embed] == "true" \
+        and @voter.election.early_results?
+        redirect_to :action => :results, :id => @password, :embed => 'true'
+      else
+        render :action => 'thanks'
+      end

     else
       redirect_to :action => 'index'
     end
     else
       redirect_to :action => 'index'
     end


@@ -117,11 +137,47 @@ class VoterController < ApplicationController
     end
   end
   
     end
   end
   

+  def results
+    if authenticate and
+      (@voter.election.early_results? \
+       or @voter.election.enddate < Time.now)
+      
+      @election = @voter.election
+      # 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')
+      if @election.embeddable? and params[:embed] == "true"
+        render :template => 'embed/results', :layout => 'embed'
+      else
+        render :action => 'results'
+      end
+    else
+      redirect_to :action => 'index'
+    end
+  end

   
   private
   def authenticate
     password = params[:id]
   
   private
   def authenticate
     password = params[:id]

-    @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0]
+    if password == "open"
+      election = Election.find(params[:format])
+      unless election.authenticated?
+        @voter = Voter.find(:all,
+          :conditions => ["session_id = ? and election_id = ?",
+                          session.session_id, election.id])[0]
+        @password = "open." + election.id.to_s
+      end
+    else
+      @voter = FullVoter.find(:all,
+        :conditions => [ "password = ?", password ] )[0]
+      @password = @voter.password
+    end
+    @voter

   end
 end
 
   end
 end