Refs #2502: fix and show proper timetables data from state

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>

2 files changed, 17 insertions, 1 deletions

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
index ae43d6823..b89f52258 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -72,12 +72,20 @@ const actions = {
         } else {
           let val
           for (val of json){
+            var timeTables = []
+            let tt
+            for (tt of val.time_tables){
+              timeTables.push({
+                objectid: tt.objectid,
+                comment: tt.comment
+              })
+            }
             vehicleJourneys.push({
               journey_pattern_id: val.journey_pattern_id,
               published_journey_name: val.published_journey_name,
               objectid: val.objectid,
               footnotes: val.footnotes,
-              time_tables: val.time_tables,
+              time_tables: timeTables,
               vehicle_journey_at_stops: val.vehicle_journey_at_stops,
               deletable: false
             })
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
index 7504d5328..ab3375a32 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -33,6 +33,14 @@ class VehicleJourney extends Component {
           <p className='small'>
             <strong>Registration number: </strong>{this.props.value.registration_number}
           </p>
+
+          <p className='small'>
+            <strong>Calendars: </strong>
+            {this.props.value.time_tables.map((tt, i)=>
+              <span key = {i}>{tt.objectid}</span>
+            )}
+          </p>
+
           <ul className='list-group'>
             {this.props.value.vehicle_journey_at_stops.map((vj, i) =>
               <li