Merged from John.

[selectricity] / app / models / election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index 69038e473946ceddd9a2a23e5fe7dae7571ba31f..cf7bba58a2974f409a2828226d4dd43dc2f023ac 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -8,11 +8,26 @@ class Election < ActiveRecord::Base
   require 'date'
 
   def startdate
   require 'date'
 
   def startdate

-    read_attribute( :startdate ) || DateTime.now
+    read_attribute( :startdate ) || Time.now

   end
   end

-
+  

   def enddate
   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 votes
+    votes = Array.new
+    self.voters.each do |voter|
+      votes << voter.vote
+    end
+    return votes

   end
 
   def destroy
   end
 
   def destroy


@@ -21,5 +36,44 @@ class Election < ActiveRecord::Base
     end
     super
   end
     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?
+    type == 'QuickVote'
+  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
 end