merged changes back from the production version

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

diff --git a/app/models/election.rb b/app/models/election.rb
index a574139c535abc4f48b7ba5a210da7d918e5362d..cd809ab5b94e28a06c6ed4cdbaaaacaf4cc90148 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -18,12 +18,12 @@ class Election < ActiveRecord::Base
   def initialize(params={})
     super
     self.enddate = read_attribute( :enddate ) || \
   def initialize(params={})
     super
     self.enddate = read_attribute( :enddate ) || \

-                   Time.now + 14.days - 1.second
+                   Time.now + 30.days - 1.second

   end
 
   def other_methods
     if election_method
   end
 
   def other_methods
     if election_method

-      @other_methods = ELECTION_TYPES.reject {|i| i == election_method}
+      @other_methods = ELECTION_TYPES.keys.reject {|i| i == election_method}

     else
       @other_methods = nil
     end
     else
       @other_methods = nil
     end


@@ -34,12 +34,6 @@ class Election < ActiveRecord::Base
     read_attribute( :startdate ) || Time.now
   end
 
     read_attribute( :startdate ) || Time.now
   end
 

-  def enddate=(date)
-    date += 1.day
-    date = Time.gm(*date)
-    super(date)
-  end
-

   def votes
     votes = Array.new
     self.voters.each do |voter|
   def votes
     votes = Array.new
     self.voters.each do |voter|


@@ -57,7 +51,6 @@ class Election < ActiveRecord::Base
 
   def start_blockers
     reasons = []
 
   def start_blockers
     reasons = []

-    debugger 

     if self.candidates.length <= 1
       reasons << "You must have at least two candidates."
     end
     if self.candidates.length <= 1
       reasons << "You must have at least two candidates."
     end


@@ -95,8 +88,28 @@ class Election < ActiveRecord::Base
     longdesc.length > 0 ? longdesc : nil 
   end
   
     longdesc.length > 0 ? longdesc : nil 
   end
   

-  #Calculate Election Results
+  #Calculate results if not in memcache

   def results
   def results

+    # Assignment is intentional
+    if defined? Cache and c = Cache.get("election_results:#{id}:#{self.votes.length}")
+      @plurality_result = c['plurality']
+      @approval_result = c['approval']
+      @condorcet_result = c['condorcet']
+      @ssd_result = c['ssd']
+      @borda_result = c['borda']
+      return c
+    elsif defined? Cache
+      # memcache is available, but missed.
+      results = self.results!
+      Cache.set("election_results:#{id}:#{self.votes.length}", results)
+      return results
+    else
+      return self.results!
+    end
+  end
+
+  #Always Calculate Election Results
+  def results!

     # initalize the tallies to empty arrays
     preference_tally = Array.new
     plurality_tally = Array.new
     # initalize the tallies to empty arrays
     preference_tally = Array.new
     plurality_tally = Array.new


@@ -136,7 +149,6 @@ class Election < ActiveRecord::Base
     
     names
   end
     
     names
   end

-  

 end
 
 
 end