X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/c8404eeb9ad60aa18526c56feff2d26ea161028b..1e8c21d4c4c93721c16a669e330a6d4e60483919:/app/controllers/election_controller.rb?ds=inline diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb index 570f1fc..acf47cc 100644 --- a/app/controllers/election_controller.rb +++ b/app/controllers/election_controller.rb @@ -5,8 +5,6 @@ class ElectionController < ApplicationController require_dependency "candidate" layout 'main' - #before_filter :login_required - ## methods for displaying, creating, ## and manipulating election overview data #################################################################### @@ -45,6 +43,9 @@ class ElectionController < ApplicationController end def show + @sidebar_content = render_to_string :partial => 'progress', + :locals => { :page => 'review' } + @election = Election.find(params[:id]) end @@ -60,24 +61,14 @@ class ElectionController < ApplicationController def start_election @election = Election.find(params[:id]) - @election.voters.each do |voter| - email = VoterNotify.deliver_votestart(voter) - #render(:text => "
" + email.encoded + "") + voter.vote = Vote.new + email_voter voter end @election.activate! redirect_to :action => 'show', :id => @election.id end - - def change_notices - election = Election.find(params[:id]) - if election.notices == 0 - election.notices = 1 - else - election.notices = 0 - end - end # methods fod display, adding, deleting, and manipulating candidate # information for elections @@ -106,34 +97,6 @@ class ElectionController < ApplicationController candidate.destroy end - def lessinfo_candidate - @show_details = false - @candidate = Candidate.find( params[:id] ) - render :partial => 'candidate_line' - end - - def moreinfo_candidate - @show_details = true - @candidate = Candidate.find( params[:id] ) - render :partial => 'candidate_line' - end - - def edit_candidate - @candidate = Candidate.find( params[:id] ) - @election = @candidate.election - end - - def update_candidate - @candidate = Candidate.find(params[:id]) - @election = @candidate.election - - if @candidate.update_attributes(params[:candidate]) - redirect_to :action => 'edit_candidates', :id => @candidate.election.id - else - render :action => 'edit_candidate' - end - end - def candidate_picture candidate = Candidate.find( params[:id] ) send_data( candidate.picture.data, @@ -146,15 +109,17 @@ class ElectionController < ApplicationController ## for a particular election #################################################################### def new_voters - edit_voters + redirect_to :action => 'edit_voters', :id => params[:id] end def edit_voters + @sidebar_content = render_to_string :partial => 'progress', + :locals => { :page => 'voters' } + @election = Election.find( params[:id] ) if params.has_key?( :raw_voter_list ) process_incoming_voters( params[:raw_voter_list] ) end - @raw_voter_list = RawVoterList.new end @@ -192,7 +157,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 @@ -209,20 +174,16 @@ class ElectionController < ApplicationController unless incoming_voters.entries.empty? incoming_voters.each do |new_voter| - - 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 + new_voter.email.strip! # There's a trailing \r on all but the last in + # the list! + 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 - - # the new voter should be in good shape. save add to the election - @election.voters << new_voter - new_voter.save + # 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 @@ -230,9 +191,11 @@ class ElectionController < ApplicationController @raw_voter_list.email = incoming_voters.email end - def email_voter(email=nil) - if email - + def email_voter(voter=nil) + if voter + VoterNotify.deliver_votestart(voter) + voter.contacted=1 + voter.save end end