X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/ac5e3489e8b886b7b8a7252ab56ddeb3d3bdadc7..67772df248fd417bc39cc1bb3940b94b4513fd1d:/app/models/election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index eaf0727..0907e68 100644
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -8,11 +8,18 @@ class Election < ActiveRecord::Base
   require 'date'
 
   def startdate
-    read_attribute( :startdate ) || DateTime.now
+    read_attribute( :startdate ) || Time.now
   end
 
   def enddate
-    read_attribute( :enddate ) || DateTime.now + 14
+    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 destroy
@@ -38,12 +45,21 @@ class Election < ActiveRecord::Base
 
   def activate!
     self.active = 1
+    self.save!
   end
   
   def quickvote?
     quickvote.to_i == 1
   end
 
+  def active?
+    active == 1
+  end 
+
+  def done?
+    active == 2
+  end
+
   def shortdesc
     shortdesc = description.split(/\n/)[0]
   end