Refs #2648: updating save component, moving button as layout sayed

4 files changed, 69 insertions, 38 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
index 9a1ceb546..59a578672 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
@@ -35,14 +35,17 @@ const JourneyPattern = (props) => {
           key={ i }
           className='td'
           >
-          <input
-            onChange = {(e) => props.onCheckboxChange(e)}
-            type='checkbox'
-            id={stopPoint.id}
-            checked={stopPoint.checked}
-            disabled={props.value.deletable ? 'disabled' : ''}
-            >
-          </input>
+          <span className='has_radio'>
+            <input
+              onChange = {(e) => props.onCheckboxChange(e)}
+              type='checkbox'
+              id={stopPoint.id}
+              checked={stopPoint.checked}
+              disabled={props.value.deletable ? 'disabled' : ''}
+              >
+            </input>
+            <span className='radio-label'></span>
+          </span>
         </div>
       )}
     </div>
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
index c30ad76d6..9091e67cb 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
@@ -11,7 +11,7 @@ class JourneyPatterns extends Component{
     this.props.onLoadFirstPage()
   }
   componentDidUpdate(prevProps, prevState) {
-    if(this.props.status.isFetching == false){
+    if(prevProps.status.isFetching == true){
       $('.table-2entries').each(function() {
         var refH = []
         var refCol = []
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js
new file mode 100644
index 000000000..9da1af311
--- /dev/null
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js
@@ -0,0 +1,55 @@
+var React = require('react')
+var Component = require('react').Component
+var PropTypes = require('react').PropTypes
+var actions = require('../actions')
+
+class SaveJourneyPattern extends Component{
+  constructor(props){
+    super(props)
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    if(prevProps.status.isFetching == true){
+      if($('.page-action').children('.formSubmitr').length > 0) {
+        $('.page-action').children('.formSubmitr').remove();
+      }
+      $('.formSubmitr').appendTo('.page-action');
+    }
+  }
+
+  render() {
+    if(this.props.status.isFetching == true) {
+      return false
+    }
+    if(this.props.status.fetchSuccess == true) {
+      return (
+        <div className='row mt-md'>
+          <div className='col-lg-12 text-right'>
+            <form className='jp_collection formSubmitr ml-xs' onSubmit={e => {e.preventDefault()}}>
+              <button
+                className='btn btn-default'
+                type='submit'
+                onClick={e => {
+                  e.preventDefault()
+                  actions.submitJourneyPattern(this.props.dispatch, this.props.journeyPatterns)
+                }}
+                >
+                Enregistrer
+              </button>
+            </form>
+          </div>
+        </div>
+      )
+    } else {
+      return false
+    }
+  }
+}
+
+SaveJourneyPattern.propTypes = {
+  journeyPatterns: PropTypes.array.isRequired,
+  status: PropTypes.object.isRequired,
+  page: PropTypes.number.isRequired
+}
+
+module.exports = SaveJourneyPattern
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js
index 24ccdcd5a..33442c5a0 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js
@@ -1,34 +1,7 @@
 var React = require('react')
 var connect = require('react-redux').connect
 var actions = require('../actions')
-
-let SaveJourneyPattern = ({ dispatch, journeyPatterns, page, status }) => {
-  if(status.isFetching == true) {
-    return false
-  }
-  if(status.fetchSuccess == true) {
-    return (
-      <div className='row mt-md'>
-        <div className='col-lg-12 text-right'>
-          <form className='jp_collection_submitr' onSubmit={e => {e.preventDefault()}}>
-            <button
-              className='btn btn-danger'
-              type='submit'
-              onClick={e => {
-                e.preventDefault()
-                actions.submitJourneyPattern(dispatch, journeyPatterns)
-              }}
-              >
-              Enregistrer
-            </button>
-          </form>
-        </div>
-      </div>
-    )
-  } else {
-    return false
-  }
-}
+var SaveJourneyPatternComponent = require('../components/SaveJourneyPattern')
 
 const mapStateToProps = (state) => {
   return {
@@ -38,6 +11,6 @@ const mapStateToProps = (state) => {
   }
 }
 
-SaveJourneyPattern = connect(mapStateToProps)(SaveJourneyPattern)
+const SaveJourneyPattern = connect(mapStateToProps)(SaveJourneyPatternComponent)
 
 module.exports = SaveJourneyPattern