bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

calentry neuigkeit order

Browse Source
This commit is contained in:
Andreas Stephanides
2015-03-08 22:12:55 +01:00
parent fc19206edd
commit d02b3a7e69
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/calentry.rb
View File

@@ -31,6 +31,28 @@ class Calentry < ActiveRecord::Base
end end
resourcify resourcify
def is_upcomming?
self.start > Time.now
end
def is_ongoing?
(self.start < Time.now) && (Time.now < self.ende)
end
def is_past?
(Time.now > self.ende)
end
def days_to_today
if self.is_ongoing?
0
else
if self.is_upcomming?
(self.start.to_date - Date.today).to_i.abs
elsif self.is_past?
(self.ende.to_date - Date.today).to_i.abs
end
end
end
def get_public def get_public
self.calendar=self.object.calendar unless object.nil? || object.calendar.nil? self.calendar=self.object.calendar unless object.nil? || object.calendar.nil?
self.public = (self.try(:object).nil?)? (self.calendar.try(:public?)) : object.try(:public?) self.public = (self.try(:object).nil?)? (self.calendar.try(:public?)) : object.try(:public?)

14
app/models/neuigkeit.rb
View File

@@ -102,16 +102,10 @@ class Neuigkeit < ActiveRecord::Base
self.update_column(:cache_order, (self.meeting.calentry.start.to_date - Date.today).to_i.abs) self.update_column(:cache_order, (self.meeting.calentry.start.to_date - Date.today).to_i.abs)
self.update_column(:cache_relevant_date, self.meeting.calentry.start.to_date) self.update_column(:cache_relevant_date, self.meeting.calentry.start.to_date)
else else
if self.is_event? if self.is_event?
unless self.calentries.upcoming.first.nil? c = n.calentries.min{|c| c.days_to_today * ((c.is_past?)? 2:1)}
self.update_column(:cache_order, (self.calentries.upcoming.first.start.to_date - Date.today).to_i.abs) self.update_column(:cache_order, c.days_to_today * ((c.is_past?)? 2:1))
self.update_column(:cache_relevant_date, self.calentries.upcoming.first.start.to_date) self.update_column(:cache_relevant_date, (c.is_past?) ? c.ende.to_date : c.start.to_date)
else
unless self.calentries.recent.first.nil?
self.update_column(:cache_order, (self.calentries.recent.first.start.to_date - Date.today).to_i.abs)
self.update_column(:cache_relevant_date, self.calentries.recent.first.start.to_date)
end
end
else else
unless self.datum.nil? unless self.datum.nil?
self.update_column(:cache_order, (self.datum.to_date - Date.today).to_i.abs) self.update_column(:cache_order, (self.datum.to_date - Date.today).to_i.abs)