Created a partial to DRY the aja voting method. Modified the voter class to

[selectricity-live] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 4ad8bacb354b5cac24a320b994f74427d2809a23..fa1313cb68cecdd0f06d8c5c8ff14f9004f8ab9c 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -16,6 +16,8 @@ class ElectionController < ApplicationController
   end
   
   def general_information
+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'overview' }
     @election = Election.new
     render :action => 'general_information'
   end
@@ -58,8 +60,8 @@ class ElectionController < ApplicationController
 
   def start_election
     @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>")
     end
@@ -67,20 +69,13 @@ class ElectionController < ApplicationController
     @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
 
@@ -104,13 +99,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
 
@@ -188,7 +183,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
 
@@ -205,7 +200,7 @@ 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