aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js3
-rw-r--r--app/assets/javascripts/es6_browserified/journey_patterns/components/EditModal.js3
-rw-r--r--t86
3 files changed, 2 insertions, 90 deletions
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js
index 0ed8660d5..5aade3348 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js
@@ -70,13 +70,12 @@ class CreateModal extends Component {
</div>
<div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
<div className='form-group'>
- <label className='control-label is-required'>Code mission</label>
+ <label className='control-label'>Code mission</label>
<input
type='text'
ref='registration_number'
className='form-control'
onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
- required
/>
</div>
</div>
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/EditModal.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/EditModal.js
index 81c59b2ce..1fc935932 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/EditModal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/EditModal.js
@@ -63,7 +63,7 @@ class EditModal extends Component {
</div>
<div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
<div className='form-group'>
- <label className='control-label is-required'>Code mission</label>
+ <label className='control-label'>Code mission</label>
<input
type='text'
ref='registration_number'
@@ -71,7 +71,6 @@ class EditModal extends Component {
id={this.props.modal.modalProps.index}
defaultValue={this.props.modal.modalProps.journeyPattern.registration_number}
onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
- required
/>
</div>
</div>
diff --git a/t b/t
deleted file mode 100644
index 11a756d60..000000000
--- a/t
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/NotesEditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/NotesEditVehicleJourney.js
-index d4c3f42..f248b28 100644
---- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/NotesEditVehicleJourney.js
-+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/NotesEditVehicleJourney.js
-@@ -2,6 +2,7 @@ var React = require('react')
- var Component = require('react').Component
- var PropTypes = require('react').PropTypes
- var actions = require('../../actions')
-+var _ = require('lodash')
- 
- class NotesEditVehicleJourney extends Component {
- constructor(props) {
-@@ -27,13 +28,13 @@ class NotesEditVehicleJourney extends Component {
- type='button'
- className='btn btn-outline-danger btn-xs'
- onClick={() => this.props.onToggleFootnoteModal(lf, false)}
-- ><span className="fa fa-trash"></span></button>
-+ ><span className="fa fa-trash"></span> Retirer</button>
- }else{
- return <button
- type='button'
- className='btn btn-outline-primary btn-xs'
- onClick={() => this.props.onToggleFootnoteModal(lf, true)}
-- ><span className="fa fa-plus"></span></button>
-+ ><span className="fa fa-plus"></span> Ajouter</button>
- }
- }
- 
-@@ -65,7 +66,8 @@ class NotesEditVehicleJourney extends Component {
- {(this.props.modal.type == 'notes_edit') && (
- <form>
- <div className='modal-body'>
-- {window.line_footnotes.map((lf, i) =>
-+ {/* notes */}
-+ {this.props.modal.modalProps.vehicleJourney.footnotes.map((lf, i) => {
- <div
- key={i}
- className='panel panel-default'
-@@ -78,9 +80,11 @@ class NotesEditVehicleJourney extends Component {
- </div>
- <div className='panel-body'><p>{lf.label}</p></div>
- </div>
-- )}
-+ })}
- </div>
- 
-+
-+
- <div className='modal-footer'>
- <button
- className='btn btn-link'
-diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
-index 2a76ae4..489446a 100644
---- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
-+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
-@@ -8,10 +8,10 @@ var actions = require("./actions")
- var enableBatching = require('./batch').enableBatching
- 
- // logger, DO NOT REMOVE
--// var applyMiddleware = require('redux').applyMiddleware
--// var createLogger = require('redux-logger')
--// var thunkMiddleware = require('redux-thunk').default
--// var promise = require('redux-promise')
-+var applyMiddleware = require('redux').applyMiddleware
-+var createLogger = require('redux-logger')
-+var thunkMiddleware = require('redux-thunk').default
-+var promise = require('redux-promise')
- 
- var selectedJP = []
- 
-@@ -85,12 +85,12 @@ if (window.jpOrigin){
- initialState.filters.queryString = actions.encodeParams(params)
- }
- 
--// const loggerMiddleware = createLogger()
-+const loggerMiddleware = createLogger()
- 
- let store = createStore(
- enableBatching(vehicleJourneysApp),
-- initialState
-- // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
-+ initialState,
-+ applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
- )
- 
- render(