diff options
Diffstat (limited to 'app')
7 files changed, 13 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 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 } ) diff --git a/app/helpers/routes_helper.rb b/app/helpers/routes_helper.rb index 4a9215653..a8c9a1f0c 100644 --- a/app/helpers/routes_helper.rb +++ b/app/helpers/routes_helper.rb @@ -21,7 +21,7 @@ module RoutesHelper def route_json_for_edit(route) route.stop_points.includes(:stop_area).order(:position).map do |stop_point| - stop_area_attributes = stop_point.stop_area.attributes.slice("name","city_name", "zip_code", "registration_number", "longitude", "latitude", "area_type") + stop_area_attributes = stop_point.stop_area.attributes.slice("name","city_name", "zip_code", "registration_number", "longitude", "latitude", "area_type", "comment") stop_area_attributes["short_name"] = truncate(stop_area_attributes["name"], :length => 30) || "" stop_point_attributes = stop_point.attributes.slice("for_boarding","for_alighting") stop_area_attributes.merge(stop_point_attributes).merge(stoppoint_id: stop_point.id, stoparea_id: stop_point.stop_area.id).merge(user_objectid: stop_point.stop_area.user_objectid) diff --git a/app/views/autocomplete_stop_areas/around.rabl b/app/views/autocomplete_stop_areas/around.rabl index da4e92552..bc8f06054 100644 --- a/app/views/autocomplete_stop_areas/around.rabl +++ b/app/views/autocomplete_stop_areas/around.rabl @@ -19,7 +19,8 @@ child @stop_areas, root: :features, object_root: false do user_objectid: s.user_objectid, zip_code: s.zip_code, latitude: s.latitude, - longitude: s.longitude + longitude: s.longitude, + comment: s.comment } end end diff --git a/app/views/autocomplete_stop_areas/index.rabl b/app/views/autocomplete_stop_areas/index.rabl index 5b7f71565..5a9f76a47 100644 --- a/app/views/autocomplete_stop_areas/index.rabl +++ b/app/views/autocomplete_stop_areas/index.rabl @@ -13,7 +13,8 @@ node do |stop_area| :user_objectid => stop_area.user_objectid, :longitude => stop_area.longitude, :latitude => stop_area.latitude, - :area_type => stop_area.area_type + :area_type => stop_area.area_type, + :comment => stop_area.comment } end |