fixed the string modification function and added support for a titlecase method

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

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 2aa1c4bfd929ee5d6cf68faccb7acab1cc07bc43..014899d905ac9e07a185cd99f5abcae9db1d702f 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -1,38 +1,83 @@
 class Vote < ActiveRecord::Base
 class Vote < ActiveRecord::Base

+  # relationships to other classes

   belongs_to :voter
   has_many :rankings
   belongs_to :voter
   has_many :rankings

+  has_one :token

   
   

-  def initialize
-    super
-    @votes = []
+  # callbacks
+  after_update :save_rankings
+  before_destroy :destroy_rankings
+
+  def to_s
+    votes.join("")

   end
   end

-  
-  def votestring=(string="")
-    rel_votes = string.split("").collect { |vote| vote.to_i }
-    
-    # covert relative orders to absolute candidate ids
-    candidate_ids = voter.election.candidates.sort
-    candidate_ids.collect! { |candidate| candidate.id.to_i }
-   
-    rel_votes.collect! { |vote| candidate_ids[ vote - 1 ] }
-    @votes = rel_votes
+
+  def each
+    votes.each {|vote| yield vote}

   end
 
   end
 

-  def save 
-    rankings.each { destroy } unless rankings.empty?
-    @votes.each_with_index do |candidate, index| 
+  def votes
+    unless @votes
+      if rankings.empty?
+        @votes = Array.new
+      else
+        @votes = rankings.sort.collect { |ranking| ranking.candidate.id }
+      end
+    end
+
+    @votes
+  end
+
+  def votes=(array)
+    @votes = array
+  end
+
+  def save_rankings
+    destroy_rankings
+    self.votes.each_with_index do |candidate, index| 

       ranking = Ranking.new
       ranking = Ranking.new

-      ranking.rank = index + 1
+      ranking.rank = index

       ranking.candidate =  Candidate.find(candidate)
       self.rankings << ranking
     end
       ranking.candidate =  Candidate.find(candidate)
       self.rankings << ranking
     end

-      
-    super

   end
   end

-
+  

   def destroy
   def destroy

-    rankings.each { destroy }
+    self.destroy_rankings

     super
   end
 
     super
   end
 

+  def destroy_rankings 
+    rankings.each { |ranking| ranking.destroy }
+  end
+
+  def confirm!
+    self.confirmed = 1
+    self.save
+    
+    unless self.voter.election.quickvote?
+      token.destroy and token.reload if token
+      self.token = Token.new
+      self.save
+    end
+  end
+
+  def confirm?
+    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
+    self.votes.join("")
+  end
+

 end
 end