Merge refactor

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

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 10815b3c590ac19af542240d3cf8ec6d420cb9e9..acbf012ff5cb3df503371f59f4b8d71c466e567f 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -1,5 +1,5 @@
 class QuickvoteController < ApplicationController
 class QuickvoteController < ApplicationController

-  layout 'hc'
+  layout 'main'

   model :quick_voter
   model :quick_vote
   model :vote
   model :quick_voter
   model :quick_vote
   model :vote


@@ -12,7 +12,7 @@ class QuickvoteController < ApplicationController
   def create
     if params[:quickvote] 
       @quickvote = QuickVote.new(params[:quickvote])
   def create
     if params[:quickvote] 
       @quickvote = QuickVote.new(params[:quickvote])

-
+     

       # store the candidate grabbed through ajax and stored in flash
       @quickvote.candidatelist = flash[:candlist]
 
       # store the candidate grabbed through ajax and stored in flash
       @quickvote.candidatelist = flash[:candlist]
 


@@ -49,7 +49,7 @@ class QuickvoteController < ApplicationController
   #############################################################
 
   def index
   #############################################################
 
   def index

-    @election = QuickVote.find_all(["name = ?", params[:votename]])[0]
+    @election = ident_to_quickvote(params[:ident])

     
     # if the person has specified an election, we show them the voting
     # page. otherwise, we redirect back to main the page
     
     # if the person has specified an election, we show them the voting
     # page. otherwise, we redirect back to main the page


@@ -63,7 +63,7 @@ class QuickvoteController < ApplicationController
       # if the voter has not voted we destroy them
       if @voter and not @voter.voted?
         @voter.destroy
       # if the voter has not voted we destroy them
       if @voter and not @voter.voted?
         @voter.destroy

-       @voter = nil
+       @voter = nil

       end
 
       # if the voter does not exist or has has been destroyed, lets
       end
 
       # if the voter does not exist or has has been destroyed, lets


@@ -71,14 +71,14 @@ class QuickvoteController < ApplicationController
       unless @voter
         # create a new voter and populate it
         @voter = QuickVoter.new
       unless @voter
         # create a new voter and populate it
         @voter = QuickVoter.new

-        @voter.election = QuickVote.find_all( [ "name = ?", params[:votename] ] )[0]
+        @voter.election = @election

         @voter.session_id = session.session_id
         @voter.session_id = session.session_id

-
-       # create new vote and make it the defaulted sorted list
+        
+             # create new vote and make it the defaulted sorted list

         @voter.vote = Vote.new
         @voter.vote = Vote.new

-       @voter.save
-       @voter.vote.set_defaults!
-       @voter.reload
+             @voter.save
+             @voter.vote.set_defaults!
+             @voter.reload

       end
     else
       redirect_to :controller => 'site'
       end
     else
       redirect_to :controller => 'site'


@@ -87,29 +87,33 @@ class QuickvoteController < ApplicationController
 
   def confirm
     # we need the election to verify that we have the right voter
 
   def confirm
     # we need the election to verify that we have the right voter

-    election = QuickVote.find_all( [ "name = ?", params[:votename] ] )[0]
+    election = ident_to_quickvote(params[:ident])

 
     # find out who the voter is for this election
     @voter = QuickVoter.find_all(["session_id = ? and election_id = ?", 
 
     # find out who the voter is for this election
     @voter = QuickVoter.find_all(["session_id = ? and election_id = ?", 

-                                  session.session_id, election.id])[0]
-
+                                 session.session_id, election.id])[0]
+  

     if not @voter
       # we have not seen this  voter before. something is wrong, try
       # again
     if not @voter
       # we have not seen this  voter before. something is wrong, try
       # again

-      redirect_to quickvote_url( :votename => params[:votename] ) 
+      redirect_to quickvote_url( :ident => params[:ident] ) 

       
       

-    elsif @voter.voted?
+    elsif @voter.voted? 

       # this person has already voted, we try again
       flash[:notice] = "You have already voted!"
       # this person has already voted, we try again
       flash[:notice] = "You have already voted!"

-      redirect_to quickvote_url( :votename => params[:votename] )
+      redirect_to quickvote_url( :ident => params[:ident] )

       
     else
       # record the ip address for posterity
       
     else
       # record the ip address for posterity

-      @voter.ipaddress = request.env["HTTP_X_FORWARDED_FOR"]
+      @voter.ipaddress = request.env["REMOTE_ADDR"]

       @voter.save
       
       @voter.save
       

-      # toggle the confirmation bit
+      # save the time the vote was made for statistical use
+      @voter.vote.time = Time.now
+      
+      # toggle the confirmation bit      

       @voter.vote.confirm!
       @voter.vote.confirm!

+     

       @voter.reload
       render :action => 'thanks'
     end
       @voter.reload
       render :action => 'thanks'
     end


@@ -118,7 +122,7 @@ class QuickvoteController < ApplicationController
   def change
     voter = QuickVoter.find_all(["session_id = ?", session.session_id])[0]
     voter.destroy
   def change
     voter = QuickVoter.find_all(["session_id = ?", session.session_id])[0]
     voter.destroy

-    redirect_to quickvote_url( :votename => params[:votename] )
+    redirect_to quickvote_url( :ident => params[:ident] )

   end
 
   def sort_candidates
   end
 
   def sort_candidates


@@ -138,35 +142,21 @@ class QuickvoteController < ApplicationController
   ###############################################################
 
   def results
   ###############################################################
 
   def results

-    @election = QuickVote.find_all( ["name = ?", params[:votename]] )[0]
-
-    # initalize the tallies to empty arrays
-    preference_tally = Array.new
-    plurality_tally = Array.new
-    approval_tally = Array.new
+    @election = ident_to_quickvote(params[:ident])
+    @election.results
+    @candidates = {}
+    @election.candidates.each {|c| @candidates[c.id] = c}
+  end

 
 

-    @election.voters.each do |voter|
-      # skip if the voter has not voted or has an unconfirmed vote
-      next unless voter.voted?
-      
-      plurality_tally << voter.vote.rankings.sort[0].candidate.id
-      approval_tally << voter.vote.rankings.sort[0..1].collect \
-        { |ranking| ranking.candidate.id }
-      preference_tally << voter.vote.rankings.sort.collect \
-        { |ranking| ranking.candidate.id }
+  private
+  def ident_to_quickvote(ident)
+    if ident.match(/^\d+$/)
+      quickvote = QuickVote.find(ident)
+    else
+      quickvote = QuickVote.find_all(["name = ?", ident])[0]

     end
     end

- 
-    @plurality_result = PluralityVote.new(plurality_tally).result
-    @approval_result = ApprovalVote.new(approval_tally).result
-    @condorcet_result = PureCondorcetVote.new(preference_tally).result
-    @ssd_result = CloneproofSSDVote.new(preference_tally).result
-    @borda_result = BordaVote.new(preference_tally).result
-    #@runoff_result = InstantRunoffVote.new(preference_tally).result
-    #@runoff_results = PluralityVote.new(preference_tally).result
-

 
 

-    @candidates = {} 
-    @election.candidates.each {|c| @candidates[c.id] = c}
+    return quickvote

   end
 
 end
   end
 
 end