Refs #3338: Fix duplicate vj not multiplying departureDelta

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

4 files changed, 9 insertions, 7 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 0af1bb53d..1997cc712 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -134,9 +134,10 @@ const actions = {
     type: 'SHIFT_VEHICLEJOURNEY',
     data
   }),
-  duplicateVehicleJourney : (data) => ({
+  duplicateVehicleJourney : (data, departureDelta) => ({
     type: 'DUPLICATE_VEHICLEJOURNEY',
-    data
+    data,
+    departureDelta
   }),
   deleteVehicleJourneys : () => ({
     type: 'DELETE_VEHICLEJOURNEYS'
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js
index 0cf102693..c136fda33 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js
@@ -18,8 +18,8 @@ class DuplicateVehicleJourney extends Component {
         }
       }
       let val = actions.getDuplicateDelta(_.find(actions.getSelected(this.props.vehicleJourneys)[0].vehicle_journey_at_stops, {'dummy': false}), newDeparture)
-      this.refs.additional_time.value = parseInt(this.refs.additional_time.value) + val
-      this.props.onDuplicateVehicleJourney(this.refs)
+      this.refs.additional_time.value = parseInt(this.refs.additional_time.value)
+      this.props.onDuplicateVehicleJourney(this.refs, val)
       this.props.onModalClose()
       $('#DuplicateVehicleJourneyModal').modal('hide')
     }
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DuplicateVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DuplicateVehicleJourney.js
index 6cf6f4039..224b52a19 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DuplicateVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DuplicateVehicleJourney.js
@@ -19,8 +19,8 @@ const mapDispatchToProps = (dispatch) => {
     onOpenDuplicateModal: () =>{
       dispatch(actions.openDuplicateModal())
     },
-    onDuplicateVehicleJourney: (data) =>{
-      dispatch(actions.duplicateVehicleJourney(data))
+    onDuplicateVehicleJourney: (data, departureDelta) =>{
+      dispatch(actions.duplicateVehicleJourney(data, departureDelta))
     }
   }
 }
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 c7e8d58e7..d463d4b8f 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -182,11 +182,12 @@ const vehicleJourneys = (state = [], action) => {
       let dupes = []
       let selectedIndex
       let val = action.data.additional_time.value
+      let departureDelta = action.departureDelta
       state.map((vj, i) => {
         if(vj.selected){
           selectedIndex = i
           for (i = 0; i< action.data.duplicate_number.value; i++){
-            action.data.additional_time.value = val * (i + 1)
+            action.data.additional_time.value = (parseInt(val) * (i + 1)) + departureDelta
             dupeVj = vehicleJourney(vj, action, false)
             dupeVj.published_journey_name = dupeVj.published_journey_name + '-' + i
             dupeVj.selected = false