fixed a large number of bugs in the software (see wiki) over a days work

[selectricity] / app / models / election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index a3cf8e47c1b3db7ee0e74908eb71f0fcd5798c46..4ce571a468c4aa91a39fd6696e7a76161e706afd 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -11,9 +11,12 @@ class Election < ActiveRecord::Base
   has_many :votes
   belongs_to :user
   validates_presence_of :name, :description
-  
+
+  # enforce constraints associated with dependencies (i.e., a kiosk
+  # election can't also be unauthenticated)
+  before_save :enforce_constraints
+
   #validate that method is one of the listed election types
-  
   attr_reader :plurality_result
   attr_reader :approval_result
   attr_reader :condorcet_result
@@ -21,7 +24,7 @@ class Election < ActiveRecord::Base
   attr_reader :borda_result
   
   require 'date'
-  
+ 
   def initialize(params={})
     super
     self.enddate = read_attribute( :enddate ) || \
@@ -71,7 +74,7 @@ class Election < ActiveRecord::Base
 
   def activate!
     self.active = 1
-    self.save!
+    self.save
   end
   
   def quickvote?
@@ -89,6 +92,10 @@ class Election < ActiveRecord::Base
   def authenticated?
     authenticated
   end
+
+  def kiosk?
+    kiosk
+  end
   
   def shortdesc
     shortdesc = description.split(/\n/)[0]
@@ -160,6 +167,30 @@ class Election < ActiveRecord::Base
     
     names
   end
+
+  def candidate_hash
+    hash = {}
+    self.candidates.each {|c| hash[c.id] = c}
+    return hash
+  end
+
+ 
+  # TODO now that this code is in here, we should go ahead and remove
+  # date checking from other places in the code
+  def after_find
+    if self.active < 2 and self.enddate < Time.now 
+      self.active = 2
+      self.save
+    end
+  end
+
+  private
+  def enforce_constraints
+    # kiosks can't be authenticated
+    self.authenticated = false if kiosk?
+    return true
+  end
+
 end