updated db schema

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

diff --git a/app/models/election.rb b/app/models/election.rb
index a77f4457bb581fba8588e1cf7ee479932851f409..a3e939424ac11099ba5c1f6e70dd5b0989b2b405 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -1,3 +1,10 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software. Please see the COPYING file for
+# details.
+

 class Election < ActiveRecord::Base
   has_many :candidates
   has_many :voters
 class Election < ActiveRecord::Base
   has_many :candidates
   has_many :voters


@@ -18,12 +25,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 +41,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|


@@ -61,7 +62,7 @@ class Election < ActiveRecord::Base
       reasons << "You must have at least two candidates."
     end
     
       reasons << "You must have at least two candidates."
     end
     

-    if self.voters.length <= 1
+    if self.voters.length <= 1 and self.authenticated?

       reasons << "You must have at least two voters."
     end
 
       reasons << "You must have at least two voters."
     end
 


@@ -74,7 +75,7 @@ class Election < ActiveRecord::Base
   end
   
   def quickvote?
   end
   
   def quickvote?

-    self.class == 'QuickVote'
+    self.class == QuickVote

   end
 
   def active?
   end
 
   def active?


@@ -85,6 +86,14 @@ class Election < ActiveRecord::Base
     active == 2
   end
 
     active == 2
   end
 

+  def authenticated?
+    authenticated
+  end
+
+  def kiosk?
+    kiosk
+  end
+  

   def shortdesc
     shortdesc = description.split(/\n/)[0]
   end
   def shortdesc
     shortdesc = description.split(/\n/)[0]
   end


@@ -94,8 +103,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 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
     # initalize the tallies to empty arrays
     preference_tally = Array.new
     plurality_tally = Array.new


@@ -135,7 +164,6 @@ class Election < ActiveRecord::Base
     
     names
   end
     
     names
   end

-  

 end
 
 
 end