cleaned up minor issues from testing embeddable code

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 7040c38c26b7acdb8ee2bc50bacb5a42c16e6909..94c203d104c902de9dd673a3713ad0c2e76a9fa7 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
   ####################################################################


@@ -16,6 +32,8 @@ class ElectionController < ApplicationController
   end
   
   def general_information
   end
   
   def general_information

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

     @election = Election.new
     render :action => 'general_information'
   end
     @election = Election.new
     render :action => 'general_information'
   end


@@ -36,17 +54,13 @@ class ElectionController < ApplicationController
     end
   end
   
     end
   end
   

-  # add filter to verify that the person working on or looking at
+  # TODO add filter to verify that the person working on or looking at

   # something is the owner
   # something is the owner

-  def edit
+  def edit_general_information

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

-
-  def show
-    @election = Election.find(params[:id])
-  end
-
-  def update
+  
+  def update_general_information

     @election = Election.find(params[:id])
     if @election.update_attributes(params[:election])
       flash[:notice] = 'Election was successfully updated.'
     @election = Election.find(params[:id])
     if @election.update_attributes(params[:election])
       flash[:notice] = 'Election was successfully updated.'


@@ -56,12 +70,19 @@ class ElectionController < ApplicationController
     end
   end
 
     end
   end
 

+
+  def show
+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'review' }
+
+    @election = Election.find(params[:id])
+  end
+

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

-    

     @election.voters.each do |voter|
     @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!
     end
 
     @election.activate!


@@ -72,6 +93,8 @@ class ElectionController < ApplicationController
   # information for elections
   ####################################################################
   def edit_candidates
   # information for elections
   ####################################################################
   def edit_candidates

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

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


@@ -81,6 +104,12 @@ class ElectionController < ApplicationController
     @election.candidates << @candidate
 
     if @candidate.save
     @election.candidates << @candidate
 
     if @candidate.save

+      # check to see if they've uploaded a picture
+      if params[:picture][:uploaded_data]
+        picture = Picture.new(params[:picture])
+        @candidate.picture = picture if picture.save
+      end
+

       @candidate = Candidate.new
       redirect_to :action => 'edit_candidates', :id => @election.id
     else
       @candidate = Candidate.new
       redirect_to :action => 'edit_candidates', :id => @election.id
     else


@@ -93,34 +122,6 @@ class ElectionController < ApplicationController
     candidate.destroy
   end
 
     candidate.destroy
   end
 

-  def lessinfo_candidate
-    @show_details = false
-    @candidate = Candidate.find( params[:id] )
-    render :partial => 'candidate_line'
-  end
-
-  def moreinfo_candidate
-    @show_details = true
-    @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,


@@ -133,15 +134,17 @@ 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] )
     end
     @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
   end
   
     @raw_voter_list = RawVoterList.new
   end
   


@@ -149,6 +152,16 @@ class ElectionController < ApplicationController
     voter = Voter.find( params[:id] )
     voter.destroy
   end
     voter = Voter.find( params[:id] )
     voter.destroy
   end

+
+  def toggle_authenticated
+    @election = Election.find(params[:id])
+    if params[:authenticated] == "1"
+      @election.authenticated = true
+    else
+      @election.authenticated = false
+    end
+    @election.save
+  end

   
   ## methods for computing and printing results
   ####################################################################
   
   ## methods for computing and printing results
   ####################################################################


@@ -179,7 +192,7 @@ class ElectionController < ApplicationController
     @election.voters. each do |voter|
       if voter.vote and voter.vote.confirmed?
         @voter_list << voter.email
     @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
 
       end
     end
 


@@ -196,20 +209,16 @@ class ElectionController < ApplicationController
 
       unless incoming_voters.entries.empty?
         incoming_voters.each do |new_voter|
 
       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
           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
         end

+        @election.save

       end
  
       # reset the next time to have a the same default value for emailing
       end
  
       # reset the next time to have a the same default value for emailing


@@ -217,9 +226,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