diff options
| author | jpl | 2017-04-18 11:49:19 +0200 |
|---|---|---|
| committer | jpl | 2017-04-18 11:49:19 +0200 |
| commit | 703068f7f6c42119ec83339d80eecb1a08d3b2a8 (patch) | |
| tree | ffe83f7c3924fa8950e6abd1a6399f4556f76331 /app/assets/javascripts | |
| parent | 520bd17b9690116455a3d0b71628582b279764a2 (diff) | |
| download | chouette-core-703068f7f6c42119ec83339d80eecb1a08d3b2a8.tar.bz2 | |
Refs #2982: updating integration for tt#edit
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/time_tables/components/TimeTableDay.js | 9 | ||||
| -rw-r--r-- | app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js | 31 |
2 files changed, 22 insertions, 18 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 d6d1301b9..dff64ba80 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/TimeTableDay.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/TimeTableDay.js @@ -9,11 +9,16 @@ class TimeTableDay extends Component { render() { return ( - <span className='day'> + <span + className={'day' + (this.props.value.wday == 0 ? ' last_wday' : '')} + data-wday={'S' + this.props.value.wnumber} + > <span className='dayname'> {((this.props.value.day).charAt(0) == 'm') ? (this.props.value.day).substr(0, 2) : (this.props.value.day).charAt(0)} </span> - <span className="daynumber"> + <span + className={'daynumber' + ((this.props.value.include_date && !this.props.value.excluded_date) ? ' included' : '')} + > {this.props.value.mday} </span> </span> 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 98c675336..1d13d39fb 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js @@ -22,9 +22,6 @@ class Timetable extends Component{ <div className="table table-2entries mt-sm mb-sm"> <div className="t2e-head w20"> <div className="th"> - <div></div> - <div></div> - <div></div> <div className="strong">Synthèse</div> </div> <div className="td">Journées d'application</div> @@ -32,20 +29,22 @@ class Timetable extends Component{ <div className="td">Exceptions</div> </div> <div className="t2e-item-list w80"> - <div className="t2e-item"> - <div className="th"> - <div className="strong monthName"> - {this.monthName(this.props.timetable.current_periode_range)} - </div> + <div> + <div className="t2e-item"> + <div className="th"> + <div className="strong monthName"> + {this.monthName(this.props.timetable.current_periode_range)} + </div> - <div className='monthDays'> - {this.props.timetable.current_month.map((day, i) => - <TimeTableDay - key={i} - index={i} - value={day} - /> - )} + <div className='monthDays'> + {this.props.timetable.current_month.map((day, i) => + <TimeTableDay + key={i} + index={i} + value={day} + /> + )} + </div> </div> </div> </div> |