merged changes back from live

[selectricity-live] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 9574056f0c6477b1499829efbab787caed589264..acf47ccd94e4fb928ab4eb0f6afac4d331d4a025 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -1,44 +1,53 @@
 class ElectionController < ApplicationController
 class ElectionController < ApplicationController

-  model :raw_voter_list, :voter, :vote, :candidate
-
-  before_filter :login_required
-
-  ## general methods for dealing with elections
-  ####################################################################
-  def index
-    list
-    render :action => 'list'
-  end
-
-  def list
-    @election_pages, @elections = paginate :elections, :per_page => 10
-  end
+  require_dependency "raw_voter_list"
+  require_dependency "voter"
+  require_dependency "vote"
+  require_dependency "candidate"
+  layout 'main'

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

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

   def new
   def new

-    @election = Election.new
+    redirect_to :action => 'general_information'

   end
   
   end
   

-  def edit
-    @election = Election.find(params[:id])
+  def general_information
+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'overview' }
+    @election = Election.new
+    render :action => 'general_information'

   end
   end

-
+  

   def create_election
     @election = Election.new(params[:election])
   def create_election
     @election = Election.new(params[:election])

+    
+    # default options
+    @election.user = session[:user]
+    @election.anonymous = 1
+    @election.startdate = Time.now
+

     if @election.save
       flash[:notice] = 'Election was successfully created.'
     if @election.save
       flash[:notice] = 'Election was successfully created.'

-      redirect_to :action => 'new_candidates', :id => @election.id
+      redirect_to :action => 'edit_candidates', :id => @election.id

     else
     else

-      render :action => 'new'
+      render :action => 'general_information'

     end
   end
     end
   end

+  
+  # 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
+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'review' }
+
+    @election = Election.find(params[:id])
+  end

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


@@ -50,25 +59,37 @@ class ElectionController < ApplicationController
     end
   end
 
     end
   end
 

-  def destroy
-    election = Election.find(params[:id]).destroy
-    redirect_to :action => 'list'
+  def start_election
+    @election = Election.find(params[:id])
+    @election.voters.each do |voter|
+      voter.vote = Vote.new
+      email_voter voter
+    end
+
+    @election.activate!
+    redirect_to :action => 'show', :id => @election.id

   end
 
   # methods fod display, adding, deleting, and manipulating candidate
   # information for elections
   ####################################################################
   end
 
   # methods fod display, adding, deleting, and manipulating candidate
   # information for elections
   ####################################################################

-  def new_candidates
+  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] )
   end
 
   def add_candidate

-    election = Election.find( params[:id] )
-    @candidate = Candidate.new
-    @candidate.name = params[:newcandidate] 
-    @candidate.save
-    election.candidates << @candidate
-    render :partial => 'candidate_line'
+    @election = Election.find(params[:id])
+    @candidate = Candidate.new(params[:candidate])
+    @election.candidates << @candidate
+
+    if @candidate.save
+      @candidate = Candidate.new
+      redirect_to :action => 'edit_candidates', :id => @election.id
+    else
+      render :action => 'edit_candidates', :id => @election.id
+    end

   end
   
   def delete_candidate
   end
   
   def delete_candidate


@@ -76,28 +97,29 @@ class ElectionController < ApplicationController
     candidate.destroy
   end
 
     candidate.destroy
   end
 

-  def edit_candidates
-    @election = Election.find( params[:id] )
+  def candidate_picture
+    candidate = Candidate.find( params[:id] )
+    send_data( candidate.picture.data,
+               :filename => candidate.picture.filename,
+              :type => candidate.picture.filetype,
+              :disposition => 'inline' )

   end
 
   ## methods for displaying, adding, deleting, and manipulating voters
   ## for a particular election
   ####################################################################
   def new_voters
   end
 
   ## methods for displaying, adding, deleting, and manipulating voters
   ## 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
-
+    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
   


@@ -135,7 +157,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
 


@@ -152,20 +174,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
-         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
         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


@@ -173,7 +191,12 @@ class ElectionController < ApplicationController
       @raw_voter_list.email = incoming_voters.email
     end
 
       @raw_voter_list.email = incoming_voters.email
     end
 

-    def email_voter
+    def email_voter(voter=nil)
+      if voter
+        VoterNotify.deliver_votestart(voter)
+        voter.contacted=1
+        voter.save
+      end

     end
 
 end
     end
 
 end