* Renamed graphs_controller to graph_controller.

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

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index c897f369f33018bd9c3b5ffec552e20bdc0585ce..c7e52d6b12fc5d9040629bd183069cc9b157b8ff 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


@@ -66,7 +66,7 @@ class QuickvoteController < ApplicationController
        @voter = nil
       end
 
        @voter = nil
       end
 

-      # if the voter does not exist or as has been destroyed, lets
+      # if the voter does not exist or has has been destroyed, lets

       # create a new one
       unless @voter
         # create a new voter and populate it
       # create a new one
       unless @voter
         # create a new voter and populate it


@@ -108,8 +108,13 @@ class QuickvoteController < ApplicationController
       @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save
       
       @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save
       

-      # toggle the confirmation bit
+      # save the time the vote was made for statistical use, it doesn't
+      #work here unless I use a method that will save it to the db
+      @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


@@ -158,10 +163,12 @@ class QuickvoteController < ApplicationController
  
     @plurality_result = PluralityVote.new(plurality_tally).result
     @approval_result = ApprovalVote.new(approval_tally).result
  
     @plurality_result = PluralityVote.new(plurality_tally).result
     @approval_result = ApprovalVote.new(approval_tally).result

-    @condorcet_result = CloneproofSSDVote.new(preference_tally).result
-    @ssd_result = PureCondorcetVote.new(preference_tally).result
+    @condorcet_result = PureCondorcetVote.new(preference_tally).result
+    @ssd_result = CloneproofSSDVote.new(preference_tally).result

     @borda_result = BordaVote.new(preference_tally).result
     @borda_result = BordaVote.new(preference_tally).result

-    @runoff_result = InstantRunoffVote.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}
 
     @candidates = {} 
     @election.candidates.each {|c| @candidates[c.id] = c}