X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/776bdf980f85cf230b238a80e1019fc78d53f06e..2a72af9b37793ded87c42042bd431495d1475c39:/app/models/vote.rb?ds=sidebyside

diff --git a/app/models/vote.rb b/app/models/vote.rb
index dcadcac..cc42311 100644
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -1,3 +1,10 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software. Please see the COPYING file for
+# details.
+
 class Vote < ActiveRecord::Base
   # relationships to other classes
   belongs_to :voter
@@ -21,7 +28,7 @@ class Vote < ActiveRecord::Base
       if rankings.empty?
         @votes = Array.new
       else
-        @votes = rankings.sort.collect { |ranking| ranking.candidate.id }
+        @votes = self.rankings.sort.collect { |ranking| ranking.candidate.id }
       end
     end
 
@@ -33,6 +40,9 @@ class Vote < ActiveRecord::Base
   end
 
   def save_rankings
+    self.votes # i need to initalize this before destroying rankings
+               # or else the ranks themselves show up as nil
+
     destroy_rankings
     self.votes.each_with_index do |candidate_id, index| 
       ranking = Ranking.new
@@ -51,13 +61,9 @@ 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.time = Time.now
     self.save
     
     unless self.voter.election.quickvote?
@@ -71,16 +77,6 @@ class Vote < ActiveRecord::Base
     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
@@ -90,14 +86,14 @@ class Vote < ActiveRecord::Base
     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 
-  # 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.votes = self.voter.election.candidates.sort_by { rand }.collect {|c| c.id }
     self.save
   end