Made the results page 'modular,' and all the necessary adaptations.

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

diff --git a/app/models/election.rb b/app/models/election.rb
index ba466b4b55928dac2f5291e0513d77b684a8c08d..59a10bfbe601387eac1b72de2c9fcec03c99560c 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -4,15 +4,47 @@ 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

-
+  
+  #validate that method is one of the listed election types
+  
+  attr_reader :plurality_result
+  attr_reader :approval_result
+  attr_reader :condorcet_result
+  attr_reader :ssd_result
+  attr_reader :borda_result
+  

   require 'date'
   require 'date'

+  
+  def other_methods
+    if election_method
+      @other_methods = ELECTION_TYPES.reject {|i| i == election_method}
+    else
+      @other_methods = nil
+    end
+    @other_methods
+  end

 
   def startdate
 
   def startdate

-    read_attribute( :startdate ) || DateTime.now
+    read_attribute( :startdate ) || Time.now

   end
   end

-
+  

   def enddate
   def enddate

-    read_attribute( :enddate ) || DateTime.now + 14
+    date = read_attribute( :enddate ) || Time.now + 14
+    date - 1.second
+  end
+
+  def enddate=(date)
+    date += 1.day
+    date = Time.gm(*date)
+    super(date)
+  end
+
+  def votes
+    votes = Array.new
+    self.voters.each do |voter|
+      votes << voter.vote
+    end
+    return votes

   end
 
   def destroy
   end
 
   def destroy


@@ -38,6 +70,72 @@ class Election < ActiveRecord::Base
 
   def activate!
     self.active = 1
 
   def activate!
     self.active = 1

+    self.save!
+  end
+  
+  def quickvote?
+    self.class == 'QuickVote'
+  end
+
+  def active?
+    active == 1
+  end 
+
+  def done?
+    active == 2
+  end
+
+  def shortdesc
+    shortdesc = description.split(/\n/)[0]
+  end
+
+  def longdesc
+    longdesc = description.split(/\n/)[1..-1].join("")
+    longdesc.length > 0 ? longdesc : nil 

   end
   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
+    
+    { 'plurality' => @plurality_result,
+      'approval' => @approval_result,
+      'condorcet' => @condorcet_result,
+      'ssd' => @ssd_result,
+      'borda' => @borda_result }
+    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

+
+