diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/chouette/journey_frequency.rb | 35 | ||||
| -rw-r--r-- | app/models/chouette/timeband.rb | 28 | ||||
| -rw-r--r-- | app/models/referential.rb | 3 |
3 files changed, 0 insertions, 66 deletions
diff --git a/app/models/chouette/journey_frequency.rb b/app/models/chouette/journey_frequency.rb deleted file mode 100644 index 1b4efe96e..000000000 --- a/app/models/chouette/journey_frequency.rb +++ /dev/null @@ -1,35 +0,0 @@ -module Chouette - class JourneyFrequencyValidator < ActiveModel::Validator - def validate(record) - timeband = record.timeband - if timeband - first_departure_time = record.first_departure_time.utc.strftime( "%H%M%S%N" ) - last_departure_time = record.last_departure_time.utc.strftime( "%H%M%S%N" ) - timeband_start_time = timeband.start_time.utc.strftime( "%H%M%S%N" ) - timeband_end_time = timeband.end_time.utc.strftime( "%H%M%S%N" ) - - unless first_departure_time.between? timeband_start_time, timeband_end_time - record.errors[:first_departure_time] << I18n.t('activerecord.errors.models.journey_frequency.start_must_be_after_timeband') - end - unless last_departure_time.between? timeband_start_time, timeband_end_time - record.errors[:last_departure_time] << I18n.t('activerecord.errors.models.journey_frequency.end_must_be_before_timeband') - end - end - if record.first_departure_time == record.last_departure_time - record.errors[:last_departure_time] << I18n.t('activerecord.errors.models.journey_frequency.end_must_be_different_from_first') - end - if record.scheduled_headway_interval.blank? || (record.scheduled_headway_interval.strftime( "%H%M%S%N" ) == Time.current.midnight.strftime( "%H%M%S%N" )) - record.errors[:scheduled_headway_interval] << I18n.t('activerecord.errors.models.journey_frequency.scheduled_headway_interval_greater_than_zero') - end - end - end - - class JourneyFrequency < ActiveRecord - belongs_to :vehicle_journey_frequency, foreign_key: 'vehicle_journey_id' - belongs_to :timeband - validates :first_departure_time, presence: true - validates :last_departure_time, presence: true - validates :scheduled_headway_interval, presence: true - validates_with Chouette::JourneyFrequencyValidator - end -end
\ No newline at end of file diff --git a/app/models/chouette/timeband.rb b/app/models/chouette/timeband.rb deleted file mode 100644 index 38260b755..000000000 --- a/app/models/chouette/timeband.rb +++ /dev/null @@ -1,28 +0,0 @@ -module Chouette - class TimebandValidator < ActiveModel::Validator - def validate(record) - if record.end_time <= record.start_time - record.errors[:end_time] << I18n.t('activerecord.errors.models.timeband.start_must_be_before_end') - end - end - end - - class Timeband < Chouette::TridentActiveRecord - include ObjectidSupport - has_metadata - - validates :start_time, :end_time, presence: true - validates_with Chouette::TimebandValidator - - default_scope { order(:start_time) } - - def self.object_id_key - "Timeband" - end - - def fullname - fullname = "#{I18n.l(self.start_time, format: :hour)}-#{I18n.l(self.end_time, format: :hour)}" - "#{self.name} (#{fullname})" if self.name - end - end -end diff --git a/app/models/referential.rb b/app/models/referential.rb index 0c6e71d47..ea75274d0 100644 --- a/app/models/referential.rb +++ b/app/models/referential.rb @@ -192,9 +192,6 @@ class Referential < ApplicationModel Chouette::TimeTableDate.all end - def timebands - Chouette::Timeband.all - end def connection_links Chouette::ConnectionLink.all |