Fixed all triggerable DeprecationWarnings. BE ON LOOKOUT FOR REGRESSIONS.

[selectricity] / app / models / vote.rb

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 33927cd16db995528e15da3aa6ab943353d5bc09..62944e3301a5b6f07f77f475e1ef85ae8d314cc6 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -8,6 +8,8 @@ class Vote < ActiveRecord::Base
   after_update :save_rankings
   before_destroy :destroy_rankings
 
   after_update :save_rankings
   before_destroy :destroy_rankings
 

+  
+

   def to_s
     votes.join("")
   end
   def to_s
     votes.join("")
   end


@@ -51,6 +53,11 @@ class Vote < ActiveRecord::Base
     rankings.each { |ranking| ranking.destroy }
   end
 
     rankings.each { |ranking| ranking.destroy }
   end
 

+  def settime
+    self.time = Time.now
+    self.save
+  end
+

   def confirm!
     self.confirmed = 1
     self.save
   def confirm!
     self.confirmed = 1
     self.save


@@ -77,7 +84,15 @@ class Vote < ActiveRecord::Base
   end
 
   def votestring
   end
 
   def votestring

-    self.votes.join("")
+    # create a mapping of candidates ids and the relative order of the
+    # candidates as they appear when sorted alphabetically
+    cand_relnums = {}
+    self.voter.election.candidates.sort.each_with_index do |c, i|
+      cand_relnums[c.id] = i + 1
+    end
+
+    # assemble the votestring
+    self.votes.collect {|v| cand_relnums[v]}.join("")

   end
 
   # the following subroutine is used for quickvotes. it creates a vote
   end
 
   # the following subroutine is used for quickvotes. it creates a vote