diff options
| author | Xinhui | 2017-06-02 11:18:29 +0200 | 
|---|---|---|
| committer | Xinhui | 2017-06-02 11:18:38 +0200 | 
| commit | c0d5559225a3558026c6390c8223481c76cb1025 (patch) | |
| tree | 7785f22f391c3fc31640ba155477c5d7275390f9 /app/models/chouette | |
| parent | e3256389c127e303451935c2987821ac14645439 (diff) | |
| download | chouette-core-c0d5559225a3558026c6390c8223481c76cb1025.tar.bz2 | |
Fix vjas departure time can be equal to next stop arrival time
Refs #3418
Diffstat (limited to 'app/models/chouette')
| -rw-r--r-- | app/models/chouette/vehicle_journey.rb | 9 | 
1 files changed, 5 insertions, 4 deletions
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb index 24de88015..44dd85864 100644 --- a/app/models/chouette/vehicle_journey.rb +++ b/app/models/chouette/vehicle_journey.rb @@ -36,13 +36,14 @@ module Chouette        :calculate_vehicle_journey_at_stop_day_offset      def vjas_departure_time_must_be_before_next_stop_arrival_time +      notice = 'departure time must be before next stop arrival time'        vehicle_journey_at_stops.each_with_index do |current_stop, index|          next_stop = vehicle_journey_at_stops[index + 1] -        next unless next_stop -        if next_stop[:arrival_time] <= current_stop[:departure_time] -          current_stop.errors.add(:departure_time, 'departure time must be before next stop arrival time') -        end +        next unless next_stop && (next_stop[:arrival_time] < current_stop[:departure_time]) + +        current_stop.errors.add(:departure_time, notice) +        self.errors.add(:vehicle_journey_at_stops, notice)        end      end  | 
