Refs #2521: Fix use correct vj properties (published journey name / id & company)

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

7 files changed, 34 insertions, 21 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 166705f4a..8c9f3822c 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -199,7 +199,10 @@ const actions = {
               time_tables: timeTables,
               vehicle_journey_at_stops: vjasWithDelta,
               deletable: false,
-              selected: false
+              selected: false,
+              published_journey_name: val.published_journey_name || 'non renseigné',
+              published_journey_identifier: val.published_journey_name || 'non renseigné',
+              company_id: val.published_journey_name || 'non renseigné'
             })
           }
           // if(vehicleJourneys.length != window.vehicleJourneysPerPage){
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 43ce6d6cd..752d14992 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -24,7 +24,7 @@ class VehicleJourney extends Component {
 
           {/* Nom */}
           <p className='small'>
-            <strong>Nom: </strong>{this.props.value.comment}
+            <strong>Nom: </strong>{this.props.value.published_journey_name}
           </p>
 
           {/* Id mission */}
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
index d620936b4..7ae3d4a8a 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
@@ -47,7 +47,7 @@ class CreateModal extends Component {
                           <label className='control-label is-required'>Nom de la course</label>
                           <input
                             type='text'
-                            ref='comment'
+                            ref='published_journey_name'
                             className='form-control'
                             onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
                             required
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
index e2c109aab..5e48b41fb 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
@@ -45,12 +45,12 @@ class EditVehicleJourney extends Component {
                     <form>
                       <div className='modal-body'>
                         <div className='form-group'>
-                          <label className='control-label is-required'>Nom</label>
+                          <label className='control-label is-required'>Intitulé de la course</label>
                           <input
                             type='text'
-                            ref='comment'
+                            ref='published_journey_name'
                             className='form-control'
-                            defaultValue={this.props.modal.modalProps.vehicleJourney.comment}
+                            defaultValue={this.props.modal.modalProps.vehicleJourney.published_journey_name}
                             onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
                             required
                             />
@@ -63,12 +63,20 @@ class EditVehicleJourney extends Component {
                         </div>
                         <div className='row'>
                           <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
-                            NUMERO DE TRAIN??
+                          <label className='control-label is-required'>Numéro de train</label>
+                          <input
+                            type='text'
+                            ref='published_journey_identifier'
+                            className='form-control'
+                            defaultValue={this.props.modal.modalProps.vehicleJourney.published_journey_identifier}
+                            onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
+                            required
+                            />
                           </div>
                         </div>
                         <div className='row'>
                           <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
-                            TRANSPORTEUR??
+                            <p>Transporteur <span> {this.props.modal.modalProps.vehicleJourney.company_id}</span></p>
                           </div>
                         </div>
                       </div>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
index ce6c89379..36fe110ed 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -21,7 +21,7 @@ const vehicleJourney= (state = {}, action) => {
       }
       return {
         journey_pattern: journeyPattern,
-        comment: action.data.comment.value,
+        published_journey_name: action.data.published_journey_name.value,
         objectid: '',
         footnotes: [],
         time_tables: [],
@@ -102,7 +102,8 @@ const vehicleJourneys = (state = [], action) => {
       return state.map((vj, i) => {
         if (vj.selected){
           return Object.assign({}, vj, {
-            comment: action.data.comment.value,
+            published_journey_name: action.data.published_journey_name.value,
+            published_journey_identifier: action.data.published_journey_identifier.value,
           })
         }else{
           return vj
@@ -150,7 +151,7 @@ const vehicleJourneys = (state = [], action) => {
           for (i = 0; i< action.data.duplicate_number.value; i++){
             action.data.additional_time.value *= (i + 1)
             dupeVj = vehicleJourney(vj, action)
-            dupeVj.comment = dupeVj.comment + '-' + i
+            dupeVj.published_journey_name = dupeVj.published_journey_name + '-' + i
             dupeVj.selected = false
             delete dupeVj['objectid']
             dupes.push(dupeVj)
diff --git a/app/views/vehicle_journeys/show.rabl b/app/views/vehicle_journeys/show.rabl
index 1a2e877ec..fc650784c 100644
--- a/app/views/vehicle_journeys/show.rabl
+++ b/app/views/vehicle_journeys/show.rabl
@@ -1,7 +1,7 @@
 object @vehicle_journey
 
-[ :objectid, :published_journey_name].each do |attr|
-  attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+[ :objectid, :published_journey_name, :published_journey_identifier, :company_id].each do |attr|
+  attributes attr, :unless => lambda { |m| m.send( attr)}
 end
 
 child(:journey_pattern) do |journey_pattern|
diff --git a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
index 422cd1461..02e9deffc 100644
--- a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
+++ b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
@@ -17,13 +17,13 @@ let fakeFootnotes = [{
 }]
 
 let fakeTimeTables = [{
-  comment: 'test 1',
+  published_journey_name: 'test 1',
   objectid: '1'
 },{
-  comment: 'test 2',
+  published_journey_name: 'test 2',
   objectid: '2'
 },{
-  comment: 'test 3',
+  published_journey_name: 'test 3',
   objectid: '3'
 }]
 let fakeVJAS = [{
@@ -86,7 +86,7 @@ describe('vehicleJourneys reducer', () => {
     }]
     let fakeData = {
       journey_pattern_objectid: {value : '1'},
-      comment: {value: 'test'}
+      published_journey_name: {value: 'test'}
     }
     expect(
       vjReducer(state, {
@@ -95,7 +95,7 @@ describe('vehicleJourneys reducer', () => {
       })
     ).toEqual([{
       journey_pattern: {objectid: '1'},
-      comment: 'test',
+      published_journey_name: 'test',
       objectid: '',
       footnotes: [],
       time_tables: [],
@@ -217,7 +217,7 @@ describe('vehicleJourneys reducer', () => {
       additional_time: {value: '5'}
     }
     let newVJ = Object.assign({}, state[0], {vehicle_journey_at_stops: newVJAS, selected: false})
-    newVJ.comment = state[0].comment + '-0'
+    newVJ.published_journey_name = state[0].published_journey_name + '-0'
     delete newVJ['objectid']
     expect(
       vjReducer(state, {
@@ -229,9 +229,10 @@ describe('vehicleJourneys reducer', () => {
 
   it('should handle EDIT_VEHICLEJOURNEY', () => {
     let fakeData = {
-      comment: {value : 'toto'},
+      published_journey_name: {value : 'test'},
+      published_journey_identifier: {value: 'test'}
     }
-    let newVJ = Object.assign({}, state[0], {comment: fakeData.comment.value})
+    let newVJ = Object.assign({}, state[0], {published_journey_name: fakeData.published_journey_name.value, published_journey_identifier: fakeData.published_journey_identifier.value})
     expect(
       vjReducer(state, {
         type: 'EDIT_VEHICLEJOURNEY',