fixed the layout on the account summary page

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

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index 9e88e9e282b048cfe1b0e9177081fc1300424873..a912824ebd25f6baf1539b320077e86004613ff3 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -2,21 +2,11 @@
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# This program is free software. Please see the COPYING file for
+# details.
 
 class VoterController < ApplicationController
+  helper :sparklines
   layout 'main'
   require_dependency "voter"
   require_dependency "vote"
@@ -26,11 +16,13 @@ class VoterController < ApplicationController
     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]
-      
-        @voter = Voter.new unless @voter
+     
+        unless @voter and not @voter.election.kiosk
+          @voter = OpenVoter.new
+        end
 
         @voter.election = @election
         @voter.session_id = session.session_id
@@ -52,7 +44,7 @@ class VoterController < ApplicationController
         @voter.vote = Vote.new 
         @voter.save
       end
-      
+    
       @voter.vote.set_defaults! if @voter.vote.rankings.empty?
 
       # if the election is now finished 
@@ -106,8 +98,8 @@ class VoterController < ApplicationController
   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'
@@ -131,6 +123,8 @@ class VoterController < ApplicationController
       if @voter.election.embeddable? and params[:embed] == "true" \
         and @voter.election.early_results?
         redirect_to :action => :results, :id => @password, :embed => 'true'
+      elsif @voter.election.kiosk and params[:kiosk] = "true"
+        redirect_to :action => "kiosk_ready", :id => @password, :kiosk => true
       else
         render :action => 'thanks'
       end
@@ -186,14 +180,20 @@ class VoterController < ApplicationController
       redirect_to :action => 'index'
     end
   end
-  
+ 
+  def kiosk_ready
+    if not authenticate
+      redirect_to :action => 'index', :kiosk => true
+    end
+  end
+
   private
   def authenticate
     password = params[:id]
     if password == "open"
       election = Election.find(params[:format])
       unless election.authenticated?
-        @voter = Voter.find(:all,
+        @voter = OpenVoter.find(:all,
           :conditions => ["session_id = ? and election_id = ?",
                           session.session_id, election.id])[0]
         @password = "open." + election.id.to_s