diff options
| author | Zog | 2018-01-05 16:34:40 +0100 | 
|---|---|---|
| committer | Zog | 2018-01-08 08:18:58 +0100 | 
| commit | 2fdcfb30655599c19629d8f0afc96f64b430358f (patch) | |
| tree | 10c3b9d44d1378a50e6f643357ef13dfac6385fa /app/javascript/journey_patterns/components | |
| parent | 643ef3655a6dbb10d8e0dc53048b57124dabf325 (diff) | |
| download | chouette-core-2fdcfb30655599c19629d8f0afc96f64b430358f.tar.bz2 | |
Refs #45455 @1h; CR updates #1
Diffstat (limited to 'app/javascript/journey_patterns/components')
| -rw-r--r-- | app/javascript/journey_patterns/components/JourneyPattern.js | 4 | ||||
| -rw-r--r-- | app/javascript/journey_patterns/components/JourneyPatterns.js | 6 | 
2 files changed, 7 insertions, 3 deletions
diff --git a/app/javascript/journey_patterns/components/JourneyPattern.js b/app/javascript/journey_patterns/components/JourneyPattern.js index 40a6899e2..69eff978e 100644 --- a/app/javascript/journey_patterns/components/JourneyPattern.js +++ b/app/javascript/journey_patterns/components/JourneyPattern.js @@ -12,7 +12,7 @@ export default class JourneyPattern extends Component{    updateCosts(e) {      let costs = {        [e.target.dataset.costsKey]: { -        [e.target.name]: parseInt(e.target.value) +        [e.target.name]: parseFloat(e.target.value)        }      }      this.props.onUpdateJourneyPatternCosts(costs) @@ -163,7 +163,7 @@ export default class JourneyPattern extends Component{                  {this.hasFeature('costs_in_journey_patterns') && costs && <div className='costs' id={'costs-' + this.props.value.id + '-' + costsKey }>                    {this.props.editMode && <div>                      <p> -                      <input type="number" value={costs['distance'] || 0} min='0' name="distance" onChange={this.updateCosts} data-costs-key={costsKey}/> +                      <input type="number" value={costs['distance'] || 0} min='0' name="distance" step="0.01" onChange={this.updateCosts} data-costs-key={costsKey}/>                        <span>km</span>                      </p>                      <p> diff --git a/app/javascript/journey_patterns/components/JourneyPatterns.js b/app/javascript/journey_patterns/components/JourneyPatterns.js index 69024050f..1e391b0c2 100644 --- a/app/javascript/journey_patterns/components/JourneyPatterns.js +++ b/app/javascript/journey_patterns/components/JourneyPatterns.js @@ -54,6 +54,10 @@ export default class JourneyPatterns extends Component {      }    } +  hasFeature(key) { +    return this.props.status.features[key] +  } +    cityNameChecker(sp) {      let bool = false      if(sp.city_name != this.previousCity){ @@ -115,7 +119,7 @@ export default class JourneyPatterns extends Component {                  </div>                  {this.props.stopPointsList.map((sp, i) =>{                    return ( -                    <div key={i} className='td'> +                    <div key={i} className={'td' + (this.hasFeature('costs_in_journey_patterns') ? ' with-costs' : '')}>                        {this.cityNameChecker(sp)}                      </div>                    )  | 
