Skip to content

Commit

Permalink
Hopefully fixing time issue on Heroku.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ethan Waldo committed Mar 11, 2012
1 parent 418bf6d commit a1f8c18
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions app/models/event.rb
Expand Up @@ -8,17 +8,17 @@ class Event < ActiveRecord::Base
attr_accessible :description, :end_date, :end_time, :name, :start_date, :start_time, :as => :default
attr_accessible :created_at, :creator_id, :description, :end_date, :end_time, :id, :name, :start_date, :start_time, :updated_at, :as => :admin

scope :active, :conditions => ["events.end_date > ? AND events.start_date <= ?", Time.zone.now, Time.zone.now]
scope :active, :conditions => ["events.end_date > ? AND events.start_date <= ?", Time.now, Time.now]
scope :current, :conditions => "events.end_date >= (SELECT date('now'))", :order => "events.end_date ASC"

validates :name, :format => {:with => /^[\x20-\x7E]+$/}, :length => {:within => 2..254}, :presence => true
validates :description, :format => {:with => /^[\x20-\x7E]*$/}, :length => {:within => 0..254}
validates :start_datetime, :date => {:before => :end_datetime}
validates :start_datetime, :date => {:after => (Time.zone.now - 5.minutes)}, :on => :create
validates :start_datetime, :date => {:after => (Time.now - 5.minutes)}, :on => :create
validates :end_datetime, :date => {:after => :start_datetime}

def active?
now = Time.zone.now
now = Time.now
self.end_datetime > now && self.start_datetime <= now
end

Expand All @@ -41,30 +41,30 @@ def start_date
end

def start_date=(value)
self.start_datetime = Time.zone.parse("#{value} #{self.start_datetime.localtime.strftime('%I:%M %p') if self.start_datetime}")
self.start_datetime = Time.parse("#{value} #{self.start_datetime.localtime.strftime('%I:%M %p') if self.start_datetime}")
end

def start_time
self.start_datetime.localtime.strftime('%I:%M %p') if self.start_datetime
end

def start_time=(value)
self.start_datetime = Time.zone.parse("#{self.start_datetime ? self.start_datetime.localtime.to_date.to_s : Time.now.to_date.to_s} #{value}")
self.start_datetime = Time.parse("#{self.start_datetime ? self.start_datetime.localtime.to_date.to_s : Time.now.to_date.to_s} #{value}")
end

def end_date
self.end_datetime.localtime.to_date if self.end_datetime
end

def end_date=(value)
self.end_datetime = Time.zone.parse("#{value} #{self.end_datetime.localtime.strftime('%I:%M %p') if self.end_datetime}")
self.end_datetime = Time.parse("#{value} #{self.end_datetime.localtime.strftime('%I:%M %p') if self.end_datetime}")
end

def end_time
self.end_datetime.localtime.strftime('%I:%M %p') if self.end_datetime
end

def end_time=(value)
self.end_datetime = Time.zone.parse("#{self.end_datetime ? self.end_datetime.localtime.to_date.to_s : Time.now.to_date.to_s} #{value}")
self.end_datetime = Time.parse("#{self.end_datetime ? self.end_datetime.localtime.to_date.to_s : Time.now.to_date.to_s} #{value}")
end
end

0 comments on commit a1f8c18

Please sign in to comment.