updated db schema

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

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index d7f589db7f9d0b1d2e62d4806e11db686fd67ed3..9ba619c918a3f1e1a0858f8ba962984929b17c1d 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -2,19 +2,8 @@
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #
 # 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
 
 class VoterController < ApplicationController
   helper :sparklines


@@ -30,7 +19,7 @@ class VoterController < ApplicationController
         @voter = OpenVoter.find(:all,
           :conditions => ["session_id = ? and election_id = ?",
           session.session_id, @election.id])[0]
         @voter = OpenVoter.find(:all,
           :conditions => ["session_id = ? and election_id = ?",
           session.session_id, @election.id])[0]

-      
+     

         @voter = OpenVoter.new unless @voter
 
         @voter.election = @election
         @voter = OpenVoter.new unless @voter
 
         @voter.election = @election


@@ -132,6 +121,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'
       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
       else
         render :action => 'thanks'
       end


@@ -187,18 +178,41 @@ class VoterController < ApplicationController
       redirect_to :action => 'index'
     end
   end
       redirect_to :action => 'index'
     end
   end

-  
+ 
+  def kiosk_ready
+    reset_session
+
+    if not authenticate
+      redirect_to :action => 'index'
+    end
+  end
+

   private
   def authenticate
     password = params[:id]
     if password == "open"
       election = Election.find(params[:format])
   private
   def authenticate
     password = params[:id]
     if password == "open"
       election = Election.find(params[:format])

+
+      # check to see if the person has voted before

       unless election.authenticated?
         @voter = OpenVoter.find(:all,
           :conditions => ["session_id = ? and election_id = ?",
                           session.session_id, election.id])[0]
         @password = "open." + election.id.to_s
       end
       unless election.authenticated?
         @voter = OpenVoter.find(:all,
           :conditions => ["session_id = ? and election_id = ?",
                           session.session_id, election.id])[0]
         @password = "open." + election.id.to_s
       end

+
+      # if it's ready for kiosk_mode, then we create and authenticate
+      unless @voter and params[:action] == 'kiosk_ready' \
+        and election.kiosk
+       
+        # this is maybe not quite as a dry as it should be
+        @voter = OpenVoter.new unless @voter
+
+        @voter.election = election
+        @voter.session_id = session.session_id
+        @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]