added support for results for full elections

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

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 33927cd16db995528e15da3aa6ab943353d5bc09..21b5408ff8c83e130ff8154f3380c7a1a1cc4c96 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -7,7 +7,7 @@ class Vote < ActiveRecord::Base
   # callbacks
   after_update :save_rankings
   before_destroy :destroy_rankings
   # callbacks
   after_update :save_rankings
   before_destroy :destroy_rankings

-
+  

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


@@ -51,6 +51,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


@@ -66,25 +71,24 @@ 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
   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] + 64).chr}.join("")

   end
 
   end
 

-  # the following subroutine is used for quickvotes. 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
-  def set_defaults!
-    self.votes =  voter.election.candidates.sort.collect {|c| c.id }
+  # 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.save
   end
     self.save
   end

+         

 end
 end