X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/a16962155a3c3c6616bfe32c7216f3631836d38c..df770407edbb2ed9f55b0a3b557f3b51a9e9f4e3:/app/models/election.rb?ds=sidebyside

diff --git a/app/models/election.rb b/app/models/election.rb
index d76c13f..9c6337f 100644
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -5,27 +5,33 @@ class Election < ActiveRecord::Base
   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'
-
-  def startdate
-    read_attribute( :startdate ) || Time.now
-  end
   
-  def enddate
-    date = read_attribute( :enddate ) || Time.now + 14
-    date - 1.second
+  def initialize(params={})
+    super
+    self.enddate = read_attribute( :enddate ) || \
+                   Time.now + 30.days - 1.second
   end
 
-  def enddate=(date)
-    date += 1.day
-    date = Time.gm(*date)
-    super(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
+    read_attribute( :startdate ) || Time.now
   end
 
   def votes
@@ -45,7 +51,6 @@ class Election < ActiveRecord::Base
 
   def start_blockers
     reasons = []
-    
     if self.candidates.length <= 1
       reasons << "You must have at least two candidates."
     end
@@ -100,15 +105,19 @@ class Election < ActiveRecord::Base
       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
+    { 'plurality' => @plurality_result,
+      'approval' => @approval_result,
+      'condorcet' => @condorcet_result,
+      'ssd' => @ssd_result,
+      'borda' => @borda_result }
+    end
   
   def names_by_id
     names = Hash.new