diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/calendar.rb | 5 | ||||
| -rw-r--r-- | app/models/concerns/application_days_support.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/models/calendar.rb b/app/models/calendar.rb index d58e7737d..a4d279e25 100644 --- a/app/models/calendar.rb +++ b/app/models/calendar.rb @@ -16,11 +16,16 @@ class Calendar < ActiveRecord::Base has_many :time_tables scope :contains_date, ->(date) { where('date ? = any (dates) OR date ? <@ any (date_ranges)', date, date) } + before_create :set_default_days def self.ransackable_scopes(auth_object = nil) [:contains_date] end + def set_default_days + self.int_day_types ||= EVERYDAY + end + def convert_to_time_table Chouette::TimeTable.new.tap do |tt| self.dates.each do |d| diff --git a/app/models/concerns/application_days_support.rb b/app/models/concerns/application_days_support.rb index f83e4a5c8..425cba5bf 100644 --- a/app/models/concerns/application_days_support.rb +++ b/app/models/concerns/application_days_support.rb @@ -8,7 +8,8 @@ module ApplicationDaysSupport FRIDAY = 64 SATURDAY = 128 SUNDAY = 256 - + EVERYDAY = MONDAY | TUESDAY | WEDNESDAY | THURSDAY | FRIDAY | SATURDAY | SUNDAY + def display_day_types %w(monday tuesday wednesday thursday friday saturday sunday).select{ |d| self.send(d) }.map{ |d| self.human_attribute_name(d).first(2)}.join(', ') end |