aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcedricnjanga2018-03-19 19:59:44 -0700
committerJohan Van Ryseghem2018-03-29 11:04:40 +0200
commit53d9adfd561e291ec9830e45d2cbae8f3ae0aac8 (patch)
tree2e4faaf115c74313a8fcfe27856b2824d5d19084
parentd61d73ff78036f893a23cd37422f3b58dff33165 (diff)
downloadchouette-core-53d9adfd561e291ec9830e45d2cbae8f3ae0aac8.tar.bz2
Refs #6248 Get journey pattern total distance and kms in first render
-rw-r--r--app/javascript/journey_patterns/components/JourneyPattern.js10
1 files changed, 3 insertions, 7 deletions
diff --git a/app/javascript/journey_patterns/components/JourneyPattern.js b/app/javascript/journey_patterns/components/JourneyPattern.js
index 15d8b6db4..00b5497f7 100644
--- a/app/javascript/journey_patterns/components/JourneyPattern.js
+++ b/app/javascript/journey_patterns/components/JourneyPattern.js
@@ -80,7 +80,6 @@ export default class JourneyPattern extends Component{
let from = null
this.props.value.stop_points.map((stopPoint, i) =>{
let usePoint = stopPoint.checked
- console.log(stopPoint)
if(onlyCommercial && (i == 0 || i == this.props.value.stop_points.length - 1) && stopPoint.kind == "non_commercial"){
usePoint = false
}
@@ -131,12 +130,9 @@ export default class JourneyPattern extends Component{
}
}
- componentWillUpdate() {
- [this.totalTime, this.totalDistance] = this.totals(false)
- }
-
render() {
this.previousSpId = undefined
+ let [totalTime, totalDistance] = this.totals(false)
let [commercialTotalTime, commercialTotalDistance] = this.totals(true)
return (
<div className={'t2e-item' + (this.props.value.deletable ? ' disabled' : '') + (this.props.value.object_id ? '' : ' to_record') + (this.props.value.errors ? ' has-error': '') + (this.hasFeature('costs_in_journey_patterns') ? ' with-costs' : '')}>
@@ -146,8 +142,8 @@ export default class JourneyPattern extends Component{
<div>{actions.getChecked(this.props.value.stop_points).length} arrĂȘt(s)</div>
{this.hasFeature('costs_in_journey_patterns') &&
<div className="small row totals">
- <span className="col-md-6"><i className="fa fa-arrows-h"></i>{this.totalDistance}</span>
- <span className="col-md-6"><i className="fa fa-clock-o"></i>{this.totalTime}</span>
+ <span className="col-md-6"><i className="fa fa-arrows-h"></i>{totalDistance}</span>
+ <span className="col-md-6"><i className="fa fa-clock-o"></i>{totalTime}</span>
</div>
}
{this.hasFeature('costs_in_journey_patterns') &&