Disable duplicate modal submit button on conditions

3 files changed, 21 insertions, 12 deletions

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 780b10916..9446b993a 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
@@ -9,14 +9,21 @@ class DuplicateVehicleJourney extends Component {
     super(props)
     this.state = {}
     this.onFormChange = this.onFormChange.bind(this)
+    this.handleSubmit = this.handleSubmit.bind(this)
   }
 
   componentWillReceiveProps() {
     if (actions.getSelected(this.props.vehicleJourneys).length > 0) {
+      let hour = parseInt(this.getDefaultValue('hour'))
+      let miunte = parseInt(this.getDefaultValue('minute'))
       this.setState((state, props) => {
         return {
-          duplicate_time_hh: parseInt(this.getDefaultValue('hour')),
-          duplicate_time_mm: parseInt(this.getDefaultValue('minute')),
+          originalDT: {
+            hour: hour,
+            minute: miunte
+          },
+          duplicate_time_hh: hour,
+          duplicate_time_mm: miunte,
           additional_time: 0,
           duplicate_number: 1
         }
@@ -54,11 +61,10 @@ class DuplicateVehicleJourney extends Component {
   }
 
   render() {
-
     if(this.props.status.isFetching == true) {
       return false
     }
-    if(this.props.status.fetchSuccess == true) {
+    if(this.props.status.fetchSuccess == true && actions.getSelected(this.props.vehicleJourneys).length > 0) {
       return (
         <li  className='st_action'>
           <button
@@ -164,9 +170,9 @@ class DuplicateVehicleJourney extends Component {
                           Annuler
                         </button>
                         <button
-                          className={'btn btn-primary ' + (this.state.additional_time == 0 ? 'disabled' : '')}
+                          className={'btn btn-primary ' + (this.state.additional_time == 0 && this.state.originalDT.hour == this.state.duplicate_time_hh && this.state.originalDT.minute == this.state.duplicate_time_mm ? 'disabled' : '')}
                           type='button'
-                          onClick={this.handleSubmit.bind(this)}
+                          onClick={this.handleSubmit}
                           >
                           Valider
                         </button>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
index 7872899dc..53bbcf952 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
@@ -8,10 +8,10 @@ var actions = require("./actions")
 var enableBatching = require('./batch').enableBatching
 
 // logger, DO NOT REMOVE
-var applyMiddleware = require('redux').applyMiddleware
-var createLogger = require('redux-logger')
-var thunkMiddleware = require('redux-thunk').default
-var promise = require('redux-promise')
+// var applyMiddleware = require('redux').applyMiddleware
+// var createLogger = require('redux-logger')
+// var thunkMiddleware = require('redux-thunk').default
+// var promise = require('redux-promise')
 
 var selectedJP = []
 
@@ -86,12 +86,12 @@ if (window.jpOrigin){
   initialState.filters.queryString = actions.encodeParams(params)
 }
 
-const loggerMiddleware = createLogger()
+// const loggerMiddleware = createLogger()
 
 let store = createStore(
   enableBatching(vehicleJourneysApp),
   initialState,
-  applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
+  // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
 )
 
 render(
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 d397e7632..969b2ddd8 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -178,6 +178,9 @@ const vehicleJourneys = (state = [], action) => {
         if(vj.selected){
           selectedIndex = i
           for (i = 0; i< action.duplicateNumber; i++){
+            // We check if the departureDelta is != 0 to create the first VJ on the updated deparure time if it is the case
+            // let delta = departureDelta == 0 ? 1 : 0
+            // action.addtionalTime = (val * (i + delta)) + departureDelta
             action.addtionalTime = (val * (i + 1)) + departureDelta
             dupeVj = vehicleJourney(vj, action, false)
             dupeVj.published_journey_name = dupeVj.published_journey_name + '-' + i