conflict resolved

7 files changed, 98 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 aa2d208df..0ed8660d5 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js
@@ -22,90 +22,91 @@ class CreateModal extends Component {
     }
     if(this.props.status.fetchSuccess == true) {
       return (
-        <div className='row mt-md'>
-          <div className='col-lg-12 text-right'>
-            <button
-              type='button'
-              className='btn btn-outline-primary'
-              data-toggle='modal'
-              data-target='#NewJourneyPatternModal'
-              onClick={this.props.onOpenCreateModal}
-              >
-              Ajouter une mission
-            </button>
+        <div className="select_toolbox">
+          <ul>
+            <li className='st_action'>
+              <button
+                type='button'
+                data-toggle='modal'
+                data-target='#NewJourneyPatternModal'
+                onClick={this.props.onOpenCreateModal}
+                >
+                <span className="fa fa-plus"></span>
+              </button>
 
-            <div className={ 'modal fade ' + ((this.props.modal.type == 'create') ? 'in' : '') } id='NewJourneyPatternModal'>
-              <div className='modal-container'>
-                <div className='modal-dialog'>
-                  <div className='modal-content'>
-                    <div className='modal-header'>
-                      <h4 className='modal-title'>Ajouter une mission</h4>
-                    </div>
+              <div className={ 'modal fade ' + ((this.props.modal.type == 'create') ? 'in' : '') } id='NewJourneyPatternModal'>
+                <div className='modal-container'>
+                  <div className='modal-dialog'>
+                    <div className='modal-content'>
+                      <div className='modal-header'>
+                        <h4 className='modal-title'>Ajouter une mission</h4>
+                      </div>
 
-                    {(this.props.modal.type == 'create') && (
-                      <form>
-                        <div className='modal-body'>
-                          <div className='form-group'>
-                            <label className='control-label is-required'>Nom</label>
-                            <input
-                              type='text'
-                              ref='name'
-                              className='form-control'
-                              onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
-                              required
-                              />
-                          </div>
-                          <div className='row'>
-                            <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
-                              <div className='form-group'>
-                                <label className='control-label is-required'>Nom public</label>
-                                <input
-                                  type='text'
-                                  ref='published_name'
-                                  className='form-control'
-                                  onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
-                                  required
-                                  />
-                              </div>
+                      {(this.props.modal.type == 'create') && (
+                        <form>
+                          <div className='modal-body'>
+                            <div className='form-group'>
+                              <label className='control-label is-required'>Nom</label>
+                              <input
+                                type='text'
+                                ref='name'
+                                className='form-control'
+                                onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
+                                required
+                                />
                             </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>
-                                <input
-                                  type='text'
-                                  ref='registration_number'
-                                  className='form-control'
-                                  onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
-                                  required
-                                  />
+                            <div className='row'>
+                              <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
+                                <div className='form-group'>
+                                  <label className='control-label is-required'>Nom public</label>
+                                  <input
+                                    type='text'
+                                    ref='published_name'
+                                    className='form-control'
+                                    onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
+                                    required
+                                    />
+                                </div>
+                              </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>
+                                  <input
+                                    type='text'
+                                    ref='registration_number'
+                                    className='form-control'
+                                    onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
+                                    required
+                                    />
+                                </div>
                               </div>
                             </div>
                           </div>
-                        </div>
-                        <div className='modal-footer'>
-                          <button
-                            className='btn btn-link'
-                            data-dismiss='modal'
-                            type='button'
-                            onClick={this.props.onModalClose}
-                            >
-                            Annuler
-                          </button>
-                          <button
-                            className='btn btn-primary'
-                            type='button'
-                            onClick={this.handleSubmit.bind(this)}
-                            >
-                            Valider
-                          </button>
-                        </div>
-                      </form>
-                    )}
+                          <div className='modal-footer'>
+                            <button
+                              className='btn btn-link'
+                              data-dismiss='modal'
+                              type='button'
+                              onClick={this.props.onModalClose}
+                              >
+                              Annuler
+                            </button>
+                            <button
+                              className='btn btn-primary'
+                              type='button'
+                              onClick={this.handleSubmit.bind(this)}
+                              >
+                              Valider
+                            </button>
+                          </div>
+                        </form>
+                      )}
+                    </div>
                   </div>
                 </div>
               </div>
-            </div>
-          </div>
+            </li>
+          </ul>
         </div>
       )
     } else {
diff --git a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
index 41d247b21..0a6e7e1dc 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
@@ -201,8 +201,8 @@ const actions = {
     start = new Date(start)
     end = new Date(end)
     _.each(periods, (period, i) => {
-      if(index != i && !period.deleted){
-        if((new Date(period.period_start) <= start && new Date(period.period_end) >= start) || (new Date(period.period_start) <= end && new Date(period.period_end) >= end))
+      if(index !== i && !period.deleted){
+        if((new Date(period.period_start) <= start && new Date(period.period_end) >= start) || (new Date(period.period_start) <= end && new Date(period.period_end) >= end) || (start >= new Date(period.period_start) && end <= new Date(period.period_end)) || (start <= new Date(period.period_start) && end >= new Date(period.period_end)))
         error = 'Les périodes ne peuvent pas se chevaucher'
       }
     })
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/ConfirmModal.js b/app/assets/javascripts/es6_browserified/time_tables/components/ConfirmModal.js
index c2229d991..40ae0eccf 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/ConfirmModal.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/ConfirmModal.js
@@ -2,7 +2,7 @@ var React = require('react')
 var Component = require('react').Component
 var PropTypes = require('react').PropTypes
 
-const ConfirmModal = ({dispatch, modal, onModalAccept, onModalCancel, journeyPatterns}) => (
+const ConfirmModal = ({dispatch, modal, onModalAccept, onModalCancel, timetable, metas}) => (
   <div className={ 'modal fade ' + ((modal.type == 'confirm') ? 'in' : '') } id='ConfirmModal'>
     <div className='modal-container'>
       <div className='modal-dialog'>
@@ -28,7 +28,7 @@ const ConfirmModal = ({dispatch, modal, onModalAccept, onModalCancel, journeyPat
               className='btn btn-primary'
               data-dismiss='modal'
               type='button'
-              onClick = {() => {onModalAccept(modal.confirmModal.callback, journeyPatterns)}}
+              onClick = {() => {onModalAccept(modal.confirmModal.callback, timetable, metas)}}
               >
               Valider
             </button>
diff --git a/app/assets/javascripts/es6_browserified/time_tables/containers/ConfirmModal.js b/app/assets/javascripts/es6_browserified/time_tables/containers/ConfirmModal.js
index 8095e1e7c..6282c1d1d 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/containers/ConfirmModal.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/containers/ConfirmModal.js
@@ -5,13 +5,14 @@ var ConfirmModal = require('../components/ConfirmModal')
 const mapStateToProps = (state) => {
   return {
     modal: state.modal,
-    journeyPatterns: state.journeyPatterns
+    timetable: state.timetable,
+    metas: state.metas
   }
 }
 
 const mapDispatchToProps = (dispatch) => {
   return {
-    onModalAccept: (next, timetable, metas, state) =>{
+    onModalAccept: (next, timetable, metas) =>{
       dispatch(actions.fetchingApi())
       actions.submitTimetable(dispatch, timetable, metas, next)
     },
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 4f1e7a528..2ce084efd 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js
@@ -12,6 +12,9 @@ const metas = (state = {}, action) => {
         color: action.json.color,
         calendar: action.json.calendar ? action.json.calendar : null
       })
+    case 'RECEIVE_MONTH':
+      let dt = (typeof state.day_types === 'string') ? actions.strToArrayDayTypes(state.day_types) : state.day_types
+      return _.assign({}, state, {day_types: dt})
     case 'INCLUDE_DATE_IN_PERIOD':
     case 'EXCLUDE_DATE_FROM_PERIOD':
     case 'DELETE_PERIOD':
diff --git a/app/assets/javascripts/es6_browserified/time_tables/reducers/pagination.js b/app/assets/javascripts/es6_browserified/time_tables/reducers/pagination.js
index 660484c58..3d96fb7b7 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/reducers/pagination.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/reducers/pagination.js
@@ -5,8 +5,12 @@ const pagination = (state = {}, action) => {
     case 'RECEIVE_TIME_TABLES':
       return _.assign({}, state, {
         currentPage: action.json.current_periode_range,
-        periode_range: action.json.periode_range
+        periode_range: action.json.periode_range,
+        stateChanged: false
       })
+    case 'RECEIVE_MONTH':
+    case 'RECEIVE_ERRORS':
+      return _.assign({}, state, {stateChanged: false})
     case 'GO_TO_PREVIOUS_PAGE':
     case 'GO_TO_NEXT_PAGE':
       let nextPage = action.nextPage ? 1 : -1
@@ -22,7 +26,6 @@ const pagination = (state = {}, action) => {
     case 'VALIDATE_PERIOD_FORM':
     case 'UPDATE_COMMENT':
     case 'UPDATE_COLOR':
-    case 'UPDATE_DAY_TYPES':
       toggleOnConfirmModal('modal')
       return _.assign({}, state, {stateChanged: true})
     default:
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
index ba27ca72c..97aa60526 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(