diff options
Diffstat (limited to 'app/assets/javascripts')
3 files changed, 7 insertions, 8 deletions
diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js index 12a44e376..53f7bc7f9 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/index.js +++ b/app/assets/javascripts/es6_browserified/itineraries/index.js @@ -5,6 +5,7 @@ var createStore = require('redux').createStore var reducers = require('./reducers') var App = require('./components/App') var addInput = require('./form_helper') +let datas = JSON.parse(decodeURIComponent(window.itinerary_stop)) // logger, DO NOT REMOVE // var applyMiddleware = require('redux').applyMiddleware @@ -14,7 +15,6 @@ var addInput = require('./form_helper') const getInitialState = () => { let state = [] - let datas = JSON.parse(decodeURIComponent(window.itinerary_stop)) datas.map(function(v, i) { let fancyText = v.name.replace("'", "\'") @@ -67,10 +67,7 @@ render( document.querySelector('input[name=commit]').addEventListener('click', (event)=>{ let state = store.getState() state.stopPoints.map((stopPoint, i) => { - if (stopPoint.stoppoint_id == undefined){ - stopPoint.stoppoint_id = "" - } - addInput('id',stopPoint.stoppoint_id, i) + addInput('id', (datas[i]) ? datas[i].stoppoint_id : '', i) addInput('stop_area_id',stopPoint.stoparea_id, i) addInput('position',i, i) addInput('for_boarding',stopPoint.for_boarding, i) diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js b/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js index e90099283..cc7980b22 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js @@ -17,7 +17,7 @@ class ExceptionsInDay extends Component { <div className='td'> <button type='button' - className='btn btn-circle' + className={'btn btn-circle' + (this.props.value.current_month[this.props.index].excluded_date ? ' active' : '')} data-actiontype='remove' onClick={(e) => { $(e.currentTarget).toggleClass('active') @@ -33,7 +33,7 @@ class ExceptionsInDay extends Component { <div className='td'> <button type='button' - className='btn btn-circle' + className={'btn btn-circle' + (this.props.value.current_month[this.props.index].include_date ? ' active' : '')} data-actiontype='add' onClick={(e) => { $(e.currentTarget).toggleClass('active') 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 bab6fa78f..f5e01de7c 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 @@ -64,7 +64,7 @@ class DuplicateVehicleJourney extends Component { <div className='col-lg-3 col-md-3 col-sm-3 col-xs-3'> <div className='form-group'> <label className='control-label is-required'>Horaire de départ</label> - <span className={'input-group time'}> + <span className={'input-group time' + (actions.getSelected(this.props.vehicleJourneys).length > 1 ? ' disabled' : '')}> <input type='number' ref='duplicate_time_hh' @@ -72,6 +72,7 @@ class DuplicateVehicleJourney extends Component { max='23' className='form-control' defaultValue={this.getDefaultValue('hour')} + disabled={(actions.getSelected(this.props.vehicleJourneys).length > 1 ? 'disabled' : '')} /> <span>:</span> <input @@ -81,6 +82,7 @@ class DuplicateVehicleJourney extends Component { max='59' className='form-control' defaultValue={this.getDefaultValue('minute')} + disabled={(actions.getSelected(this.props.vehicleJourneys).length > 1 ? 'disabled' : '')} /> </span> </div> |