Fix Add specs and improve pad method

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

3 files changed, 21 insertions, 6 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 9991b51c8..a2a363d6e 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -209,7 +209,11 @@ const actions = {
     })
   },
   pad: (d) => {
-    return (d < 10) ? '0' + d.toString() : d.toString();
+    if(d.toString().length == 1){
+      return (d < 10) ? '0' + d.toString() : d.toString();
+    }else{
+      return d.toString()
+    }
   },
   getDelta: (vjas) => {
     let delta = 0
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 9fbe74af1..306635876 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -1,6 +1,7 @@
 var React = require('react')
 var Component = require('react').Component
 var PropTypes = require('react').PropTypes
+var actions = require('../actions')
 
 class VehicleJourney extends Component {
   constructor(props) {
@@ -62,7 +63,7 @@ class VehicleJourney extends Component {
                       max='23'
                       disabled = {this.props.value.deletable}
                       onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'hour', false, false)}}
-                      value={vj.arrival_time['hour']}
+                      value={actions.pad(vj.arrival_time['hour'])}
                     />
                     <span>:</span>
                     <input
@@ -71,7 +72,7 @@ class VehicleJourney extends Component {
                       max='59'
                       disabled = {this.props.value.deletable}
                       onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'minute', false, false)}}
-                      value={vj.arrival_time['minute']}
+                      value={actions.pad(vj.arrival_time['minute'])}
                     />
                   </span>
                 }
@@ -85,7 +86,7 @@ class VehicleJourney extends Component {
                     max='23'
                     disabled = {this.props.value.deletable}
                     onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'hour', true, this.props.filters.toggleArrivals)}}
-                    value={vj.departure_time['hour']}
+                    value={actions.pad(vj.departure_time['hour'])}
                   />
                   <span>:</span>
                   <input
@@ -94,7 +95,7 @@ class VehicleJourney extends Component {
                     max='59'
                     disabled = {this.props.value.deletable}
                     onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, "minute", true,  this.props.filters.toggleArrivals)}}
-                    value={vj.departure_time['minute']}
+                    value={actions.pad(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 3d02f9371..ec78ec0aa 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -5,13 +5,23 @@ const vehicleJourney= (state = {}, action) => {
     case 'SELECT_VEHICLEJOURNEY':
       return Object.assign({}, state, {selected: !state.selected})
     case 'ADD_VEHICLEJOURNEY':
+      let pristineVjas = JSON.parse(JSON.stringify(state[0].vehicle_journey_at_stops))
+      pristineVjas.map((vj) =>{
+        vj.departure_time.hour = '00'
+        vj.departure_time.minute = '00'
+        vj.arrival_time.hour = '00'
+        vj.arrival_time.minute = '00'
+        vj.delta = 0
+        delete vj['stop_area_object_id']
+      })
       return {
         journey_pattern_id: parseInt(action.data.journey_pattern_id.value),
         comment: action.data.comment.value,
         objectid: '',
         footnotes: [],
         time_tables: [],
-        vehicle_journey_at_stops: [],
+        vehicle_journey_at_stops: pristineVjas,
+        selected: false,
         deletable: false
       }
     case 'SHIFT_VEHICLEJOURNEY':