diff options
| author | Thomas Haddad | 2017-04-20 16:19:41 +0200 |
|---|---|---|
| committer | Thomas Haddad | 2017-04-20 16:21:59 +0200 |
| commit | a2d0add29c701db0222d1822193e7d67f9b34a12 (patch) | |
| tree | ccc5375be9d4b7c7b9102c76d05cd7b403816108 /app/assets/javascripts | |
| parent | 31a24a86f4830fd5c993e7f22a7b06b71258907d (diff) | |
| download | chouette-core-a2d0add29c701db0222d1822193e7d67f9b34a12.tar.bz2 | |
Refs #2892: Fix synthesis being affected by day types update
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/time_tables/components/TimeTableDay.js | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/TimeTableDay.js b/app/assets/javascripts/es6_browserified/time_tables/components/TimeTableDay.js index cc47c2052..eecdf174d 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/TimeTableDay.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/TimeTableDay.js @@ -17,7 +17,7 @@ class TimeTableDay extends Component { {((this.props.value.day).charAt(0) == 'm') ? (this.props.value.day).substr(0, 2) : (this.props.value.day).charAt(0)} </span> <span - className={'daynumber' + (this.props.value.in_periods ? ' included' : '')} + className={'daynumber' + ((this.props.value.in_periods && this.props.dayTypeActive) ? ' included' : '')} > {this.props.value.mday} </span> @@ -28,7 +28,8 @@ class TimeTableDay extends Component { TimeTableDay.propTypes = { value: PropTypes.object.isRequired, - index: PropTypes.number.isRequired + index: PropTypes.number.isRequired, + dayTypeActive: PropTypes.bool.isRequired } module.exports = TimeTableDay diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js b/app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js index 37b756507..738e1a3ed 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js @@ -46,6 +46,7 @@ class Timetable extends Component{ key={i} index={i} value={d} + dayTypeActive={this.props.metas.day_types[d.wday]} /> )} </div> |
