2 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
index 8c9f3822c..d7fc52719 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -189,6 +189,7 @@ const actions = {
               })
             }
             let vjasWithDelta = val.vehicle_journey_at_stops.map((vjas, i) => {
+              actions.fillEmptyFields(vjas)
               return actions.getDelta(vjas)
             })
             vehicleJourneys.push({
@@ -258,10 +259,17 @@ const actions = {
       return d.toString()
     }
   },
+  fillEmptyFields: (vjas) => {
+    if (vjas.departure_time.hour == null) vjas.departure_time.hour = '00'
+    if (vjas.departure_time.minute == null) vjas.departure_time.minute = '00'
+    if (vjas.arrival_time.hour == null) vjas.arrival_time.hour = '00'
+    if (vjas.arrival_time.minute == null) vjas.arrival_time.minute = '00'
+    return vjas
+  },
   getDelta: (vjas) => {
     let delta = 0
     if (vjas.departure_time.hour != '' && vjas.departure_time.minute != '' && vjas.arrival_time.hour != '' && vjas.departure_time.minute != ''){
-      delta = (vjas.departure_time.hour - vjas.arrival_time.hour) * 60 + (vjas.departure_time.minute - vjas.arrival_time.minute)
+      delta = (parseInt(vjas.departure_time.hour) - parseInt(vjas.arrival_time.hour)) * 60 + (parseInt(vjas.departure_time.minute) - parseInt(vjas.arrival_time.minute))
     }
     vjas.delta = delta
     return vjas
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 36fe110ed..c83647bd7 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -61,11 +61,11 @@ const vehicleJourney= (state = {}, action) => {
             if(!action.isArrivalsToggled)
               newSchedule.arrival_time[action.timeUnit] = actions.pad(action.val)
             newSchedule = actions.getDelta(newSchedule)
-            return Object.assign({}, state.vehicle_journey_at_stops[action.subIndex], newSchedule)
+            return Object.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)
-            return Object.assign({}, state.vehicle_journey_at_stops[action.subIndex],  {arrival_time: newArr})
+            return Object.assign({}, state.vehicle_journey_at_stops[action.subIndex],  {arrival_time: newSchedule.arrival_time, departure_time: newSchedule.departure_time, delta: newSchedule.delta})
           }
         }else{
           return vjas