aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haddad2017-02-22 15:23:02 +0100
committerThomas Haddad2017-02-22 15:23:02 +0100
commit2b02e23c3da71abbf2a48974d23c6b56998d214b (patch)
tree7f27a218f43a09419aa4a1ae3d3ad257327d092d
parent46ed7a797e1243e133e45be15cf8d6452997460f (diff)
downloadchouette-core-2b02e23c3da71abbf2a48974d23c6b56998d214b.tar.bz2
Fix pad used in reducers instead of component when updating time
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js9
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js6
2 files changed, 7 insertions, 8 deletions
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 306635876..9fbe74af1 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -1,7 +1,6 @@
var React = require('react')
var Component = require('react').Component
var PropTypes = require('react').PropTypes
-var actions = require('../actions')
class VehicleJourney extends Component {
constructor(props) {
@@ -63,7 +62,7 @@ class VehicleJourney extends Component {
max='23'
disabled = {this.props.value.deletable}
onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'hour', false, false)}}
- value={actions.pad(vj.arrival_time['hour'])}
+ value={vj.arrival_time['hour']}
/>
<span>:</span>
<input
@@ -72,7 +71,7 @@ class VehicleJourney extends Component {
max='59'
disabled = {this.props.value.deletable}
onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'minute', false, false)}}
- value={actions.pad(vj.arrival_time['minute'])}
+ value={vj.arrival_time['minute']}
/>
</span>
}
@@ -86,7 +85,7 @@ class VehicleJourney extends Component {
max='23'
disabled = {this.props.value.deletable}
onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'hour', true, this.props.filters.toggleArrivals)}}
- value={actions.pad(vj.departure_time['hour'])}
+ value={vj.departure_time['hour']}
/>
<span>:</span>
<input
@@ -95,7 +94,7 @@ class VehicleJourney extends Component {
max='59'
disabled = {this.props.value.deletable}
onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, "minute", true, this.props.filters.toggleArrivals)}}
- value={actions.pad(vj.departure_time['minute'])}
+ value={vj.departure_time['minute']}
/>
</span>
</li>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
index ec78ec0aa..ee8dacc98 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -51,13 +51,13 @@ const vehicleJourney= (state = {}, action) => {
arrival_time: Object.assign({}, vjas.arrival_time)
}
if (action.isDeparture){
- newSchedule.departure_time[action.timeUnit] = action.val
+ newSchedule.departure_time[action.timeUnit] = actions.pad(action.val)
if(!action.isArrivalsToggled)
- newSchedule.arrival_time[action.timeUnit] = action.val
+ newSchedule.arrival_time[action.timeUnit] = actions.pad(action.val)
newSchedule = actions.getDelta(newSchedule)
return Object.assign({}, state.vehicle_journey_at_stops[action.subIndex], newSchedule)
}else{
- newSchedule.arrival_time[action.timeUnit] = action.val
+ newSchedule.arrival_time[action.timeUnit] = actions.pad(action.val)
newSchedule = actions.getDelta(newSchedule)
return Object.assign({}, state.vehicle_journey_at_stops[action.subIndex], {arrival_time: newArr})
}