Display checksum for vehicle journeys -m Refs

Templating display checksum

Refs #5460

4 files changed, 46 insertions, 33 deletions

diff --git a/app/javascript/journey_patterns/components/EditModal.js b/app/javascript/journey_patterns/components/EditModal.js
index 29154da3c..7a5d24fba 100644
--- a/app/javascript/journey_patterns/components/EditModal.js
+++ b/app/javascript/journey_patterns/components/EditModal.js
@@ -39,16 +39,6 @@ export default class EditModal extends Component {
               {(this.props.modal.type == 'edit') && (
                 <form>
                   <div className='modal-body'>
-                    <div>
-                      <label className='control-label'>Signature métier</label>
-                        <input
-                        type='text'
-                        ref='checksum'
-                        className='form-control'
-                        disabled='disabled'
-                        defaultValue={this.props.modal.modalProps.journeyPattern.checksum}
-                        />
-                    </div>
                     <div className='form-group'>
                       <label className='control-label is-required'>Nom</label>
                       <input
@@ -94,6 +84,16 @@ export default class EditModal extends Component {
                         </div>
                       </div>
                     </div>
+                    <div>
+                      <label className='control-label'>Signature métier</label>
+                        <input
+                        type='text'
+                        ref='checksum'
+                        className='form-control'
+                        disabled='disabled'
+                        defaultValue={this.props.modal.modalProps.journeyPattern.checksum}
+                        />
+                    </div>
                   </div>
                   {
                     this.props.editMode &&
diff --git a/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js
index f8d6add03..463967463 100644
--- a/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js
+++ b/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js
@@ -52,32 +52,44 @@ export default class EditVehicleJourney extends Component {
                   {(this.props.modal.type == 'edit') && (
                     <form>
                       <div className='modal-body'>
-                        <div className='row'>
-                          <div className='col-lg-6 col-md-6 col-sm-6 col-xs-12'>
+                          <div className='row'>
                             <div className='form-group'>
-                              <label className='control-label'>Nom de la course</label>
-                              <input
+                              <label className='control-label'>Signature métier</label>
+                                <input
                                 type='text'
-                                ref='published_journey_name'
+                                ref='checksum'
                                 className='form-control'
-                                disabled={!this.props.editMode}
-                                defaultValue={this.props.modal.modalProps.vehicleJourney.published_journey_name}
-                                onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
+                                disabled='disabled'
+                                defaultValue={this.props.modal.modalProps.vehicleJourney.checksum}
                                 />
                             </div>
                           </div>
-                          <div className='col-lg-6 col-md-6 col-sm-6 col-xs-12'>
-                            <div className='form-group'>
-                              <label className='control-label'>Mission</label>
-                              <input
-                                type='text'
-                                className='form-control'
-                                value={this.props.modal.modalProps.vehicleJourney.journey_pattern.short_id + ' - ' + (this.props.modal.modalProps.vehicleJourney.journey_pattern.name)}
-                                disabled={true}
-                              />
+                          <div className='row'>
+                            <div className='col-lg-6 col-md-6 col-sm-6 col-xs-12'>
+                              <div className='form-group'>
+                                <label className='control-label'>Nom de la course</label>
+                                <input
+                                  type='text'
+                                  ref='published_journey_name'
+                                  className='form-control'
+                                  disabled={!this.props.editMode}
+                                  defaultValue={this.props.modal.modalProps.vehicleJourney.published_journey_name}
+                                  onKeyDown={(e) => actions.resetValidation(e.currentTarget)}
+                                  />
+                              </div>
+                            </div>
+                            <div className='col-lg-6 col-md-6 col-sm-6 col-xs-12'>
+                              <div className='form-group'>
+                                <label className='control-label'>Mission</label>
+                                <input
+                                  type='text'
+                                  className='form-control'
+                                  value={this.props.modal.modalProps.vehicleJourney.journey_pattern.short_id + ' - ' + (this.props.modal.modalProps.vehicleJourney.journey_pattern.name)}
+                                  disabled={true}
+                                />
+                              </div>
                             </div>
                           </div>
-                        </div>
 
                         <div className='row'>
                           <div className='col-lg-6 col-md-6 col-sm-6 col-xs-12'>
@@ -133,7 +145,7 @@ export default class EditVehicleJourney extends Component {
                         </div>
                       </div>
                       {
-                        this.props.editMode && 
+                        this.props.editMode &&
                         <div className='modal-footer'>
                           <button
                             className='btn btn-link'
@@ -151,7 +163,7 @@ export default class EditVehicleJourney extends Component {
                             Valider
                         </button>
                         </div>
-                      }     
+                      }
                     </form>
                   )}
 
@@ -171,4 +183,4 @@ EditVehicleJourney.propTypes = {
   onOpenEditModal: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired,
   disabled: PropTypes.bool.isRequired
-}
\ No newline at end of file
+}
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index 983bf5363..d84bebf18 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -170,7 +170,8 @@ module Chouette
 
           vj.update_attributes(state_permited_attributes(item))
           vj.update_has_and_belongs_to_many_from_state(item)
-          item['errors'] = vj.errors.full_messages.uniq if vj.errors.any?
+          item['errors']   = vj.errors.full_messages.uniq if vj.errors.any?
+          item['checksum'] = vj.checksum
         end
 
         # Delete ids of new object from state if we had to rollback
diff --git a/app/views/vehicle_journeys/show.rabl b/app/views/vehicle_journeys/show.rabl
index 01175a85d..eeed79b34 100644
--- a/app/views/vehicle_journeys/show.rabl
+++ b/app/views/vehicle_journeys/show.rabl
@@ -1,6 +1,6 @@
 object @vehicle_journey
 
-[:objectid, :published_journey_name, :published_journey_identifier, :company_id, :comment].each do |attr|
+[:objectid, :published_journey_name, :published_journey_identifier, :company_id, :comment, :checksum].each do |attr|
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end