]> projects.mako.cc - selectricity/blobdiff - app/models/election.rb
small number of cosmetic fixes to quickvotes and a minor bugfix that had
[selectricity] / app / models / election.rb
index 0860a426ff137d84dc9184ac322725aec05553cf..0907e68a4cfc7e5796ef9920bbfca09a4b0cd0bd 100644 (file)
@@ -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,10 +45,27 @@ 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
+
+  def longdesc
+    longdesc = description.split(/\n/)[1..-1].join("")
+    longdesc.length > 0 ? longdesc : nil 
+  end
 end

Benjamin Mako Hill || Want to submit a patch?