fixed some typos caught in the first usage

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

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
old mode 100755 (executable)
new mode 100644 (file)
index 0e03a52..461be29
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -1,29 +1,42 @@
 class VoterController < ApplicationController
-  layout 'hc'
-  model :voter
-  model :vote
-  model :election
+  layout 'main'
+  require_dependency "voter"
+  require_dependency "vote"
+  require_dependency "election"
 
   def index
-    password = params[:id]
-    password = params[:vote][:password] if params[:vote]
-    if @voter = FullVoter.find_all( [ "password = ?", password ] )[0]
-      render :action => 'fullvote'
+    if params[:urlpassword]
+      password = params[:urlpassword]
+    else
+      password = nil
+    end
+
+    if @voter = FullVoter.find(:all, :conditions =>
+                                       [ "password = ?", password ] )[0]
+      @voter.vote = Vote.new if @voter.vote.nil?
+      @voter.vote.set_defaults! if @voter.vote.rankings.empty?
+
+      @election = @voter.election
+      @sidebar_content = render_to_string(:partial => 'sortable_vote')
+      render :action => 'full_vote'
+    elsif params[:urlpassword] 
+      redirect_to :action => 'index'
+    end
+  end
+
+  def login
+    if params[:vote] and params[:vote][:password]
+      redirect_to votepassword_url( :action => 'index', :urlpassword => params[:vote][:password])
+    else
+      redirect_to :action => 'index'
     end
   end
   
   def review
     if authenticate
-      # remove any existing votes and reload
-      if @voter.vote
-        @voter.vote.destroy
-        @voter.reload
-      end
-    
-      @vote = Vote.new
-      @voter.vote = @vote
-      @vote.votestring = params[:vote][:votestring] 
-      @vote.save
+      @voter.vote.time = Time.now
+      @voter.vote.save
+      @voter.reload
     else
       redirect_to :action => 'index'
     end
@@ -37,11 +50,23 @@ class VoterController < ApplicationController
       redirect_to :action => 'index'
     end
   end
-
+  
+  def reminder
+    if params[:email]
+      voter_array= FullVoter.find(:all, :conditions => ["email = ?", params[:email]])
+      voter_array.delete_if {|voter| voter.election.active == 0}
+      unless voter_array.empty?
+        VoterNotify.deliver_reminder(voter_array)
+      end
+      render :action => 'reminder_sent'
+    end
+  end
+  
+  
   private
   def authenticate
     password = params[:id]
-    @voter = FullVoter.find_all( [ "password = ?", password ] )[0]
+    @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0]
   end
 end