Merge branch 'master' of github.com:af83/stif-boiv

2 files changed, 7 insertions, 6 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 7e4665e57..65576f094 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -297,7 +297,8 @@ const actions = {
               timeTables.push({
                 objectid: tt.objectid,
                 comment: tt.comment,
-                id: tt.id
+                id: tt.id,
+                color: tt.color
               })
             }
             let vjasWithDelta = val.vehicle_journey_at_stops.map((vjas, i) => {
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 63a666d90..d795d76e3 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -17,12 +17,12 @@ class VehicleJourney extends Component {
     return bool
   }
 
-  timeTableURL(id) {
+  timeTableURL(tt) {
     let refURL = window.location.pathname.split('/', 3).join('/')
-    let ttURL = refURL + '/time_tables/' + id
+    let ttURL = refURL + '/time_tables/' + tt.id
 
     return (
-      <a href={ttURL} title='Voir le calendrier'><span className='fa fa-calendar'></span></a>
+      <a href={ttURL} title='Voir le calendrier'><span className='fa fa-calendar' style={{color: (tt.color ? tt.color : '')}}></span></a>
     )
   }
 
@@ -46,12 +46,12 @@ class VehicleJourney extends Component {
     this.previousCity = undefined
 
     return (
-      <div className={'t2e-item' + (this.props.value.deletable ? ' disabled' : '')}>
+      <div className={'t2e-item' + (this.props.value.deletable ? ' disabled' : '') + (this.props.value.errors ? ' has-error': '')}>
         <div className='th'>
           <div className='strong mb-xs'>{this.props.value.objectid ? this.props.value.objectid : '-'}</div>
           <div>{this.props.value.journey_pattern.objectid}</div>
           {this.props.value.time_tables.map((tt, i)=>
-            <div key={i}>{this.timeTableURL(tt.id)}</div>
+            <div key={i}>{this.timeTableURL(tt)}</div>
           )}
 
           {(this.props.filters.policy['vehicle_journeys.edit'] == true) &&