fix for bug introduces with full versions

[selectricity] / app / models / vote.rb

diff --git a/app/models/vote.rb b/app/models/vote.rb
index dcadcac91d5db2bcd4158825b9098ab7e788e708..21b5408ff8c83e130ff8154f3380c7a1a1cc4c96 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -71,16 +71,6 @@ class Vote < ActiveRecord::Base
     confirmed == 1
   end
   
     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
   def votestring
     # create a mapping of candidates ids and the relative order of the
     # candidates as they appear when sorted alphabetically


@@ -90,12 +80,12 @@ class Vote < ActiveRecord::Base
     end
 
     # assemble the votestring
     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 
   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. It is meant to be manipulated and then confirmed
+  # 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.save
   def set_defaults!  
     self.votes = voter.election.candidates.sort.collect {|c| c.id }
     self.save