From 222cf8538d59c5ecdc4a128d134e67115014138b Mon Sep 17 00:00:00 2001
From: Thomas Haddad
Date: Tue, 28 Feb 2017 11:04:12 +0100
Subject: Fix jp get via vj fetch

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
---
 .../javascripts/es6_browserified/vehicle_journeys/actions/index.js   | 2 +-
 .../es6_browserified/vehicle_journeys/components/VehicleJourney.js   | 2 +-
 .../vehicle_journeys/components/tools/CreateModal.js                 | 2 +-
 .../vehicle_journeys/components/tools/EditVehicleJourney.js          | 2 +-
 .../es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js    | 5 ++++-
 5 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'app/assets/javascripts')

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 48d2d9276..04fb26fa3 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -189,7 +189,7 @@ const actions = {
               return actions.getDelta(vjas)
             })
             vehicleJourneys.push({
-              journey_pattern_id: val.journey_pattern_id,
+              journey_pattern: val.journey_pattern,
               published_journey_name: val.published_journey_name,
               objectid: val.objectid,
               footnotes: val.footnotes,
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 9fbe74af1..43ce6d6cd 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -29,7 +29,7 @@ class VehicleJourney extends Component {
 
           {/* Id mission */}
           <p className='small'>
-            <strong>Id Mission: </strong>{this.props.value.journey_pattern_id}
+            <strong>Id Mission: </strong>{this.props.value.journey_pattern.objectid}
           </p>
 
           {/* Published name */}
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 c35b46393..49de64c54 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
@@ -59,7 +59,7 @@ class CreateModal extends Component {
                               <label className='control-label is-required'>ID de la mission</label>
                               <input
                                 type='text'
-                                ref='journey_pattern_id'
+                                ref='journey_pattern_objectid'
                                 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 9c5baf252..2161b4eb5 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
@@ -59,7 +59,7 @@ class EditVehicleJourney extends Component {
                         <div className='row'>
                           <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
                             <p>Mission
-                              <span> {this.props.modal.modalProps.vehicleJourney.journey_pattern_id}</span>
+                              <span> {this.props.modal.modalProps.vehicleJourney.journey_pattern.objectid}</span>
                             </p>
                           </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 879c7a83c..903677e5f 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -14,8 +14,11 @@ const vehicleJourney= (state = {}, action) => {
         vj.delta = 0
         delete vj['stop_area_object_id']
       })
+      let journeyPattern = {
+        objectid: action.data.journey_pattern_objectid.value
+      }
       return {
-        journey_pattern_id: parseInt(action.data.journey_pattern_id.value),
+        journey_pattern: journeyPattern,
         comment: action.data.comment.value,
         objectid: '',
         footnotes: [],
-- 
cgit v1.2.3