aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haddad2017-05-23 12:16:10 +0200
committerThomas Haddad2017-05-23 12:16:10 +0200
commit7cd3e749a8b90080d2721a2170c66c1c4339d519 (patch)
tree3615eb10cceb481a89aa7fac610c0f05a04f570c
parent77cb1e77f311f84f5b3dd6475a292b2a4885678c (diff)
downloadchouette-core-7cd3e749a8b90080d2721a2170c66c1c4339d519.tar.bz2
Refs #3464: Add published journey identifier field when creating vj
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js11
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js1
-rw-r--r--spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js4
3 files changed, 15 insertions, 1 deletions
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 314d481d4..c1e40b3bc 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
@@ -77,6 +77,17 @@ class CreateModal extends Component {
/>
</div>
</div>
+ <div className='col-lg-6 col-md-6 col-sm-6 col-xs-12'>
+ <div className='form-group'>
+ <label className='control-label'>Numéro de train</label>
+ <input
+ type='text'
+ ref='published_journey_identifier'
+ className='form-control'
+ onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
+ />
+ </div>
+ </div>
</div>
</div>
<div className='modal-footer'>
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 d153739ce..9dea63e07 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -36,6 +36,7 @@ const vehicleJourney= (state = {}, action, keep) => {
company: action.selectedCompany,
journey_pattern: action.selectedJourneyPattern,
published_journey_name: action.data.published_journey_name.value,
+ published_journey_identifier: action.data.published_journey_identifier.value,
objectid: '',
footnotes: [],
time_tables: [],
diff --git a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
index f805852c7..662c3d82f 100644
--- a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
+++ b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
@@ -88,7 +88,8 @@ describe('vehicleJourneys reducer', () => {
dummy: true
}]
let fakeData = {
- published_journey_name: {value: 'test'}
+ published_journey_name: {value: 'test'},
+ published_journey_identifier: {value : ''}
}
let fakeSelectedJourneyPattern = {id: "1"}
let fakeSelectedCompany = {name: "ALBATRANS"}
@@ -104,6 +105,7 @@ describe('vehicleJourneys reducer', () => {
journey_pattern: fakeSelectedJourneyPattern,
company: fakeSelectedCompany,
published_journey_name: 'test',
+ published_journey_identifier: '',
objectid: '',
footnotes: [],
time_tables: [],