added template left out from last committ by accident

[selectricity] / app / models / election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index 59a10bfbe601387eac1b72de2c9fcec03c99560c..99d64f93cc55424b34f82dac24d0dce9a1e4fc73 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -15,9 +15,15 @@ class Election < ActiveRecord::Base
   
   require 'date'
   
+  def initialize(params={})
+    super
+    self.enddate = read_attribute( :enddate ) || \
+                   Time.now + 30.days - 1.second
+  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
@@ -27,17 +33,6 @@ class Election < ActiveRecord::Base
   def startdate
     read_attribute( :startdate ) || Time.now
   end
-  
-  def enddate
-    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
@@ -56,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
@@ -94,8 +88,28 @@ class Election < ActiveRecord::Base
     longdesc.length > 0 ? longdesc : nil 
   end
   
-  #Calculate Election Results
+  #Calculate results if not in memcache
   def results
+    # Assignment is intentional
+    if 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 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
@@ -135,7 +149,6 @@ class Election < ActiveRecord::Base
     
     names
   end
-  
 end