Merge from jdong

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index a0549d40d510fabb9abd71e223a528a29879be48..df0aa7c53631ab968b7d2f6bf963172645ae4f3f 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -1,8 +1,8 @@
 class ElectionController < ApplicationController
   model :raw_voter_list, :voter, :vote, :candidate
-  layout 'vb'
+  layout 'main'
 
-  before_filter :login_required
+  #before_filter :login_required
 
   ## methods for displaying, creating,
   ## and manipulating election overview data
@@ -48,9 +48,16 @@ class ElectionController < ApplicationController
     end
   end
 
-  def destroy
-    election = Election.find(params[:id]).destroy
-    redirect_to :action => 'list'
+  def start_election
+    @election = Election.find(params[:id])
+    
+    @election.voters.each do |voter|
+      email = VoterNotify.deliver_votestart(voter)
+      #render(:text => "<pre>" + email.encoded + "</pre>")
+    end
+
+    @election.activate!
+    redirect_to :action => 'show', :id => @election.id
   end
 
   # methods fod display, adding, deleting, and manipulating candidate
@@ -97,12 +104,12 @@ class ElectionController < ApplicationController
 
   def update_candidate
     @candidate = Candidate.find(params[:id])
+    @election = @candidate.election
 
     if @candidate.update_attributes(params[:candidate])
-      flash[:notice] = 'Candidate information was successfully updated.'
-      redirect_to :action => 'edit_candidates', :id => @candidate.election
+      redirect_to :action => 'edit_candidates', :id => @candidate.election.id
     else
-      render :action => 'edit_candidates'
+      render :action => 'edit_candidate'
     end
   end
 
@@ -189,15 +196,15 @@ 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
+               new_voter.save
           @election.voters << new_voter
         end
       end
@@ -207,7 +214,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