X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/1620856a8a47219f3a2cbb5288137b11467886fc..823d530ba46c1fb3518c4deef0081738503837eb:/app/models/quick_vote.rb

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index 698dac3..494f7ac 100644
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -4,12 +4,20 @@ class QuickVote < Election
   validates_presence_of :name
   attr_accessor :raw_candidates
   attr_accessor :reviewed
-  attr_accessor :plurality_result
-  attr_accessor :approval_result
-  attr_accessor :condorcet_result
-  attr_accessor :ssd_result
-  attr_accessor :borda_result
-
+  
+  def initialize(params={})
+    super
+    self.startdate = Time.now
+    self.active = 1
+    self.anonymous = 1 unless self.anonymous
+    self.enddate = read_attribute( :enddate ) || \
+                   Time.now + 30.days - 1.second
+  end
+  
+  def enddate
+    super(30)
+  end
+  
   def validate
     if not @raw_candidates or @raw_candidates.length < 2
       errors.add(nil, "You must list at least two candidates.")
@@ -39,14 +47,11 @@ class QuickVote < Election
     if name =~ /^(create|index|confirm|change|results)$/
       errors.add(:name, " is a reserved word.")
     end
-  end
-  
-  def initialize(params={})
-    super
-    self.startdate = Time.now
-    self.enddate =  Time.now + 30.days
-    self.active = 1
-    self.anonymous = 1
+    
+    if enddate < startdate
+      errors.add(nil, "QuickVotes can't end before they start!")
+    end
+    
   end
 
   def candidatelist=(candlist)
@@ -69,33 +74,6 @@ class QuickVote < Election
     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
-    #@runoff_result = InstantRunoffVote.new(preference_tally).result
-    #@runoff_results = PluralityVote.new(preference_tally).result
-
-  end
-
   ### Convert a shortname or id into a QuickVote
   def self.ident_to_quickvote(ident)
     return nil unless ident