diff options
| author | Xinhui | 2016-11-16 14:23:36 +0100 |
|---|---|---|
| committer | Xinhui | 2016-11-16 14:23:36 +0100 |
| commit | d5469a07545b21da81b1ccfbdb65378c187d7bef (patch) | |
| tree | bf94d46a83c25e19db4e4160f988f89ab4ebb00c /app/models/chouette/time_table.rb | |
| parent | 27863346ac69845de01f3b75de67303226181e31 (diff) | |
| download | chouette-core-d5469a07545b21da81b1ccfbdb65378c187d7bef.tar.bz2 | |
Model CleanUp add end_date
Refs #1934
Diffstat (limited to 'app/models/chouette/time_table.rb')
| -rw-r--r-- | app/models/chouette/time_table.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb index 9af80fbb7..abe6186a7 100644 --- a/app/models/chouette/time_table.rb +++ b/app/models/chouette/time_table.rb @@ -4,8 +4,8 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord self.primary_key = "id" acts_as_taggable - - attr_accessor :monday,:tuesday,:wednesday,:thursday,:friday,:saturday,:sunday + + attr_accessor :monday,:tuesday,:wednesday,:thursday,:friday,:saturday,:sunday attr_accessor :tag_search def self.ransackable_attributes auth_object = nil @@ -70,6 +70,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord return false unless self.end_date self.end_date <= expected_date end + def validity_out_between?(starting_date, ending_date) return false unless self.start_date starting_date < self.end_date && @@ -414,7 +415,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord # remove dates form tt which aren't in another_tt def intersect!(another_tt) transaction do - + # transform tt as effective dates and get common ones days = another_tt.intersects(self.effective_days) & self.intersects(another_tt.effective_days) self.dates.clear |