swap around the recent quickvotes

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index fa1313cb68cecdd0f06d8c5c8ff14f9004f8ab9c..89a2c22ef10e5b4fa588d9235f1651ba74827644 100644 (file)
--- 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
   ####################################################################
@@ -62,8 +60,7 @@ class ElectionController < ApplicationController
     @election = Election.find(params[:id])
     @election.voters.each do |voter|
       voter.vote = Vote.new
-      email = VoterNotify.deliver_votestart(voter)
-      #render(:text => "<pre>" + email.encoded + "</pre>")
+      email_voter voter
     end
 
     @election.activate!
@@ -145,7 +142,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
   
@@ -154,6 +150,14 @@ class ElectionController < ApplicationController
     voter.destroy
   end
   
+  def remind_voter
+    voter_array= FullVoter.find(:all, :conditions => ["email = ?", params[:email]])
+    voter_array.delete_if {|voter| voter.election.active == 0}
+    unless voter_array.empty?
+      VoterNotify.deliver_reminder(voter_array)
+    end
+  end
+  
   ## methods for computing and printing results
   ####################################################################
   def results
@@ -200,20 +204,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
@@ -221,9 +221,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