diff options
| author | Thomas Haddad | 2017-01-17 16:02:48 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2017-01-17 16:02:48 +0100 |
| commit | a6334f6c73bb85d3d7e78861cecdf4172c26bdd4 (patch) | |
| tree | 25ad0e4cc1aa6e0cd6620c1fa52267bc7847e71d /app/assets/javascripts | |
| parent | ca371715123aa629925b05a7690697852c47b40d (diff) | |
| download | chouette-core-a6334f6c73bb85d3d7e78861cecdf4172c26bdd4.tar.bz2 | |
Refs #2403: Add button to toggle map corresponding to stop point
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts')
5 files changed, 19 insertions, 2 deletions
diff --git a/app/assets/javascripts/es6_browserified/itineraries/actions/index.js b/app/assets/javascripts/es6_browserified/itineraries/actions/index.js index 7d225f2f6..f9886fec2 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/actions/index.js +++ b/app/assets/javascripts/es6_browserified/itineraries/actions/index.js @@ -36,7 +36,11 @@ const actions = { select_value: e.currentTarget.value, index } - } + }, + toggleMap: (index) =>({ + type: 'TOGGLE_MAP', + index + }) } module.exports = actions diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js index 30e7387c6..4eb9ed315 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js +++ b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js @@ -14,6 +14,12 @@ const StopPoint = (props) => { <div style={{display: 'inline-block', width: '80%', verticalAlign: 'middle'}}> <label>ArrĂȘt</label> <BSelect2 id={'route_stop_points_' + props.id} value={props.value} onChange={props.onChange} index={props.index} /> + <div + className={'btn btn-primary'} + onClick={props.onToggleMap} + > + <span className='fa fa-map-marker'></span> + </div> </div> </div> @@ -64,6 +70,7 @@ const StopPoint = (props) => { } StopPoint.propTypes = { + onToggleMap: PropTypes.func.isRequired, onDeleteClick: PropTypes.func.isRequired, onMoveUpClick: PropTypes.func.isRequired, onMoveDownClick: PropTypes.func.isRequired, diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js b/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js index 6c1afd48d..f26059327 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js +++ b/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js @@ -2,7 +2,7 @@ var React = require('react') var PropTypes = require('react').PropTypes var StopPoint = require('./StopPoint') -const StopPointList = ({ stopPoints, onDeleteClick, onMoveUpClick, onMoveDownClick, onChange, onSelectChange }) => { +const StopPointList = ({ stopPoints, onDeleteClick, onMoveUpClick, onMoveDownClick, onChange, onSelectChange, onToggleMap }) => { return ( <div className='list-group'> {stopPoints.map((stopPoint, index) => @@ -15,6 +15,7 @@ const StopPointList = ({ stopPoints, onDeleteClick, onMoveUpClick, onMoveDownCli onMoveDownClick={() => onMoveDownClick(index)} onChange={ onChange } onSelectChange={ (e) => onSelectChange(e, index) } + onToggleMap={() => onToggleMap(index)} first={ index === 0 } last={ index === (stopPoints.length - 1) } index={ index } diff --git a/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js index 729d27227..21d668cc3 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js +++ b/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js @@ -24,6 +24,9 @@ const mapDispatchToProps = (dispatch) => { }, onSelectChange: (e, index) =>{ dispatch(actions.updateSelectValue(e, index)) + }, + onToggleMap: (index) =>{ + dispatch(actions.toggleMap(index)) } } } diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js index 010ded766..8cf57e2c1 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js +++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js @@ -77,6 +77,8 @@ const stopPoints = (state = [], action) => { return t } }) + case 'TOGGLE_MAP': + return state default: return state } |
