Refs #2407: add validate new stoppoint via olMap

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Signed-off-by: Jean-Paul Lescouzeres <jean-paul.lescouzeres@af83.com>

5 files changed, 10 insertions, 9 deletions

diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
index d5a2c76d5..b22a95a02 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
@@ -68,9 +68,6 @@ class OlMap extends Component{
         if(e.selected.length != 0){
           let data = Object.assign({}, e.selected[0].getProperties(), {geometry: undefined});
           this.props.onSelectMarker(this.props.index, data)
-          // console.log('Selected item');
-          // console.log('id:' + data.getId());
-          // console.log('LonLat:' + data.getGeometry().getCoordinates());
         } else {
           this.props.onUnselectMarker(this.props.index)
         }
@@ -101,7 +98,9 @@ class OlMap extends Component{
               {this.props.value.olMap.json.user_objectid}
             </p>
 
-            <div className='btn btn-primary btn-sm'>Sélectionner</div>
+            <div className='btn btn-primary btn-sm'
+              onClick= {() => {this.props.onUpdateViaOlMap(this.props.index, this.props.value.olMap.json)}}
+            >Sélectionner</div>
           </div>
           <div className='col-lg-8 col-md-8 col-sm-8 col-xs-8'>
             <div id={"stoppoint_map" + this.props.index} className='map'></div>
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
index a1f4e3cdf..d92eeff5d 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
@@ -76,6 +76,7 @@ const StopPoint = (props) => {
         index = {props.index}
         onSelectMarker = {props.onSelectMarker}
         onUnselectMarker = {props.onUnselectMarker}
+        onUpdateViaOlMap = {props.onUpdateViaOlMap}
       />
     </div>
   )
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js b/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js
index 6c27a8907..2d6bf85fe 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js
@@ -2,7 +2,7 @@ var React = require('react')
 var PropTypes = require('react').PropTypes
 var StopPoint = require('./StopPoint')
 
-const StopPointList = ({ stopPoints, onDeleteClick, onMoveUpClick, onMoveDownClick, onChange, onSelectChange, onToggleMap, onSelectMarker, onUnselectMarker }) => {
+const StopPointList = ({ stopPoints, onDeleteClick, onMoveUpClick, onMoveDownClick, onChange, onSelectChange, onToggleMap, onSelectMarker, onUnselectMarker, onUpdateViaOlMap }) => {
   return (
     <div className='list-group'>
       {stopPoints.map((stopPoint, index) =>
@@ -18,6 +18,7 @@ const StopPointList = ({ stopPoints, onDeleteClick, onMoveUpClick, onMoveDownCli
           onToggleMap={() => onToggleMap(index)}
           onSelectMarker={onSelectMarker}
           onUnselectMarker={onUnselectMarker}
+          onUpdateViaOlMap={onUpdateViaOlMap}
           first={ index === 0 }
           last={ index === (stopPoints.length - 1) }
           index={ index }
diff --git a/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js
index 26293b517..c0b10bb9b 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js
@@ -33,8 +33,11 @@ const mapDispatchToProps = (dispatch) => {
     },
     onUnselectMarker: (index) =>{
       dispatch(actions.unselectMarker(index))
+    },
+    onUpdateViaOlMap: (index, data) =>{
+      dispatch(actions.updateInputValue(index, data))
+      dispatch(actions.toggleMap(index))
     }
-
   }
 }
 
diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
index bc354c2c8..42e1db01f 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
@@ -68,9 +68,6 @@ const stopPoints = (state = [], action) => {
           return t
         }
       })
-      // return state.map(t =>
-      //   stopPoint(t, action)
-      // )
     case 'UPDATE_SELECT_VALUE':
       return state.map( (t, i) => {
         if (i === action.index) {