merged back from production

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 05a66fff5fef68c273ca0a9c024283a26a0f0a76..5949f567746444df5208f73913263e945a32bc40 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -1,3 +1,21 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+

 class ElectionController < ApplicationController
   require_dependency "raw_voter_list"
   require_dependency "voter"
 class ElectionController < ApplicationController
   require_dependency "raw_voter_list"
   require_dependency "voter"


@@ -5,8 +23,6 @@ class ElectionController < ApplicationController
   require_dependency "candidate"
   layout 'main'
 
   require_dependency "candidate"
   layout 'main'
 

-  #before_filter :login_required
-

   ## methods for displaying, creating,
   ## and manipulating election overview data
   ####################################################################
   ## methods for displaying, creating,
   ## and manipulating election overview data
   ####################################################################


@@ -45,6 +61,9 @@ class ElectionController < ApplicationController
   end
 
   def show
   end
 
   def show

+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'review' }
+

     @election = Election.find(params[:id])
   end
 
     @election = Election.find(params[:id])
   end
 


@@ -62,8 +81,7 @@ class ElectionController < ApplicationController
     @election = Election.find(params[:id])
     @election.voters.each do |voter|
       voter.vote = Vote.new
     @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!
     end
 
     @election.activate!


@@ -97,34 +115,6 @@ class ElectionController < ApplicationController
     candidate.destroy
   end
 
     candidate.destroy
   end
 

-  def lessinfo_candidate
-    @show_details = false
-    @current_candidate = Candidate.find( params[:id] )
-    render :partial => 'candidate_line'
-  end
-
-  def moreinfo_candidate
-    @show_details = true
-    @current_candidate = Candidate.find( params[:id] )
-    render :partial => 'candidate_line'
-  end
-
-  def edit_candidate
-    @candidate = Candidate.find( params[:id] )
-    @election = @candidate.election
-  end
-
-  def update_candidate
-    @candidate = Candidate.find(params[:id])
-    @election = @candidate.election
-
-    if @candidate.update_attributes(params[:candidate])
-      redirect_to :action => 'edit_candidates', :id => @candidate.election.id
-    else
-      render :action => 'edit_candidate'
-    end
-  end
-

   def candidate_picture
     candidate = Candidate.find( params[:id] )
     send_data( candidate.picture.data,
   def candidate_picture
     candidate = Candidate.find( params[:id] )
     send_data( candidate.picture.data,


@@ -137,10 +127,13 @@ class ElectionController < ApplicationController
   ## for a particular election
   ####################################################################
   def new_voters
   ## for a particular election
   ####################################################################
   def new_voters

-    edit_voters
+    redirect_to :action => 'edit_voters', :id => params[:id]

   end
   
   def edit_voters
   end
   
   def edit_voters

+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'voters' }
+

     @election = Election.find( params[:id] )
     if params.has_key?( :raw_voter_list )
       process_incoming_voters( params[:raw_voter_list] )
     @election = Election.find( params[:id] )
     if params.has_key?( :raw_voter_list )
       process_incoming_voters( params[:raw_voter_list] )


@@ -201,14 +194,6 @@ class ElectionController < ApplicationController
         incoming_voters.each do |new_voter|
           new_voter.email.strip! # There's a trailing \r on all but the last in
                                  # the list!
         incoming_voters.each do |new_voter|
           new_voter.email.strip! # There's a trailing \r on all but the last in
                                  # the list!

-          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

           if new_voter.valid?
             # the new voter should be in good shape. save add to the election
             @election.voters << new_voter
           if new_voter.valid?
             # the new voter should be in good shape. save add to the election
             @election.voters << new_voter


@@ -224,9 +209,11 @@ class ElectionController < ApplicationController
       @raw_voter_list.email = incoming_voters.email
     end
 
       @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
 
       end
     end