X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/04f827dd4647f3a7d6e5bd8f5e9083c730a8dccc..103b2b07ab5aa50e160b289a0a76d95356353edc:/app/models/vote.rb?ds=inline

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 08dd1e7..21b5408 100644
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -7,13 +7,13 @@ class Vote < ActiveRecord::Base
   # callbacks
   after_update :save_rankings
   before_destroy :destroy_rankings
-
+  
   def to_s
     votes.join("")
   end
 
   def each
-    votes.each {|vote| yield vote}
+    self.votes.each {|vote| yield vote}
   end
 
   def votes
@@ -34,10 +34,10 @@ class Vote < ActiveRecord::Base
 
   def save_rankings
     destroy_rankings
-    self.votes.each_with_index do |candidate, index| 
+    self.votes.each_with_index do |candidate_id, index| 
       ranking = Ranking.new
       ranking.rank = index
-      ranking.candidate =  Candidate.find(candidate)
+      ranking.candidate =  Candidate.find(candidate_id)
       self.rankings << ranking
     end
   end
@@ -51,6 +51,11 @@ class Vote < ActiveRecord::Base
     rankings.each { |ranking| ranking.destroy }
   end
 
+  def settime
+    self.time = Time.now
+    self.save
+  end
+
   def confirm!
     self.confirmed = 1
     self.save
@@ -66,14 +71,24 @@ class Vote < ActiveRecord::Base
     confirmed == 1
   end
   
-  def votestring=(string="")
-    candidate_ids = voter.election.candidates.sort.collect \
-      { |candidate| candidate.id.to_i }
+  def votestring
+    # 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
 
-    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 ] }
+    # assemble the votestring
+    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.save
+  end
+         
 end