aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haddad2017-04-04 14:42:34 +0200
committerThomas Haddad2017-04-04 14:42:34 +0200
commit4bb68cf4748fae774cad7ef6c1e71e91e72a1af6 (patch)
tree198bf307d201ea339642a98f74394012ac6c962a
parent2decac885120b783ee99ad7ea04bd233f42c0964 (diff)
downloadchouette-core-4bb68cf4748fae774cad7ef6c1e71e91e72a1af6.tar.bz2
Refs #3035: Fix arrival and departure time not overlapping
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
index 5924f5cc7..b42cf5f93 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -75,10 +75,16 @@ const vehicleJourney= (state = {}, action) => {
if(!action.isArrivalsToggled)
newSchedule.arrival_time[action.timeUnit] = actions.pad(action.val)
newSchedule = actions.getDelta(newSchedule)
+ if(newSchedule.delta < 0){
+ return vjas
+ }
return _.assign({}, state.vehicle_journey_at_stops[action.subIndex], {arrival_time: newSchedule.arrival_time, departure_time: newSchedule.departure_time, delta: newSchedule.delta})
}else{
newSchedule.arrival_time[action.timeUnit] = actions.pad(action.val)
newSchedule = actions.getDelta(newSchedule)
+ if(newSchedule.delta < 0){
+ return vjas
+ }
return _.assign({}, state.vehicle_journey_at_stops[action.subIndex], {arrival_time: newSchedule.arrival_time, departure_time: newSchedule.departure_time, delta: newSchedule.delta})
}
}else{