Mostly worked on the candidate adding feature to include pictures and

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

diff --git a/app/models/election.rb b/app/models/election.rb
index be828d0e28fac2512df5f004df1b3053ce5fb3c8..69038e473946ceddd9a2a23e5fe7dae7571ba31f 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -1,12 +1,25 @@
 class Election < ActiveRecord::Base
   has_many :candidates
+  has_many :voters
+  has_many :votes
+  belongs_to :user
   validates_presence_of :name, :description
 
+  require 'date'
+
+  def startdate
+    read_attribute( :startdate ) || DateTime.now
+  end
+
+  def enddate
+    read_attribute( :enddate ) || DateTime.now + 14
+  end
+
   def destroy
     self.candidates.each do |candidate|
       candidate.destroy
     end
-    super destroy
+    super
   end
   
 end