X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/adfcf4dd7d989d0560e2a8f6a590dd10c5a49a08..e7bff908a0ea52b62e4fa0dc13be0293a51dcbb1:/app/controllers/voter_controller.rb?ds=sidebyside diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb index cdc045d..9ba619c 100644 --- a/app/controllers/voter_controller.rb +++ b/app/controllers/voter_controller.rb @@ -2,21 +2,11 @@ # Copyright (C) 2007, 2008 Benjamin Mako Hill # 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 -# . +# 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,11 @@ 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 + + @voter = OpenVoter.new unless @voter @voter.election = @election @voter.session_id = session.session_id @@ -52,7 +42,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 @@ -61,6 +51,19 @@ class VoterController < ApplicationController else @sidebar_content = render_to_string(:partial => 'vote_sidebar') if @election.embeddable? and params[:embed] == "true" + #look for custom theme, and assign to instance variabels for widget use + if @election.embed_custom_string + @top_bar = SkinPicture.find(:first, + :conditions => ["filename = ?", @election.embed_custom_string + "top_bar.png"]) + @default_image = SkinPicture.find(:first, + :conditions => ["filename = ?", @election.embed_custom_string + "default_image.png"]) + @bg1 = SkinPicture.find(:first, + :conditions => ["filename = ?", @election.embed_custom_string + "bg1.png"]) + @bg2 = SkinPicture.find(:first, + :conditions => ["filename = ?", @election.embed_custom_string + "bg2.png"]) + @bottom_bar = SkinPicture.find(:first, + :conditions => ["filename = ?", @election.embed_custom_string + "bottom_bar.png"]) + end render :template => 'embed/full_vote', :layout => 'embed' else render :action => 'full_vote' @@ -93,8 +96,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' @@ -118,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' + elsif @voter.election.kiosk and params[:kiosk] = "true" + redirect_to :action => "kiosk_ready", :id => @password, :kiosk => true else render :action => 'thanks' end @@ -151,6 +156,19 @@ class VoterController < ApplicationController @names = @election.names_by_id @sidebar_content = render_to_string(:partial => 'results_sidebar') + #look for custom theme, and assign to instance variabels for widget use + if @election.embed_custom_string + @top_bar = SkinPicture.find(:first, + :conditions => ["filename = ?", @election.embed_custom_string + "top_bar.png"]) + @default_image = SkinPicture.find(:first, + :conditions => ["filename = ?", @election.embed_custom_string + "default_image.png"]) + @bg1 = SkinPicture.find(:first, + :conditions => ["filename = ?", @election.embed_custom_string + "bg1.png"]) + @bg2 = SkinPicture.find(:first, + :conditions => ["filename = ?", @election.embed_custom_string + "bg2.png"]) + @bottom_bar = SkinPicture.find(:first, + :conditions => ["filename = ?", @election.embed_custom_string + "bottom_bar.png"]) + end if @election.embeddable? and params[:embed] == "true" render :template => 'embed/results', :layout => 'embed' else @@ -160,18 +178,41 @@ class VoterController < ApplicationController 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]) + + # check to see if the person has voted before 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 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]