diff options
| author | Thomas Haddad | 2017-06-07 11:32:02 +0200 |
|---|---|---|
| committer | Thomas Haddad | 2017-06-07 11:32:02 +0200 |
| commit | 0ec861ba0adb8c7408dc6a39481fa05b3e13b470 (patch) | |
| tree | 4f5fca6a80c43d283350a014ce56ae066487a954 | |
| parent | 280cc337c7d2eb3d5e7457d0399e4f0ee5cdb2aa (diff) | |
| download | chouette-core-0ec861ba0adb8c7408dc6a39481fa05b3e13b470.tar.bz2 | |
Refs #3698: Fix period form now checks inner and outer periods
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
| -rw-r--r-- | app/assets/javascripts/es6_browserified/time_tables/actions/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js index 41d247b21..0a6e7e1dc 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js +++ b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js @@ -201,8 +201,8 @@ const actions = { start = new Date(start) end = new Date(end) _.each(periods, (period, i) => { - if(index != i && !period.deleted){ - if((new Date(period.period_start) <= start && new Date(period.period_end) >= start) || (new Date(period.period_start) <= end && new Date(period.period_end) >= end)) + if(index !== i && !period.deleted){ + if((new Date(period.period_start) <= start && new Date(period.period_end) >= start) || (new Date(period.period_start) <= end && new Date(period.period_end) >= end) || (start >= new Date(period.period_start) && end <= new Date(period.period_end)) || (start <= new Date(period.period_start) && end >= new Date(period.period_end))) error = 'Les périodes ne peuvent pas se chevaucher' } }) |