conflicts resolved

5 files changed, 17 insertions, 16 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..e90d2d307 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'
@@ -458,20 +459,20 @@ const actions = {
       schedule.arrival_time.hour = parseInt(schedule.arrival_time.hour) + hours
     }
 
-    if(schedule.departure_time.hour > 23){
+    if(parseInt(schedule.departure_time.hour) > 23){
       schedule.departure_time.hour = '23'
       schedule.departure_time.minute = '59'
     }
-    if(schedule.arrival_time.hour > 23){
+    if(parseInt(schedule.arrival_time.hour) > 23){
       schedule.arrival_time.hour = '23'
       schedule.arrival_time.minute = '59'
     }
 
-    if(schedule.departure_time.hour < 0){
+    if(parseInt(schedule.departure_time.hour) < 0){
       schedule.departure_time.hour = '00'
       schedule.departure_time.minute = '00'
     }
-    if(schedule.arrival_time.hour > 23){
+    if(parseInt(schedule.arrival_time.hour) < 0){
       schedule.arrival_time.hour = '00'
       schedule.arrival_time.minute = '00'
     }
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..aa1a13b11 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')
     }
@@ -51,10 +51,9 @@ class DuplicateVehicleJourney extends Component {
               <div className='modal-dialog'>
                 <div className='modal-content'>
                   <div className='modal-header'>
-                    <h4 className='modal-title'>Dupliquer une course</h4>
-                    {(this.props.modal.type == 'duplicate') && (
-                      <em>Dupliquer les horaires de la course {actions.humanOID(actions.getSelected(this.props.vehicleJourneys)[0].objectid)}</em>
-                    )}
+                    <h4 className='modal-title'>
+                      Dupliquer { actions.getSelected(this.props.vehicleJourneys).length > 1 ? 'plusieurs courses' : 'une course' }
+                    </h4>
                   </div>
 
                   {(this.props.modal.type == 'duplicate') && (
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
index 932c56532..9919ee9dd 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
@@ -70,7 +70,7 @@ class EditVehicleJourney extends Component {
                               <input
                                 type='text'
                                 className='form-control'
-                                value={(this.props.modal.modalProps.vehicleJourney.journey_pattern.objectid) + ' - ' + (this.props.modal.modalProps.vehicleJourney.journey_pattern.name)}
+                                value={actions.humanOID(this.props.modal.modalProps.vehicleJourney.journey_pattern.objectid) + ' - ' + (this.props.modal.modalProps.vehicleJourney.journey_pattern.name)}
                                 disabled={true}
                               />
                             </div>
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