X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/34fe63727a8929d7e9c529feee1f0c1e827acdfa..bf220bde847fd30e9bf0d00dd7c9aff31265c810:/app/controllers/election_controller.rb?ds=sidebyside

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 3a43c8e..eff920f 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
   
@@ -50,10 +60,9 @@ 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!
@@ -64,15 +73,17 @@ class ElectionController < ApplicationController
   # 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
@@ -87,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
 
@@ -115,9 +126,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
 
@@ -125,12 +136,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
@@ -138,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
   
@@ -176,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
 
@@ -193,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
-	  end
-	
-          # the new voter should be in good shape. save add to the election
-	  new_voter.save
-          @election.voters << new_voter
+          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
+          # 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
@@ -214,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