Merge branch 'master' of github.com:af83/stif-boiv

4 files changed, 29 insertions, 16 deletions

diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js
index 53f7bc7f9..601824c3c 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/index.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/index.js
@@ -66,11 +66,31 @@ render(
 
 document.querySelector('input[name=commit]').addEventListener('click', (event)=>{
   let state = store.getState()
-  state.stopPoints.map((stopPoint, i) => {
-    addInput('id', (datas[i]) ? datas[i].stoppoint_id : '', i)
-    addInput('stop_area_id',stopPoint.stoparea_id, i)
-    addInput('position',i, i)
-    addInput('for_boarding',stopPoint.for_boarding, i)
-    addInput('for_alighting',stopPoint.for_alighting, i)
-  })
+
+  if(state.stopPoints.length >= 2) {
+    state.stopPoints.map((stopPoint, i) => {
+      addInput('id', (datas[i]) ? datas[i].stoppoint_id : '', i)
+      addInput('stop_area_id',stopPoint.stoparea_id, i)
+      addInput('position',i, i)
+      addInput('for_boarding',stopPoint.for_boarding, i)
+      addInput('for_alighting',stopPoint.for_alighting, i)
+    })
+    if(state.stopPoints.length < datas.length){
+      for(var j= state.stopPoints.length; j < datas.length; j++){
+        updateFormForDeletion(datas[j])
+      }
+    }
+  } else {
+    event.preventDefault()
+    let msg = "L'itinéraire doit comporter au moins deux arrêts"
+    $('#stop_points').find('.subform').after("<div class='alert alert-danger'><span class='fa fa-lg fa-exclamation-circle'></span><span>" + msg + "</span></div>")
+  }
 })
+
+const updateFormForDeletion = (stop) =>{
+  if (stop.stoppoint_id !== undefined){
+    let now = Date.now()
+    addInput('id', stop.stoppoint_id, now)
+    addInput('_destroy', 'true', now)
+  }
+}
diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
index 18fee8bd1..24c3e5d87 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
@@ -19,13 +19,6 @@ const stopPoint = (state = {}, action, length) => {
       return state
   }
 }
-const updateFormForDeletion = (stop) =>{
-  if (stop.stoppoint_id !== undefined){
-    let now = Date.now()
-    addInput('id', stop.stoppoint_id, now)
-    addInput('_destroy', 'true', now)
-  }
-}
 
 const stopPoints = (state = [], action) => {
   switch (action.type) {
@@ -49,7 +42,6 @@ const stopPoints = (state = [], action) => {
         ...state.slice(action.index + 2)
       ]
     case 'DELETE_STOP':
-      updateFormForDeletion(state[action.index])
       return [
         ...state.slice(0, action.index),
         ...state.slice(action.index + 1).map((stopPoint)=>{
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
index 36aaa5cfd..b3df767ab 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
@@ -50,7 +50,7 @@ class BSelect4 extends React.Component{
             },
             cache: true
           },
-          minimumInputLength: 2,
+          minimumInputLength: 0,
           escapeMarkup: function (markup) { return markup; },
           templateResult: formatRepo
         }}
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/pagination.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/pagination.js
index ee59fca6d..a8189fc97 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/pagination.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/pagination.js
@@ -2,6 +2,7 @@ var _ = require('lodash')
 const pagination = (state = {}, action) => {
   switch (action.type) {
     case 'RECEIVE_JOURNEY_PATTERNS':
+    case 'RECEIVE_VEHICLE_JOURNEYS':
       return _.assign({}, state, {stateChanged: false})
     case 'GO_TO_PREVIOUS_PAGE':
       if (action.pagination.page > 1){