From 2ae5c38f434a8d28885b13e048a4adc088544313 Mon Sep 17 00:00:00 2001
From: Zog
Date: Thu, 28 Dec 2017 10:05:59 +0100
Subject: Refs #5433 @0.5h; Show journeys names in editor

---
 app/javascript/vehicle_journeys/actions/index.js   | 32 ++++++++++------------
 .../vehicle_journeys/components/VehicleJourney.js  |  1 +
 .../vehicle_journeys/components/VehicleJourneys.js |  1 +
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'app/javascript')

diff --git a/app/javascript/vehicle_journeys/actions/index.js b/app/javascript/vehicle_journeys/actions/index.js
index 202c09440..4f8e134e0 100644
--- a/app/javascript/vehicle_journeys/actions/index.js
+++ b/app/javascript/vehicle_journeys/actions/index.js
@@ -361,23 +361,21 @@ const actions = {
               actions.fillEmptyFields(vjas)
               return actions.getDelta(vjas)
             })
-            vehicleJourneys.push({
-              journey_pattern: val.journey_pattern,
-              published_journey_name: val.published_journey_name,
-              objectid: val.objectid,
-              short_id: val.short_id,
-              footnotes: val.footnotes,
-              time_tables: timeTables,
-              purchase_windows: purchaseWindows,
-              vehicle_journey_at_stops: vjasWithDelta,
-              deletable: false,
-              selected: false,
-              published_journey_name: val.published_journey_name || 'non renseigné',
-              published_journey_identifier: val.published_journey_identifier || 'non renseigné',
-              company: val.company || 'non renseigné',
-              transport_mode: val.route.line.transport_mode || 'undefined',
-              transport_submode: val.route.line.transport_submode || 'undefined'
-            })
+
+            vehicleJourneys.push(
+              _.assign({}, val, {
+                time_tables: timeTables,
+                purchase_windows: purchaseWindows,
+                vehicle_journey_at_stops: vjasWithDelta,
+                deletable: false,
+                selected: false,
+                published_journey_name: val.published_journey_name || 'non renseigné',
+                published_journey_identifier: val.published_journey_identifier || 'non renseigné',
+                company: val.company || 'non renseigné',
+                transport_mode: val.route.line.transport_mode || 'undefined',
+                transport_submode: val.route.line.transport_submode || 'undefined'
+              })
+            )
           }
           window.currentItemsLength = vehicleJourneys.length
           dispatch(actions.receiveVehicleJourneys(vehicleJourneys))
diff --git a/app/javascript/vehicle_journeys/components/VehicleJourney.js b/app/javascript/vehicle_journeys/components/VehicleJourney.js
index 1e62444ef..31db10129 100644
--- a/app/javascript/vehicle_journeys/components/VehicleJourney.js
+++ b/app/javascript/vehicle_journeys/components/VehicleJourney.js
@@ -68,6 +68,7 @@ export default class VehicleJourney extends Component {
           }
           >
           <div className='strong mb-xs'>{this.props.value.short_id || '-'}</div>
+          <div>{this.props.value.comment || '-'}</div>
           <div>{this.props.value.journey_pattern.short_id || '-'}</div>
           <div>
             {time_tables.slice(0,3).map((tt, i)=>
diff --git a/app/javascript/vehicle_journeys/components/VehicleJourneys.js b/app/javascript/vehicle_journeys/components/VehicleJourneys.js
index e16d03f90..dc480d6b4 100644
--- a/app/javascript/vehicle_journeys/components/VehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/components/VehicleJourneys.js
@@ -115,6 +115,7 @@ export default class VehicleJourneys extends Component {
               <div className='t2e-head w20'>
                 <div className='th'>
                   <div className='strong mb-xs'>ID course</div>
+                  <div>Nom course</div>
                   <div>ID mission</div>
                   <div>Calendriers</div>
                   { this.hasFeature('purchase_windows') && <div>Calendriers Commerciaux</div> }
-- 
cgit v1.2.3


From d6b14504f350e4bf5de3d7a68928c433fef70de7 Mon Sep 17 00:00:00 2001
From: Zog
Date: Thu, 28 Dec 2017 11:11:20 +0100
Subject: Refs #5433; Use `published_journey_name` instead of `comment`
 attribute

---
 app/javascript/vehicle_journeys/components/VehicleJourney.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/javascript')

diff --git a/app/javascript/vehicle_journeys/components/VehicleJourney.js b/app/javascript/vehicle_journeys/components/VehicleJourney.js
index 31db10129..30b329896 100644
--- a/app/javascript/vehicle_journeys/components/VehicleJourney.js
+++ b/app/javascript/vehicle_journeys/components/VehicleJourney.js
@@ -68,7 +68,7 @@ export default class VehicleJourney extends Component {
           }
           >
           <div className='strong mb-xs'>{this.props.value.short_id || '-'}</div>
-          <div>{this.props.value.comment || '-'}</div>
+          <div>{this.props.value.published_journey_name && this.props.value.published_journey_name != "non renseigné" ? this.props.value.published_journey_name : '-'}</div>
           <div>{this.props.value.journey_pattern.short_id || '-'}</div>
           <div>
             {time_tables.slice(0,3).map((tt, i)=>
-- 
cgit v1.2.3