Merge remote branch 'deployment/live' into live

[selectricity] / app / controllers / voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index 9e88e9e282b048cfe1b0e9177081fc1300424873..afc01039b8e535b7733844f44bf0b5429ed64b2e 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -17,6 +17,7 @@
 # <http://www.gnu.org/licenses/>.
 
 class VoterController < ApplicationController
 # <http://www.gnu.org/licenses/>.
 
 class VoterController < ApplicationController

+  helper :sparklines

   layout 'main'
   require_dependency "voter"
   require_dependency "vote"
   layout 'main'
   require_dependency "voter"
   require_dependency "vote"


@@ -26,11 +27,12 @@ class VoterController < ApplicationController
     if params[:election_id]
       @election = Election.find(params[:election_id])
       unless @election.authenticated?
     if params[:election_id]
       @election = Election.find(params[:election_id])
       unless @election.authenticated?

-        @voter = Voter.find(:all,
+        @voter = OpenVoter.find(:all,

           :conditions => ["session_id = ? and election_id = ?",
           session.session_id, @election.id])[0]
       
           :conditions => ["session_id = ? and election_id = ?",
           session.session_id, @election.id])[0]
       

-        @voter = Voter.new unless @voter
+
+        @voter = OpenVoter.new unless @voter

 
         @voter.election = @election
         @voter.session_id = session.session_id
 
         @voter.election = @election
         @voter.session_id = session.session_id


@@ -52,7 +54,7 @@ class VoterController < ApplicationController
         @voter.vote = Vote.new 
         @voter.save
       end
         @voter.vote = Vote.new 
         @voter.save
       end

-      
+    

       @voter.vote.set_defaults! if @voter.vote.rankings.empty?
 
       # if the election is now finished 
       @voter.vote.set_defaults! if @voter.vote.rankings.empty?
 
       # if the election is now finished 


@@ -106,8 +108,8 @@ class VoterController < ApplicationController
   def details
     if authenticate
       @election = @voter.election
   def details
     if authenticate
       @election = @voter.election

-      @votes = @election.votes.select {|v| v.confirmed? }.randomize
-      @voters = @votes.collect {|v| v.voter}.randomize
+      @votes = @election.votes.select {|v| v.confirmed? }.shuffle
+      @voters = @votes.collect {|v| v.voter}.shuffle

       render :action => 'details'
     else
       redirect_to :action => 'index'
       render :action => 'details'
     else
       redirect_to :action => 'index'


@@ -151,6 +153,7 @@ class VoterController < ApplicationController
   end
   
   def results
   end
   
   def results

+    debugger

     if authenticate and
       (@voter.election.early_results? \
        or @voter.election.enddate < Time.now)
     if authenticate and
       (@voter.election.early_results? \
        or @voter.election.enddate < Time.now)


@@ -192,12 +195,22 @@ class VoterController < ApplicationController
     password = params[:id]
     if password == "open"
       election = Election.find(params[:format])
     password = params[:id]
     if password == "open"
       election = Election.find(params[:format])

+
+      # double check to make sure the election is not authenticated

       unless election.authenticated?
       unless election.authenticated?

-        @voter = Voter.find(:all,
+        @voter = OpenVoter.find(:all,

           :conditions => ["session_id = ? and election_id = ?",
                           session.session_id, election.id])[0]
           :conditions => ["session_id = ? and election_id = ?",
                           session.session_id, election.id])[0]

+
+        # if the election is over, proceed
+        if (not @voter) and (election.enddate < Time.now)
+          @voter = OpenVoter.new
+          @voter.election = election
+        end
+

         @password = "open." + election.id.to_s
       end
         @password = "open." + election.id.to_s
       end

+

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