Refs #2521: Fix vjas arrival and departure_time processed without moment

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>

2 files changed, 17 insertions, 12 deletions

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
index f86ce57a7..b723158dd 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -46,16 +46,16 @@ class VehicleJourney extends Component {
                       type='number'
                       min='00'
                       max='23'
-                      onBlur={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'hour', false, false)}}
-                      defaultValue={moment(vj.arrival_time).utc().hours()}
+                      onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'hour', false, false)}}
+                      value={vj.arrival_time['hour']}
                     />
                     <span>:</span>
                     <input
                       type='number'
                       min='00'
                       max='59'
-                      onBlur={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'minute', false, false)}}
-                      defaultValue={moment(vj.arrival_time).utc().minutes()}
+                      onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'minute', false, false)}}
+                      value={vj.arrival_time['minute']}
                     />
                   </span>
                 }
@@ -64,16 +64,16 @@ class VehicleJourney extends Component {
                     type='number'
                     min='00'
                     max='23'
-                    onBlur={(e) => {e.preventDefault(); this.props.onUpdateTime(e, i, this.props.index, 'hour', true, this.props.filters.toggleArrivals)}}
-                    defaultValue={moment(vj.departure_time).utc().hours()}
+                    onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'hour', true, this.props.filters.toggleArrivals)}}
+                    value={vj.departure_time['hour']}
                   />
                   <span>:</span>
                   <input
                     type='number'
                     min='00'
                     max='59'
-                    onBlur={(e) => {e.preventDefault(); this.props.onUpdateTime(e, i, this.props.index, "minute", true,  this.props.filters.toggleArrivals)}}
-                    defaultValue={moment(vj.departure_time).utc().minutes()}
+                    onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, "minute", true,  this.props.filters.toggleArrivals)}}
+                    value={vj.departure_time['minute']}
                   />
                 </span>
               </li>
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 e16caeae9..b48ac33b3 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -3,16 +3,21 @@ var actions = require("../actions")
 const vehicleJourney= (state = {}, action) => {
   switch (action.type) {
     case 'UPDATE_TIME':
-      let vj, vjas, vjasArray
+      let vj, vjas, vjasArray, newSchedule
       vjasArray = state.vehicle_journey_at_stops.map((vjas, i) =>{
         if(i == action.subIndex){
+          newSchedule = {
+            departure_time: Object.assign({}, vjas.departure_time),
+            arrival_time: Object.assign({}, vjas.arrival_time)
+          }
           if (action.isDeparture){
-            let newSchedule = {departure_time: moment(state.vehicle_journey_at_stops[action.subIndex].departure_time).set(action.timeUnit, action.val).format()}
+            newSchedule.departure_time[action.timeUnit] = action.val
             if(!action.isArrivalsToggled)
-              newSchedule.arrival_time = moment(state.vehicle_journey_at_stops[action.subIndex].arrival_time).set(action.timeUnit, action.val).format()
+              newSchedule.arrival_time[action.timeUnit] = action.val
             return Object.assign({}, state.vehicle_journey_at_stops[action.subIndex], newSchedule)
           }else{
-            return Object.assign({}, state.vehicle_journey_at_stops[action.subIndex],  {arrival_time: moment(state.vehicle_journey_at_stops[action.subIndex].arrival_time).set(action.timeUnit, action.val).format()})
+            newSchedule.arrival_time[action.timeUnit] = action.val
+            return Object.assign({}, state.vehicle_journey_at_stops[action.subIndex],  {arrival_time: newArr})
           }
         }else{
           return vjas