The summary page now had color coded tables. Red = election, green = quickvote.

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

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 014899d905ac9e07a185cd99f5abcae9db1d702f..8852fa5fe066e6ae47ea93dd2c21afc87e1c609c 100644 (file)
--- 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
   # callbacks
   after_update :save_rankings
   before_destroy :destroy_rankings

-
+  

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

-    votes.each {|vote| yield vote}
+    self.votes.each {|vote| yield vote}

   end
 
   def votes
   end
 
   def votes


@@ -34,10 +34,10 @@ class Vote < ActiveRecord::Base
 
   def save_rankings
     destroy_rankings
 
   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 = Ranking.new
       ranking.rank = index

-      ranking.candidate =  Candidate.find(candidate)
+      ranking.candidate =  Candidate.find(candidate_id)

       self.rankings << ranking
     end
   end
       self.rankings << ranking
     end
   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


@@ -69,7 +74,7 @@ class Vote < ActiveRecord::Base
   def votestring=(string="")
     candidate_ids = voter.election.candidates.sort.collect \
       { |candidate| candidate.id.to_i }
   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
     rel_votes = string.split("").collect { |vote| vote.to_i }
     
     # covert relative orders to absolute candidate ids


@@ -77,7 +82,23 @@ 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
 
   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
 end