fix type in description text

[selectricity-live] / app / models / vote.rb

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 8852fa5fe066e6ae47ea93dd2c21afc87e1c609c..98b5704e0aefce54a4ffc86861d2391e13357425 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -71,16 +71,6 @@ class Vote < ActiveRecord::Base
     confirmed == 1
   end
   
-  def votestring=(string="")
-    candidate_ids = voter.election.candidates.sort.collect \
-      { |candidate| candidate.id.to_i }
-      
-    rel_votes = string.split("").collect { |vote| vote.to_i }
-    
-    # covert relative orders to absolute candidate ids
-    self.votes = rel_votes.collect { |vote| candidate_ids[ vote - 1 ] }
-  end
-
   def votestring
     # create a mapping of candidates ids and the relative order of the
     # candidates as they appear when sorted alphabetically
@@ -90,14 +80,14 @@ class Vote < ActiveRecord::Base
     end
 
     # assemble the votestring
-    self.votes.collect {|v| cand_relnums[v]}.join("")
+    self.votes.collect {|v| (cand_relnums[v] + 64).chr}.join("")
   end
 
   # the following subroutine is used for quickvotes, but need for elections now
   # too. It creates a vote with the candidates listed in order of preference 
   # based on alphabetical order. Meant to be manipulated and then confirmed
   def set_defaults!  
-    self.votes = voter.election.candidates.sort.collect {|c| c.id }
+    self.votes = self.voter.election.candidates.sort_by { rand }.collect {|c| c.id }
     self.save
   end