Created a user "summary/profile page". Also corected several minor typos on election...

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index a0549d40d510fabb9abd71e223a528a29879be48..4ad8bacb354b5cac24a320b994f74427d2809a23 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -1,15 +1,23 @@
 class ElectionController < ApplicationController
 class ElectionController < ApplicationController

-  model :raw_voter_list, :voter, :vote, :candidate
-  layout 'vb'
+  require_dependency "raw_voter_list"
+  require_dependency "voter"
+  require_dependency "vote"
+  require_dependency "candidate"
+  layout 'main'

 
 

-  before_filter :login_required
+  #before_filter :login_required

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

+    redirect_to :action => 'general_information'
+  end
+  
+  def general_information

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

+    render :action => 'general_information'

   end
   
   def create_election
   end
   
   def create_election


@@ -24,7 +32,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
   


@@ -48,9 +56,25 @@ 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|
+      email = VoterNotify.deliver_votestart(voter)
+      #render(:text => "<pre>" + email.encoded + "</pre>")
+    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
   end
 
   # methods fod display, adding, deleting, and manipulating candidate


@@ -63,9 +87,9 @@ class ElectionController < ApplicationController
   def add_candidate
     @election = Election.find(params[:id])
     @candidate = Candidate.new(params[:candidate])
   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


@@ -97,20 +121,20 @@ class ElectionController < ApplicationController
 
   def update_candidate
     @candidate = Candidate.find(params[:id])
 
   def update_candidate
     @candidate = Candidate.find(params[:id])

+    @election = @candidate.election

 
     if @candidate.update_attributes(params[:candidate])
 
     if @candidate.update_attributes(params[:candidate])

-      flash[:notice] = 'Candidate information was successfully updated.'
-      redirect_to :action => 'edit_candidates', :id => @candidate.election
+      redirect_to :action => 'edit_candidates', :id => @candidate.election.id

     else
     else

-      render :action => 'edit_candidates'
+      render :action => 'edit_candidate'

     end
   end
 
   def candidate_picture
     candidate = Candidate.find( params[:id] )
     end
   end
 
   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
 


@@ -118,12 +142,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


@@ -189,16 +208,16 @@ class ElectionController < ApplicationController
 
           if incoming_voters.email == 0
             new_voter.contacted = 1
 
           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
+               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
        
           # 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
  


@@ -207,7 +226,10 @@ 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(email=nil)
+      if email
+        
+      end

     end
 
 end
     end
 
 end