X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/b47d1fbe36d5aeb9b79d6bbaab035ca448a3c3ef..6ab290219a55a24ff6047d02cf6c9a03dc096195:/app/controllers/election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 5949f56..571b936 100644
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -54,20 +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
+  def edit_general_information
     @election = Election.find(params[:id])
   end
-
-  def show
-    @sidebar_content = render_to_string :partial => 'progress',
-                                        :locals => { :page => 'review' }
-
-    @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.'
@@ -77,11 +70,24 @@ class ElectionController < ApplicationController
     end
   end
 
+
+  def show
+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'review' }
+
+    @election = Election.find(params[:id])
+    if @election.type == QuickVote
+      redirect_to(:controller => 'quickvote', :action => 'index', :ident => @election.id)
+    end
+      
+  end
+
   def start_election
     @election = Election.find(params[:id])
+    
     @election.voters.each do |voter|
       voter.vote = Vote.new
-      email_voter voter
+      email_voter voter unless voter.email.nil?
     end
 
     @election.activate!
@@ -103,6 +109,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
@@ -145,13 +157,23 @@ 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
   ####################################################################
   def results
     @election = Election.find( params[:id] )
     votes = []
-
+    
     @election.voters.each do |voter|
       if voter.vote and voter.vote.confirmed?
         votes << voter.vote.rankings.sort.collect {|vote| vote.candidate_id}
@@ -164,6 +186,7 @@ class ElectionController < ApplicationController
     
     @candidates_by_id = {}
     @election.candidates.each {|cand| @candidates_by_id[cand.id] = cand}
+    
   end
   
   def detailed_results
@@ -172,7 +195,8 @@ class ElectionController < ApplicationController
 
     @voter_list = []
     @vote_list = []
-    @election.voters. each do |voter|
+    
+    @election.voters.each do |voter|
       if voter.vote and voter.vote.confirmed?
         @voter_list << voter.email
 	      @vote_list << voter.vote