diff options
| author | Thomas Haddad | 2017-03-20 12:28:14 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2017-03-20 12:28:51 +0100 |
| commit | 531f4eb80fca4cd1902f34c79222dab7de5554c9 (patch) | |
| tree | 674a31ff5856a4c6a0cc2f283947098f7b160585 /app/assets/javascripts | |
| parent | fa522151f9506de1adad4cc023b5477a7550a263 (diff) | |
| download | chouette-core-531f4eb80fca4cd1902f34c79222dab7de5554c9.tar.bz2 | |
Refs #2876: Add data in sidebar when olmap is toggled
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts')
4 files changed, 31 insertions, 4 deletions
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js index cad7a9130..67310c6b6 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js +++ b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js @@ -19,7 +19,11 @@ class BSelect3 extends React.Component{ user_objectid: e.params.data.user_objectid, longitude: e.params.data.longitude, latitude: e.params.data.latitude, - name: e.params.data.name + name: e.params.data.name, + 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 }) } diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js index 91944a923..c880631f6 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js +++ b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js @@ -116,14 +116,32 @@ class OlMap extends Component{ {this.props.value.olMap.json.name} </p> <p> - <strong>N° d'enregistrement : </strong> - {this.props.value.olMap.json.registration_number} + <strong>Type d'arrêt : </strong> + {this.props.value.olMap.json.area_type} </p> <p> - <strong>ID Reflex : </strong> + <strong>Nom court : </strong> + {this.props.value.olMap.json.short_name} + </p> + <p> + <strong>Code Reflex : </strong> {this.props.value.olMap.json.user_objectid} </p> + <p> + <strong>Coordonnées : </strong> + WSG84 + {this.props.value.olMap.json.latitude} + {this.props.value.olMap.json.longitude} + </p> + <p> + <strong>Code Postal : </strong> + {this.props.value.olMap.json.zip_code} + </p> + <p> + <strong>Commune : </strong> + {this.props.value.olMap.json.city_name} + </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 05b171230..e4a28ab49 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/index.js +++ b/app/assets/javascripts/es6_browserified/itineraries/index.js @@ -25,6 +25,8 @@ const getInitialState = () => { stoppoint_id: v.stoppoint_id, stoparea_id: v.stoparea_id, user_objectid: v.user_objectid, + short_name: v.short_name, + area_type: v.area_type, index: i, edit: false, city_name: v.city_name, diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js index abbf7a0b7..6fc5c165f 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js +++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js @@ -71,6 +71,9 @@ const stopPoints = (state = [], action) => { latitude: action.text.latitude, longitude: action.text.longitude, name: action.text.name, + short_name: action.text.short_name, + area_type: action.text.area_type, + city_name: action.text.city_name, registration_number: action.text.registration_number } ) |