Updated the "votes_per_day" method in graph controller to work better and

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

diff --git a/app/models/election.rb b/app/models/election.rb
index eaf07276128b3b8b8271646aabc6f936949a9ebb..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


@@ -38,10 +53,19 @@ class Election < ActiveRecord::Base
 
   def activate!
     self.active = 1
 
   def activate!
     self.active = 1

+    self.save!

   end
   
   def quickvote?
   end
   
   def quickvote?

-    quickvote.to_i == 1
+    type == 'QuickVote'
+  end
+
+  def active?
+    active == 1
+  end 
+
+  def done?
+    active == 2

   end
 
   def shortdesc
   end
 
   def shortdesc