X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/7b649ccad8804580632c255b9f451482fdbbe32d..a92ebf4fa0498e973d22fb12d63f4e2d5072c5e5:/app/controllers/election_controller.rb diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb index 7040c38..ef51f7d 100644 --- a/app/controllers/election_controller.rb +++ b/app/controllers/election_controller.rb @@ -16,6 +16,8 @@ class ElectionController < ApplicationController end def general_information + @sidebar_content = render_to_string :partial => 'progress', + :locals => { :page => 'overview' } @election = Election.new render :action => 'general_information' end @@ -58,8 +60,8 @@ class ElectionController < ApplicationController def start_election @election = Election.find(params[:id]) - @election.voters.each do |voter| + voter.vote = Vote.new email = VoterNotify.deliver_votestart(voter) #render(:text => "
" + email.encoded + "") end @@ -72,6 +74,8 @@ class ElectionController < ApplicationController # information for elections #################################################################### def edit_candidates + @sidebar_content = render_to_string :partial => 'progress', + :locals => { :page => 'candidates' } @election = Election.find( params[:id] ) end @@ -95,13 +99,13 @@ class ElectionController < ApplicationController def lessinfo_candidate @show_details = false - @candidate = Candidate.find( params[:id] ) + @current_candidate = Candidate.find( params[:id] ) render :partial => 'candidate_line' end def moreinfo_candidate @show_details = true - @candidate = Candidate.find( params[:id] ) + @current_candidate = Candidate.find( params[:id] ) render :partial => 'candidate_line' end @@ -141,7 +145,6 @@ class ElectionController < ApplicationController if params.has_key?( :raw_voter_list ) process_incoming_voters( params[:raw_voter_list] ) end - @raw_voter_list = RawVoterList.new end @@ -179,7 +182,7 @@ class ElectionController < ApplicationController @election.voters. each do |voter| if voter.vote and voter.vote.confirmed? @voter_list << voter.email - @vote_list << voter.vote + @vote_list << voter.vote end end @@ -196,31 +199,27 @@ class ElectionController < ApplicationController unless incoming_voters.entries.empty? incoming_voters.each do |new_voter| - + new_voter.email.strip! # There's a trailing \r on all but the last in + # the list! if incoming_voters.email == 0 new_voter.contacted = 1 elsif incoming_voters.email == 1 - email_voter( new_voter ) new_voter.contacted = 1 else new_voter.contacted = 0 end - - # the new voter should be in good shape. save add to the election - @election.voters << new_voter - new_voter.save + if new_voter.valid? + # the new voter should be in good shape. save add to the election + @election.voters << new_voter + new_voter.save + end + # TODO: Can we do some kind of AJAX error message for the voter being invalid? end + @election.save end # reset the next time to have a the same default value for emailing @raw_voter_list = RawVoterList.new @raw_voter_list.email = incoming_voters.email end - - def email_voter(email=nil) - if email - - end - end - end