X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/ea1af437fff1aed0f71db44b7c19693ef3506059..8145e917e1570f0ef8570261877074a5c9bac46f:/app/controllers/election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index ef51f7d..94c203d 100644
--- 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"
@@ -5,8 +23,6 @@ class ElectionController < ApplicationController
   require_dependency "candidate"
   layout 'main'
 
-  #before_filter :login_required
-
   ## methods for displaying, creating,
   ## and manipulating election overview data
   ####################################################################
@@ -38,17 +54,13 @@ class ElectionController < ApplicationController
     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
-  def edit
-    @election = Election.find(params[:id])
-  end
-
-  def show
+  def edit_general_information
     @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.'
@@ -58,12 +70,19 @@ class ElectionController < ApplicationController
     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])
     @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!
@@ -85,6 +104,12 @@ class ElectionController < ApplicationController
     @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
@@ -97,34 +122,6 @@ class ElectionController < ApplicationController
     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,
@@ -137,10 +134,13 @@ class ElectionController < ApplicationController
   ## for a particular election
   ####################################################################
   def new_voters
-    edit_voters
+    redirect_to :action => 'edit_voters', :id => params[:id]
   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] )
@@ -152,6 +152,16 @@ class ElectionController < ApplicationController
     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
   ####################################################################
@@ -201,13 +211,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!
-          if incoming_voters.email == 0
-            new_voter.contacted = 1
-	        elsif incoming_voters.email == 1
-            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
@@ -222,4 +225,13 @@ class ElectionController < ApplicationController
       @raw_voter_list = RawVoterList.new
       @raw_voter_list.email = incoming_voters.email
     end
+
+    def email_voter(voter=nil)
+      if voter
+        VoterNotify.deliver_votestart(voter)
+        voter.contacted=1
+        voter.save
+      end
+    end
+
 end