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

4 files changed, 72 insertions, 60 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 43c40a4d5..18ed5f889 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
@@ -43,75 +43,79 @@ class JourneyPattern extends Component{
     )
   }
 
+  getErrors(errors) {
+    let err = Object.keys(errors).map((key, index) => {
+      return (
+        <li key={index} style={{listStyleType: 'disc'}}>
+          <strong>{key}</strong> { errors[key] }
+        </li>
+      )
+    })
+
+    return (
+      <ul className="alert alert-danger">{err}</ul>
+    )
+  }
+
   render() {
     this.previousCity = undefined
 
     return (
-      <div className={'t2e-item' + (this.props.value.deletable ? ' disabled' : '') + (this.props.value.object_id ? '' : ' to_record')}>
+      <div className={'t2e-item' + (this.props.value.deletable ? ' disabled' : '') + (this.props.value.object_id ? '' : ' to_record') + (this.props.value.errors ? ' has-error': '')}>
         {/* Errors */}
-        {(this.props.value.errors) && (
-          <ul className='alert alert-danger small' style={{paddingLeft: 30}}>
-            {Object.keys(this.props.value.errors).map(function(key, i) {
-              return (
-                <li key={i} style={{listStyleType: 'disc'}}>
-                  <strong>'{key}'</strong> {this.props.value.errors[key]}
-                  </li>
-                )
-              })}
-            </ul>
-          )}
+        {/* this.props.value.errors ? this.getErrors(this.props.value.errors) : '' */}
 
-          <div className='th'>
-            <div className='strong mb-xs'>{this.props.value.object_id ? actions.humanOID(this.props.value.object_id) : '-'}</div>
-            <div>{this.props.value.registration_number}</div>
-            <div>{actions.getChecked(this.props.value.stop_points).length} arrêt(s)</div>
+        <div className='th'>
+          <div className='strong mb-xs'>{this.props.value.object_id ? actions.humanOID(this.props.value.object_id) : '-'}</div>
+          <div>{this.props.value.registration_number}</div>
+          <div>{actions.getChecked(this.props.value.stop_points).length} arrêt(s)</div>
 
-            <div className={this.props.value.deletable ? 'btn-group disabled' : 'btn-group'}>
-              <div
-                className={this.props.value.deletable ? 'btn dropdown-toggle disabled' : 'btn dropdown-toggle'}
-                data-toggle='dropdown'
-                >
-                <span className='fa fa-cog'></span>
-              </div>
-              <ul className='dropdown-menu'>
-                <li className={(this.props.value.deletable || this.props.status.policy['journey_patterns.edit'] == false) ? 'disabled' : ''}>
-                  <button
-                    type='button'
-                    onClick={this.props.onOpenEditModal}
-                    data-toggle='modal'
-                    data-target='#JourneyPatternModal'
-                    >
-                    Editer
+          <div className={this.props.value.deletable ? 'btn-group disabled' : 'btn-group'}>
+            <div
+              className={this.props.value.deletable ? 'btn dropdown-toggle disabled' : 'btn dropdown-toggle'}
+              data-toggle='dropdown'
+              >
+              <span className='fa fa-cog'></span>
+            </div>
+            <ul className='dropdown-menu'>
+              <li className={(this.props.value.deletable || this.props.status.policy['journey_patterns.edit'] == false) ? 'disabled' : ''}>
+                <button
+                  type='button'
+                  onClick={this.props.onOpenEditModal}
+                  data-toggle='modal'
+                  data-target='#JourneyPatternModal'
+                  >
+                  Editer
+                </button>
+              </li>
+              <li className={this.props.value.object_id ? '' : 'disabled'}>
+                {this.vehicleJourneyURL(this.props.value.object_id)}
+              </li>
+              <li className={'delete-action' + ((this.props.status.policy['journey_patterns.edit'] == false)? ' disabled' : '')}>
+                <button
+                  type='button'
+                  disabled={(this.props.status.policy['journey_patterns.edit'] == false)? 'disabled' : ''}
+                  onClick={(e) => {
+                    e.preventDefault()
+                    this.props.onDeleteJourneyPattern(this.props.index)}
+                  }
+                  >
+                    <span className='fa fa-trash'></span>Supprimer
                   </button>
                 </li>
-                <li className={this.props.value.object_id ? '' : 'disabled'}>
-                  {this.vehicleJourneyURL(this.props.value.object_id)}
-                </li>
-                <li className={'delete-action' + ((this.props.status.policy['journey_patterns.edit'] == false)? ' disabled' : '')}>
-                  <button
-                    type='button'
-                    disabled={(this.props.status.policy['journey_patterns.edit'] == false)? 'disabled' : ''}
-                    onClick={(e) => {
-                      e.preventDefault()
-                      this.props.onDeleteJourneyPattern(this.props.index)}
-                    }
-                    >
-                      <span className='fa fa-trash'></span>Supprimer
-                    </button>
-                  </li>
-                </ul>
-              </div>
+              </ul>
             </div>
-
-            {this.props.value.stop_points.map((stopPoint, i) =>{
-              return (
-                <div key={i} className='td'>
-                  {this.cityNameChecker(stopPoint)}
-                </div>
-              )
-            })}
           </div>
-        )
+
+          {this.props.value.stop_points.map((stopPoint, i) =>{
+            return (
+              <div key={i} className='td'>
+                {this.cityNameChecker(stopPoint)}
+              </div>
+            )
+          })}
+        </div>
+      )
   }
 }
 
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/status.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/status.js
index 6241777da..d7ef12d0b 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/status.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/status.js
@@ -9,6 +9,8 @@ const status = (state = {}, action) => {
       return _.assign({}, state, {isFetching: true})
     case 'RECEIVE_JOURNEY_PATTERNS':
       return _.assign({}, state, {fetchSuccess: true, isFetching: false})
+    case 'RECEIVE_ERRORS':
+      return _.assign({}, state, {isFetching: false})
     default:
       return state
   }
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodForm.js b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodForm.js
index a8a92c522..a54131984 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodForm.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodForm.js
@@ -61,7 +61,7 @@ const PeriodForm = ({modal, timetable, metas, onOpenAddPeriodForm, onClosePeriod
               <div className="nested-fields">
                 <div className="wrapper">
                   <div>
-                    <div className={'form-group date smart_date' + (modal.modalProps.error ? ' has-error' : '')}>
+                    <div className={'form-group date ' + (modal.modalProps.error ? ' has-error' : '')}>
                       <div className="form-inline">
                         <select value={formatNumber(modal.modalProps.begin.day)} onChange={(e) => onUpdatePeriodForm(e, 'begin', 'day')} id="q_validity_period_begin_gteq_3i" className="date required form-control">
                           {makeDaysOptions(modal.modalProps.begin.day)}
@@ -76,7 +76,7 @@ const PeriodForm = ({modal, timetable, metas, onOpenAddPeriodForm, onClosePeriod
                     </div>
                   </div>
                   <div>
-                    <div className={'form-group date smart_date' + (modal.modalProps.error ? ' has-error' : '')}>
+                    <div className={'form-group date ' + (modal.modalProps.error ? ' has-error' : '')}>
                       <div className="form-inline">
                         <select value={formatNumber(modal.modalProps.end.day)} onChange={(e) => onUpdatePeriodForm(e, 'end', 'day')} id="q_validity_period_end_gteq_3i" className="date required form-control">
                           {makeDaysOptions(modal.modalProps.end.day)}
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
index e90d2d307..c30f460d8 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -449,12 +449,18 @@ const actions = {
     if (parseInt(schedule.departure_time.minute) < 0){
       hours = Math.floor(parseInt(schedule.departure_time.minute) / 60)
       minutes = (parseInt(schedule.departure_time.minute) % 60) + 60
+      if(minutes == 60){
+        minutes = 0
+      }
       schedule.departure_time.minute = actions.simplePad(minutes, 'minute')
       schedule.departure_time.hour = parseInt(schedule.departure_time.hour) + hours
     }
     if (parseInt(schedule.arrival_time.minute) < 0){
       hours = Math.floor(parseInt(schedule.arrival_time.minute) / 60)
       minutes = (parseInt(schedule.arrival_time.minute) % 60) + 60
+      if(minutes == 60){
+        minutes = 0
+      }
       schedule.arrival_time.minute = actions.simplePad(minutes, 'minute')
       schedule.arrival_time.hour = parseInt(schedule.arrival_time.hour) + hours
     }