From fd537c998c2c25f2beeb8d9e17f7d91ca6973255 Mon Sep 17 00:00:00 2001
From: Zog
Date: Mon, 23 Apr 2018 13:27:50 +0200
Subject: Refs #6620; Show 'chrono' icon in computed journeys

---
 app/controllers/vehicle_journeys_controller.rb              | 6 +++---
 app/javascript/vehicle_journeys/reducers/vehicleJourneys.js | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 921a2cf7f..95eec7517 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -209,11 +209,11 @@ class VehicleJourneysController < ChouetteController
           full_schedule: item.full_schedule?,
           costs: item.costs,
           journey_length: item.journey_length,
-          stop_area_short_descriptions: item.stop_areas.map do |stop|
+          stop_area_short_descriptions: item.stop_points.map do |stop|
             {
               stop_area_short_description: {
-                id: stop.id,
-                name: stop.name,
+                id: stop.stop_area_id,
+                name: stop.stop_area.name,
                 object_id: item.objectid
               }
             }
diff --git a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
index 8432c5abe..f2d689014 100644
--- a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
@@ -40,6 +40,7 @@ const vehicleJourney= (state = {}, action, keep) => {
           }
           let offsetHours = sp.time_zone_offset / 3600
           let offsetminutes = sp.time_zone_offset/60 - 60*offsetHours
+
           newVjas = {
             delta: 0,
             arrival_time:{
@@ -53,6 +54,7 @@ const vehicleJourney= (state = {}, action, keep) => {
 
           if(sp.waiting_time && inJourney){
             current_time = actions.addMinutesToTime(current_time, parseInt(sp.waiting_time))
+            newVjas.delta = parseInt(sp.waiting_time)
           }
 
           newVjas.departure_time = {
-- 
cgit v1.2.3