Import latest subversion RubyVote.

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 0b745af72e13c79548b227ff83174a79660e9b94..83a6cc5fc659e5bcfabcc75a1d6e31baa7af5474 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -49,7 +49,7 @@ class QuickvoteController < ApplicationController
   #############################################################
 
   def index
-    @election = QuickVote.find_all(["name = ?", params[:votename]])[0]
+    @election = QuickVote.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
@@ -71,7 +71,7 @@ class QuickvoteController < ApplicationController
       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
         
              # create new vote and make it the defaulted sorted list
@@ -87,7 +87,7 @@ class QuickvoteController < ApplicationController
 
   def confirm
     # we need the election to verify that we have the right voter
-    election = QuickVote.find_all( [ "name = ?", params[:votename] ] )[0]
+    election = QuickVote.ident_to_quickvote(params[:ident])
 
     # find out who the voter is for this election
     @voter = QuickVoter.find_all(["session_id = ? and election_id = ?", 
@@ -96,12 +96,12 @@ class QuickvoteController < ApplicationController
     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? 
       # 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
@@ -122,7 +122,7 @@ class QuickvoteController < ApplicationController
   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
@@ -142,35 +142,9 @@ class QuickvoteController < ApplicationController
   ###############################################################
 
   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.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 }
-    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 = QuickVote.ident_to_quickvote(params[:ident])
+    @election.results
+    @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
   end
-
 end