Add a bunch of fixes to HTML escaping, and a test case for it

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

diff --git a/app/models/election.rb b/app/models/election.rb
index cf7bba58a2974f409a2828226d4dd43dc2f023ac..d76c13f633cd7ddb7b48ca560deb60d54f266d4a 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -4,6 +4,12 @@ class Election < ActiveRecord::Base
   has_many :votes
   belongs_to :user
   validates_presence_of :name, :description
   has_many :votes
   belongs_to :user
   validates_presence_of :name, :description

+  
+  attr_reader :plurality_result
+  attr_reader :approval_result
+  attr_reader :condorcet_result
+  attr_reader :ssd_result
+  attr_reader :borda_result

 
   require 'date'
 
 
   require 'date'
 


@@ -57,7 +63,7 @@ class Election < ActiveRecord::Base
   end
   
   def quickvote?
   end
   
   def quickvote?

-    type == 'QuickVote'
+    self.class == 'QuickVote'

   end
 
   def active?
   end
 
   def active?


@@ -76,4 +82,45 @@ class Election < ActiveRecord::Base
     longdesc = description.split(/\n/)[1..-1].join("")
     longdesc.length > 0 ? longdesc : nil 
   end
     longdesc = description.split(/\n/)[1..-1].join("")
     longdesc.length > 0 ? longdesc : nil 
   end

+  
+  #Calculate Election Results
+  def results
+    # initalize the tallies to empty arrays
+    preference_tally = Array.new
+    plurality_tally = Array.new
+    approval_tally = Array.new
+
+    self.voters.each do |voter|
+      # skip if the voter has not voted or has an unconfirmed vote
+      next unless voter.voted?
+
+      plurality_tally << voter.vote.rankings.sort[0].candidate.id
+      approval_tally << voter.vote.rankings.sort[0..1].collect \
+        { |ranking| ranking.candidate.id }
+      preference_tally << voter.vote.rankings.sort.collect \
+        { |ranking| ranking.candidate.id }
+    end
+    @plurality_result = PluralityVote.new(plurality_tally).result
+    @approval_result = ApprovalVote.new(approval_tally).result
+    @condorcet_result = PureCondorcetVote.new(preference_tally).result
+    @ssd_result = CloneproofSSDVote.new(preference_tally).result
+    @borda_result = BordaVote.new(preference_tally).result
+    #@runoff_result = InstantRunoffVote.new(preference_tally).result
+    
+    nil # to stay consistent
+  end
+  
+  def names_by_id
+    names = Hash.new
+    
+    competitors = self.candidates.sort.collect {|candidate| candidate.id}
+    competitors.each do |candidate|
+      names[candidate] = Candidate.find(candidate).name
+    end
+    
+    names
+  end
+  

 end
 end

+
+