two minor changes that fix bugs with the quickvote

[selectricity] / app / models / vote.rb

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 429e212377781d27aa4a5580d9dcb65abd5b19eb..bef35020a45b1a7d37ca25fdd86dec73259f8ab5 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -1,3 +1,21 @@
+# 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: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+
 class Vote < ActiveRecord::Base
   # relationships to other classes
   belongs_to :voter
@@ -7,13 +25,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,13 +52,18 @@ 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
+  
+  def destroy
+    self.destroy_rankings
+    super
+  end
 
   def destroy_rankings 
     rankings.each { |ranking| ranking.destroy }
@@ -48,29 +71,38 @@ class Vote < ActiveRecord::Base
 
   def confirm!
     self.confirmed = 1
+    self.time = Time.now
     self.save
-
-    token.destroy and token.reload if token
-    self.token = Token.new
-    self.save
+    
+    unless self.voter.election.quickvote?
+      token.destroy and token.reload if token
+      self.token = Token.new
+      self.save
+    end
   end
 
   def confirm?
-    if confirm == 1
-      return true
-    else 
-      return false
-    end
+    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 = self.voter.election.candidates.sort_by { rand }.collect {|c| c.id }
+    self.save
+  end
+         
 end