Manual Conflict Resolution

10 files changed, 50 insertions, 18 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
index 54d62f999..0ed961f44 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
@@ -84,6 +84,10 @@ const actions = {
   resetValidation: (target) => {
     $(target).parent().removeClass('has-error').children('.help-block').remove()
   },
+  humanOID : (oid) => {
+    var a = oid.split(':')
+    return a[a.length - 1]
+  },
   validateFields : (fields) => {
     const test = []
 
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 d9f6d5550..14ddf2b99 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
@@ -14,7 +14,7 @@ class JourneyPattern extends Component{
     let vjURL = routeURL + '/vehicle_journeys?jp=' + jpOid
 
     return (
-      <a data-no-turbolink="true" href={vjURL}>Horaires des courses</a>
+      <a data-turbolinks="false" href={vjURL}>Horaires des courses</a>
     )
   }
 
@@ -62,7 +62,7 @@ class JourneyPattern extends Component{
           )}
 
           <div className='th'>
-            <div className='strong mb-xs'>{this.props.value.object_id ? this.props.value.object_id : '-'}</div>
+            <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>
 
diff --git a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
index cef9bc75d..3f15b7f01 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
@@ -45,7 +45,7 @@ const actions = {
     pagination,
     nextPage : true
   }),
-  changePage : (dispatch, pagination, val) => ({
+  changePage : (dispatch, val) => ({
     type: 'CHANGE_PAGE',
     dispatch,
     page: val
@@ -104,16 +104,14 @@ const actions = {
     timeTablePeriods,
     metas
   }),
-  includeDateInPeriod: (index, day, dayTypes) => ({
+  includeDateInPeriod: (index, dayTypes) => ({
     type: 'INCLUDE_DATE_IN_PERIOD',
     index,
-    day,
     dayTypes
   }),
-  excludeDateFromPeriod: (index, day, dayTypes) => ({
+  excludeDateFromPeriod: (index, dayTypes) => ({
     type: 'EXCLUDE_DATE_FROM_PERIOD',
     index,
-    day,
     dayTypes
   }),
   openConfirmModal : (callback) => ({
@@ -140,6 +138,10 @@ const actions = {
 
     return (D + ' ' + M + ' ' + Y)
   },
+  getLocaleDate(strDate) {
+    let date = new Date(strDate)
+    return date.toLocaleDateString()
+  },
 
   updateSynthesis: (state, daytypes) => {
     let periods = state.time_table_periods
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js b/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js
index 13615a6ef..e90099283 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js
@@ -21,7 +21,7 @@ class ExceptionsInDay extends Component {
               data-actiontype='remove'
               onClick={(e) => {
                 $(e.currentTarget).toggleClass('active')
-                this.props.onExcludeDateFromPeriod(this.props.index, this.props.value.current_month[this.props.index], this.props.metas.day_types)
+                this.props.onExcludeDateFromPeriod(this.props.index, this.props.metas.day_types)
               }}
             >
               <span className='fa fa-times'></span>
@@ -37,7 +37,7 @@ class ExceptionsInDay extends Component {
               data-actiontype='add'
               onClick={(e) => {
                 $(e.currentTarget).toggleClass('active')
-                this.props.onIncludeDateInPeriod(this.props.index, this.props.value.current_month[this.props.index], this.props.metas.day_types)
+                this.props.onIncludeDateInPeriod(this.props.index, this.props.metas.day_types)
               }}
             >
               <span className='fa fa-plus'></span>
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/Navigate.js b/app/assets/javascripts/es6_browserified/time_tables/components/Navigate.js
index c43cd025a..74ca36ea6 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/Navigate.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/Navigate.js
@@ -39,7 +39,7 @@ let Navigate = ({ dispatch, metas, timetable, pagination, status, filters}) => {
                       value={month}
                       onClick={e => {
                         e.preventDefault()
-                        dispatch(actions.checkConfirmModal(e, actions.changePage(dispatch, pagination, e.currentTarget.value), pagination.stateChanged, dispatch))
+                        dispatch(actions.checkConfirmModal(e, actions.changePage(dispatch, e.currentTarget.value), pagination.stateChanged, dispatch))
                       }}
                     >
                       {actions.monthName(month) + ' ' + new Date(month).getFullYear()}
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js
index de3f31ee0..cf4cbfb32 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js
@@ -8,14 +8,33 @@ class PeriodManager extends Component {
     super(props)
   }
 
+  toEndPeriod(curr, end) {
+    let diff
+
+    let startCurrM = curr.split('-')[1]
+    let endPeriodM = end.split('-')[1]
+
+    let lastDayInM = new Date(curr.split('-')[2], startCurrM + 1, 0)
+    lastDayInM = lastDayInM.toJSON().substr(0, 10).split('-')[2]
+
+    if(startCurrM === endPeriodM) {
+      diff = (end.split('-')[2] - curr.split('-')[2])
+    } else {
+      diff = (lastDayInM - curr.split('-')[2])
+    }
+
+    return diff
+  }
+
   render() {
     return (
       <div
         className='period_manager'
         id={this.props.value.id}
+        data-toendperiod={this.toEndPeriod(this.props.currentDate.toJSON().substr(0, 10),  this.props.value.period_end)}
       >
         <p className='strong'>
-          {actions.getHumanDate(this.props.value.period_start, 3).substr(0, 7) + ' > ' + actions.getHumanDate(this.props.value.period_end, 3)}
+          {actions.getLocaleDate(this.props.value.period_start) + ' > ' + actions.getLocaleDate(this.props.value.period_end)}
         </p>
 
         <div className='dropdown'>
@@ -58,6 +77,7 @@ class PeriodManager extends Component {
 
 PeriodManager.propTypes = {
   value: PropTypes.object.isRequired,
+  currentDate: PropTypes.object.isRequired,
   onDeletePeriod: PropTypes.func.isRequired,
   onOpenEditPeriodForm: PropTypes.func.isRequired
 }
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js
index 93a8fe433..ca44d3a07 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js
@@ -50,9 +50,10 @@ class PeriodsInDay extends Component {
                     key={i}
                     index={i}
                     value={p}
+                    metas={this.props.metas}
+                    currentDate={this.props.currentDate}
                     onDeletePeriod={this.props.onDeletePeriod}
                     onOpenEditPeriodForm={this.props.onOpenEditPeriodForm}
-                    metas={this.props.metas}
                   />
                 )
               } else {
diff --git a/app/assets/javascripts/es6_browserified/time_tables/containers/Timetable.js b/app/assets/javascripts/es6_browserified/time_tables/containers/Timetable.js
index 2a17d3dea..c6b5fcc6b 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/containers/Timetable.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/containers/Timetable.js
@@ -15,11 +15,11 @@ const mapDispatchToProps = (dispatch) => {
     onDeletePeriod: (index, dayTypes) =>{
       dispatch(actions.deletePeriod(index, dayTypes))
     },
-    onExcludeDateFromPeriod: (index, day, dayTypes) => {
-      dispatch(actions.excludeDateFromPeriod(index, day, dayTypes))
+    onExcludeDateFromPeriod: (index, dayTypes) => {
+      dispatch(actions.excludeDateFromPeriod(index, dayTypes))
     },
-    onIncludeDateInPeriod: (index, day, dayTypes) => {
-      dispatch(actions.includeDateInPeriod(index, day, dayTypes))
+    onIncludeDateInPeriod: (index, dayTypes) => {
+      dispatch(actions.includeDateInPeriod(index, dayTypes))
     },
     onOpenEditPeriodForm: (period, index) => {
       dispatch(actions.openEditPeriodForm(period, index))
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 ea03694bd..0e6f5ed12 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -248,6 +248,10 @@ const actions = {
     type: 'RECEIVE_TOTAL_COUNT',
     total
   }),
+  humanOID : (oid) => {
+    var a = oid.split(':')
+    return a[a.length - 1]
+  },
   fetchVehicleJourneys : (dispatch, currentPage, nextPage, queryString) => {
     if(currentPage == undefined){
       currentPage = 1
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
index d795d76e3..6f338f747 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -1,6 +1,7 @@
 var React = require('react')
 var Component = require('react').Component
 var PropTypes = require('react').PropTypes
+var actions = require('../actions')
 
 class VehicleJourney extends Component {
   constructor(props) {
@@ -48,8 +49,8 @@ class VehicleJourney extends Component {
     return (
       <div className={'t2e-item' + (this.props.value.deletable ? ' disabled' : '') + (this.props.value.errors ? ' has-error': '')}>
         <div className='th'>
-          <div className='strong mb-xs'>{this.props.value.objectid ? this.props.value.objectid : '-'}</div>
-          <div>{this.props.value.journey_pattern.objectid}</div>
+          <div className='strong mb-xs'>{this.props.value.objectid ? actions.humanOID(this.props.value.objectid) : '-'}</div>
+          <div>{actions.humanOID(this.props.value.journey_pattern.objectid)}</div>
           {this.props.value.time_tables.map((tt, i)=>
             <div key={i}>{this.timeTableURL(tt)}</div>
           )}