X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/c5d48f6ea92e43f07182d20ebe693692b4330437..74373452650a5ef7eff91f8c479d23500ace3c0c:/app/controllers/election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 570f1fc..eff920f 100644
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -60,24 +60,14 @@ class ElectionController < ApplicationController
 
   def start_election
     @election = Election.find(params[:id])
-    
     @election.voters.each do |voter|
-      email = VoterNotify.deliver_votestart(voter)
-      #render(:text => "<pre>" + email.encoded + "</pre>")
+      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
@@ -108,13 +98,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
 
@@ -154,7 +144,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
   
@@ -192,7 +181,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 +198,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 +215,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