Merge branch 'master' into staging

10 files changed, 35 insertions, 27 deletions

diff --git a/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js
index 11c58d9c2..8b08a1e5f 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js
@@ -25,6 +25,7 @@ const mapDispatchToProps = (dispatch) => {
     onChange: (index, text) =>{
       dispatch(actions.updateInputValue(index, text))
       dispatch(actions.closeMaps())
+      dispatch(actions.toggleEdit(index))
     },
     onSelectChange: (e, index) =>{
       dispatch(actions.updateSelectValue(e, index))
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js
index 502320c27..a0fac84f3 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js
@@ -87,7 +87,7 @@ const Metas = ({metas, onUpdateDayTypes, onUpdateComment, onUpdateColor, onSelec
           <div className="form-group">
             <label htmlFor="" className="control-label col-sm-4">Modèle de calendrier associé</label>
             <div className="col-sm-8">
-              <span>{metas.calendar.name}</span>
+              <span>{metas.calendar ? metas.calendar.name : 'Aucun'}</span>
             </div>
           </div>
 
diff --git a/app/assets/javascripts/es6_browserified/time_tables/index.js b/app/assets/javascripts/es6_browserified/time_tables/index.js
index 1fe6ee84b..01f8c428e 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/index.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/index.js
@@ -30,7 +30,7 @@ var initialState = {
     tags: [],
     initial_tags: [],
     color: '',
-    calendar: {}
+    calendar: null
   },
   pagination: {
     stateChanged: false,
diff --git a/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js b/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js
index 97de90225..4f1e7a528 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js
@@ -10,15 +10,15 @@ const metas = (state = {}, action) => {
         tags: action.json.tags,
         initial_tags: action.json.tags,
         color: action.json.color,
-        calendar: action.json.calendar ? action.json.calendar : {name : 'Aucun'}
+        calendar: action.json.calendar ? action.json.calendar : null
       })
     case 'INCLUDE_DATE_IN_PERIOD':
     case 'EXCLUDE_DATE_FROM_PERIOD':
     case 'DELETE_PERIOD':
     case 'VALIDATE_PERIOD_FORM':
-      return _.assign({}, state, {calendar: {name: 'Aucun'}})
+      return _.assign({}, state, {calendar: null})
     case 'UPDATE_DAY_TYPES':
-      return _.assign({}, state, {day_types: action.dayTypes, calendar : {name: 'Aucun'}})
+      return _.assign({}, state, {day_types: action.dayTypes, calendar : null})
     case 'UPDATE_COMMENT':
       return _.assign({}, state, {comment: action.comment})
     case 'UPDATE_COLOR':
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/components/tools/TimetablesEditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js
index d6c1179ba..82fed23d9 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js
@@ -84,17 +84,6 @@ class TimetablesEditVehicleJourney extends Component {
                                       isFilter={false}
                                     />
                                   </div>
-                                  <div>
-                                    <a
-                                      href='#'
-                                      title='Ajouter'
-                                      className='fa fa-plus'
-                                      onClick={(e) => {
-                                        e.preventDefault()
-                                        this.props.onAddSelectedTimetable()
-                                      }}
-                                    ></a>
-                                  </div>
                                 </div>
                               </div>
                             </div>
@@ -140,7 +129,6 @@ TimetablesEditVehicleJourney.propTypes = {
   onTimetablesEditVehicleJourney: PropTypes.func.isRequired,
   onDeleteCalendarModal: PropTypes.func.isRequired,
   onSelect2Timetable: PropTypes.func.isRequired,
-  onAddSelectedTimetable: PropTypes.func.isRequired,
   filters: PropTypes.object.isRequired
 }
 
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/TimetablesEditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/TimetablesEditVehicleJourney.js
index 6d0096019..1cfff407c 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/TimetablesEditVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/TimetablesEditVehicleJourney.js
@@ -27,8 +27,6 @@ const mapDispatchToProps = (dispatch) => {
     },
     onSelect2Timetable: (e) =>{
       dispatch(actions.selectTTCalendarsModal(e.params.data))
-    },
-    onAddSelectedTimetable: () => {
       dispatch(actions.addSelectedTimetable())
     }
   }
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
index 489446ab9..2a76ae43a 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(
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js
index e504c2531..9f071069d 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js
@@ -88,9 +88,18 @@ const modal = (state = {}, action) => {
       newModalProps.timetables = timetablesModal
       return _.assign({}, state, {modalProps: newModalProps})
     case 'CREATE_VEHICLEJOURNEY_MODAL':
+      let selectedJP = {}
+      if (window.jpOrigin){
+        selectedJP = {
+          id: window.jpOrigin.id,
+          name: window.jpOrigin.name,
+          published_name: window.jpOrigin.published_name,
+          objectid: window.jpOrigin.objectid
+        }
+      }
       return {
         type: 'create',
-        modalProps: {},
+        modalProps: window.jpOrigin ? {selectedJPModal: selectedJP} : {},
         confirmModal: {}
       }
     case 'SELECT_JP_CREATE_MODAL':
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: [],