X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/607f3a343ea400e558cc47a7c6dc508f9bafcfd2..c5d48f6ea92e43f07182d20ebe693692b4330437:/app/controllers/election_controller.rb?ds=sidebyside diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb index 7145d3d..570f1fc 100644 --- a/app/controllers/election_controller.rb +++ b/app/controllers/election_controller.rb @@ -1,15 +1,25 @@ class ElectionController < ApplicationController - model :raw_voter_list, :voter, :vote, :candidate - layout 'hc' + require_dependency "raw_voter_list" + require_dependency "voter" + require_dependency "vote" + require_dependency "candidate" + layout 'main' - before_filter :login_required + #before_filter :login_required ## methods for displaying, creating, ## and manipulating election overview data #################################################################### def new + redirect_to :action => 'general_information' + end + + def general_information + @sidebar_content = render_to_string :partial => 'progress', + :locals => { :page => 'overview' } @election = Election.new + render :action => 'general_information' end def create_election @@ -24,7 +34,7 @@ class ElectionController < ApplicationController flash[:notice] = 'Election was successfully created.' redirect_to :action => 'edit_candidates', :id => @election.id else - render :action => 'new' + render :action => 'general_information' end end @@ -52,26 +62,38 @@ class ElectionController < ApplicationController @election = Election.find(params[:id]) @election.voters.each do |voter| - email = VoterNotify.create_votestart(voter) - render(:text => "
" + email.encoded + "
") + email = VoterNotify.deliver_votestart(voter) + #render(:text => "
" + email.encoded + "
") end - #@election.activate! + @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 #################################################################### def edit_candidates + @sidebar_content = render_to_string :partial => 'progress', + :locals => { :page => 'candidates' } @election = Election.find( params[:id] ) end def add_candidate @election = Election.find(params[:id]) @candidate = Candidate.new(params[:candidate]) - + @election.candidates << @candidate + if @candidate.save - @election.candidates << @candidate @candidate = Candidate.new redirect_to :action => 'edit_candidates', :id => @election.id else @@ -114,9 +136,9 @@ class ElectionController < ApplicationController def candidate_picture candidate = Candidate.find( params[:id] ) - send_data( candidate.picture_data, - :filename => candidate.picture_filename, - :type => candidate.picture_type, + send_data( candidate.picture.data, + :filename => candidate.picture.filename, + :type => candidate.picture.filetype, :disposition => 'inline' ) end @@ -124,12 +146,7 @@ class ElectionController < ApplicationController ## for a particular election #################################################################### def new_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 - + edit_voters end def edit_voters @@ -195,16 +212,16 @@ class ElectionController < ApplicationController 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 + 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 - new_voter.save @election.voters << new_voter + new_voter.save end end @@ -213,7 +230,10 @@ class ElectionController < ApplicationController @raw_voter_list.email = incoming_voters.email end - def email_voter + def email_voter(email=nil) + if email + + end end end