small number of cosmetic fixes to quickvotes and a minor bugfix that had

[selectricity] / app / models / election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index 69038e473946ceddd9a2a23e5fe7dae7571ba31f..0907e68a4cfc7e5796ef9920bbfca09a4b0cd0bd 100644 (file)
--- 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
@@ -21,5 +28,44 @@ class Election < ActiveRecord::Base
     end
     super
   end
+
+  def start_blockers
+    reasons = []
+    
+    if self.candidates.length <= 1
+      reasons << "You must have at least two candidates."
+    end
+    
+    if self.voters.length <= 1
+      reasons << "You must have at least two voters."
+    end
+
+    reasons
+  end
+
+  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