diff options
| author | Thomas Haddad | 2017-05-03 11:45:45 +0200 |
|---|---|---|
| committer | Thomas Haddad | 2017-05-03 11:46:21 +0200 |
| commit | 534bc4065c4b3a2ed0a10527f27bac4e7b5aa472 (patch) | |
| tree | bfcb7020fbef040ecef7202b9a5328989e2f501a /app/assets/javascripts | |
| parent | e4880ded62ee261a25a464073add6e202d62216c (diff) | |
| download | chouette-core-534bc4065c4b3a2ed0a10527f27bac4e7b5aa472.tar.bz2 | |
Refs #3096: Add/store comment when olmap is toggled
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts')
4 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js index dae62d3e1..64c6d3ac7 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js +++ b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js @@ -24,7 +24,8 @@ class BSelect3 extends React.Component{ short_name: e.params.data.short_name, city_name: e.params.data.city_name, area_type: e.params.data.area_type, - zip_code: e.params.data.zip_code + zip_code: e.params.data.zip_code, + comment: e.params.data.comment }) } diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js index 0eca5f3ff..b9e106c1a 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js +++ b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js @@ -142,6 +142,10 @@ class OlMap extends Component{ <strong>Commune : </strong> {this.props.value.olMap.json.city_name} </p> + <p> + <strong>Commentaire : </strong> + {this.props.value.olMap.json.comment} + </p> {(this.props.value.stoparea_id != this.props.value.olMap.json.stoparea_id) &&( <div className='btn btn-outline-primary btn-sm' onClick= {() => {this.props.onUpdateViaOlMap(this.props.index, this.props.value.olMap.json)}} diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js index 57c63a97b..12a44e376 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/index.js +++ b/app/assets/javascripts/es6_browserified/itineraries/index.js @@ -38,6 +38,7 @@ const getInitialState = () => { for_alighting: v.for_alighting || "normal", longitude: v.longitude || 0, latitude: v.latitude || 0, + comment: v.comment, olMap: { isOpened: false, json: {} diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js index 79b9648a6..a1be73cd9 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js +++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js @@ -75,6 +75,7 @@ const stopPoints = (state = [], action) => { short_name: action.text.short_name, area_type: action.text.area_type, city_name: action.text.city_name, + comment: action.text.comment, registration_number: action.text.registration_number } ) |