diff options
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js | 6 | ||||
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 5 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/index.html.slim | 1 |
3 files changed, 10 insertions, 2 deletions
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 9f071069d..229fd2058 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js @@ -90,11 +90,15 @@ const modal = (state = {}, action) => { case 'CREATE_VEHICLEJOURNEY_MODAL': let selectedJP = {} if (window.jpOrigin){ + let stopAreas = _.map(window.jpOriginStopPoints, (sa, i) =>{ + return _.assign({}, {stop_area_short_description : {id : sa.stop_area_id}}) + }) selectedJP = { id: window.jpOrigin.id, name: window.jpOrigin.name, published_name: window.jpOrigin.published_name, - objectid: window.jpOrigin.objectid + objectid: window.jpOrigin.objectid, + stop_areas: stopAreas } } return { diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index 71787ba78..b48cae2e9 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -64,7 +64,10 @@ class VehicleJourneysController < ChouetteController } end - @jp_origin = Chouette::JourneyPattern.find_by(objectid: params[:jp]) + if params[:jp] + @jp_origin = Chouette::JourneyPattern.find_by(objectid: params[:jp]) + @jp_origin_stop_points = @jp_origin.stop_points + end index! do if collection.out_of_bounds? diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim index 38e07ad82..c300a20f3 100644 --- a/app/views/vehicle_journeys/index.html.slim +++ b/app/views/vehicle_journeys/index.html.slim @@ -16,6 +16,7 @@ | window.route_id = #{params[:route_id]}; | window.stopPoints = #{(@stop_points_list.to_json).html_safe}; | window.jpOrigin = #{(@jp_origin.to_json).html_safe}; + | window.jpOriginStopPoints = #{(@jp_origin_stop_points.to_json).html_safe}; | window.vehicleJourneysLength = #{@vehicle_journeys.total_entries()}; | window.vehicleJourneysPerPage = #{@ppage}; | window.line_footnotes = #{raw @footnotes}; |