Refined the CSS and fixed some of the more recent issues.

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index d3332948b4398a197ca8280d69ec8db351ea7be2..570f1fc3687a4162428555d06829544074d74b93 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -12,7 +12,14 @@ class ElectionController < ApplicationController
   ####################################################################
 
   def new
   ####################################################################
 
   def new

+    redirect_to :action => 'general_information'
+  end
+  
+  def general_information
+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'overview' }

     @election = Election.new
     @election = Election.new

+    render :action => 'general_information'

   end
   
   def create_election
   end
   
   def create_election


@@ -27,7 +34,7 @@ class ElectionController < ApplicationController
       flash[:notice] = 'Election was successfully created.'
       redirect_to :action => 'edit_candidates', :id => @election.id
     else
       flash[:notice] = 'Election was successfully created.'
       redirect_to :action => 'edit_candidates', :id => @election.id
     else

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

     end
   end
   
     end
   end
   


@@ -62,20 +69,31 @@ class ElectionController < ApplicationController
     @election.activate!
     redirect_to :action => 'show', :id => @election.id
   end
     @election.activate!
     redirect_to :action => 'show', :id => @election.id
   end

+  
+  def change_notices
+    election = Election.find(params[:id])
+    if election.notices == 0
+      election.notices = 1 
+    else
+      election.notices = 0
+    end
+  end

 
   # methods fod display, adding, deleting, and manipulating candidate
   # information for elections
   ####################################################################
   def edit_candidates
 
   # methods fod display, adding, deleting, and manipulating candidate
   # information for elections
   ####################################################################
   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])
     @candidate = Candidate.new(params[:candidate])
     @election = Election.find( params[:id] )
   end
 
   def add_candidate
     @election = Election.find(params[:id])
     @candidate = Candidate.new(params[:candidate])

-    
+    @election.candidates << @candidate
+

     if @candidate.save
     if @candidate.save

-      @election.candidates << @candidate

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


@@ -118,9 +136,9 @@ class ElectionController < ApplicationController
 
   def candidate_picture
     candidate = Candidate.find( params[:id] )
 
   def candidate_picture
     candidate = Candidate.find( params[:id] )

-    send_data( candidate.picture_data,
-               :filename => candidate.picture_filename,
-              :type => candidate.picture_type,
+    send_data( candidate.picture.data,
+               :filename => candidate.picture.filename,
+              :type => candidate.picture.filetype,

               :disposition => 'inline' )
   end
 
               :disposition => 'inline' )
   end
 


@@ -128,12 +146,7 @@ class ElectionController < ApplicationController
   ## for a particular election
   ####################################################################
   def new_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
-
+    edit_voters

   end
   
   def edit_voters
   end
   
   def edit_voters


@@ -207,8 +220,8 @@ class ElectionController < ApplicationController
           end
        
           # the new voter should be in good shape. save add to the election
           end
        
           # the new voter should be in good shape. save add to the election

-               new_voter.save

           @election.voters << new_voter
           @election.voters << new_voter

+               new_voter.save

         end
       end
  
         end
       end