aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haddad2017-04-28 15:50:43 +0200
committerThomas Haddad2017-04-28 15:52:00 +0200
commitd06337d3d62625bc1c3cd19f69f8919db0f16883 (patch)
tree2b0ee470121f69ea61957a4457b44496fce90644
parent8b9860880bc99432ee9317158102a9d646da13f4 (diff)
downloadchouette-core-d06337d3d62625bc1c3cd19f69f8919db0f16883.tar.bz2
Refs #3171: Add start input in duplicate modal + update state
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js5
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js26
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DuplicateVehicleJourney.js4
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js4
4 files changed, 33 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 65576f094..b436f92f8 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -95,8 +95,9 @@ const actions = {
openShiftModal : () => ({
type : 'SHIFT_VEHICLEJOURNEY_MODAL'
}),
- openDuplicateModal : () => ({
- type : 'DUPLICATE_VEHICLEJOURNEY_MODAL'
+ openDuplicateModal : (vj) => ({
+ type : 'DUPLICATE_VEHICLEJOURNEY_MODAL',
+ vehicleJourney: vj
}),
selectVehicleJourney : (index) => ({
type : 'SELECT_VEHICLEJOURNEY',
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 d9369a6ef..8e6268dc9 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
@@ -28,7 +28,7 @@ class DuplicateVehicleJourney extends Component {
disabled={((actions.getSelected(this.props.vehicleJourneys).length >= 1 && this.props.filters.policy['vehicle_journeys.edit']) ? '' : 'disabled')}
data-toggle='modal'
data-target='#DuplicateVehicleJourneyModal'
- onClick={this.props.onOpenDuplicateModal}
+ onClick={() => this.props.onOpenDuplicateModal(actions.getSelected(this.props.vehicleJourneys)[0])}
>
<span className='fa fa-files-o'></span>
</button>
@@ -50,6 +50,30 @@ class DuplicateVehicleJourney extends Component {
<div className='row'>
<div className='col-lg-8 col-md-8 col-sm-8 col-xs-12'>
<div className='form-group'>
+ <label className='control-label is-required'>Horaire de départ</label>
+ <span className={'input-group time'}>
+ <input
+ type='number'
+ min='00'
+ max='23'
+ className='form-control'
+ value={'00'}
+ />
+ <span>:</span>
+ <input
+ type='number'
+ min='00'
+ max='59'
+ className='form-control'
+ value={'00'}
+ />
+ </span>
+ </div>
+ </div>
+ </div>
+ <div className='row'>
+ <div className='col-lg-8 col-md-8 col-sm-8 col-xs-12'>
+ <div className='form-group'>
<label className='control-label is-required'>Nombre de courses à créer et dupliquer</label>
<input
type='number'
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..375456ebc 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
@@ -16,8 +16,8 @@ const mapDispatchToProps = (dispatch) => {
onModalClose: () =>{
dispatch(actions.closeModal())
},
- onOpenDuplicateModal: () =>{
- dispatch(actions.openDuplicateModal())
+ onOpenDuplicateModal: (vj) =>{
+ dispatch(actions.openDuplicateModal(vj))
},
onDuplicateVehicleJourney: (data) =>{
dispatch(actions.duplicateVehicleJourney(data))
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js
index 3b13ab9de..30164c3ef 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js
@@ -116,7 +116,9 @@ const modal = (state = {}, action) => {
case 'DUPLICATE_VEHICLEJOURNEY_MODAL':
return {
type: 'duplicate',
- modalProps: {},
+ modalProps: {
+ vehicleJourney: action.vehicleJourney
+ },
confirmModal: {}
}
case 'CLOSE_MODAL':