Merge master to branch and resolve all the conflicts

We also needed to take remove the right time table dates when we update day types :
	- excluded dates that are out of day types
	- included dates that are in day types and in periods

1 files changed, 23 insertions, 8 deletions

diff --git a/spec/javascripts/time_table/reducers/timetable_spec.js b/spec/javascripts/time_table/reducers/timetable_spec.js
index 99dfa9c0d..21f6d236d 100644
--- a/spec/javascripts/time_table/reducers/timetable_spec.js
+++ b/spec/javascripts/time_table/reducers/timetable_spec.js
@@ -6,6 +6,7 @@ const dispatch = function(){}
 let arrDayTypes = [true, true, true, true, true, true, true]
 let strDayTypes = 'LuMaMeJeVeSaDi'
 let time_table_periods = [{"id":261,"period_start":"2017-02-23","period_end":"2017-03-05"},{"id":262,"period_start":"2017-03-15","period_end":"2017-03-25"},{"id":263,"period_start":"2017-04-04","period_end":"2017-04-14"},{"id":264,"period_start":"2017-04-24","period_end":"2017-05-04"},{"id":265,"period_start":"2017-05-14","period_end":"2017-05-24"}]
+let time_table_dates = []
 let current_periode_range = "2017-05-01"
 let periode_range = ["2014-05-01","2014-06-01","2014-07-01","2014-08-01","2014-09-01","2014-10-01","2014-11-01","2014-12-01","2015-01-01","2015-02-01","2015-03-01","2015-04-01","2015-05-01","2015-06-01","2015-07-01","2015-08-01","2015-09-01","2015-10-01","2015-11-01","2015-12-01","2016-01-01","2016-02-01","2016-03-01","2016-04-01","2016-05-01","2016-06-01","2016-07-01","2016-08-01","2016-09-01","2016-10-01","2016-11-01","2016-12-01","2017-01-01","2017-02-01","2017-03-01","2017-04-01","2017-05-01","2017-06-01","2017-07-01","2017-08-01","2017-09-01","2017-10-01","2017-11-01","2017-12-01","2018-01-01","2018-02-01","2018-03-01","2018-04-01","2018-05-01","2018-06-01","2018-07-01","2018-08-01","2018-09-01","2018-10-01","2018-11-01","2018-12-01","2019-01-01","2019-02-01","2019-03-01","2019-04-01","2019-05-01","2019-06-01","2019-07-01","2019-08-01","2019-09-01","2019-10-01","2019-11-01","2019-12-01","2020-01-01","2020-02-01","2020-03-01","2020-04-01","2020-05-01"]
 let current_month = [{"day":"lundi","date":"2017-05-01","wday":1,"wnumber":"18","mday":1,"include_date":false,"excluded_date":false},{"day":"mardi","date":"2017-05-02","wday":2,"wnumber":"18","mday":2,"include_date":false,"excluded_date":false},{"day":"mercredi","date":"2017-05-03","wday":3,"wnumber":"18","mday":3,"include_date":false,"excluded_date":false},{"day":"jeudi","date":"2017-05-04","wday":4,"wnumber":"18","mday":4,"include_date":false,"excluded_date":false},{"day":"vendredi","date":"2017-05-05","wday":5,"wnumber":"18","mday":5,"include_date":false,"excluded_date":false},{"day":"samedi","date":"2017-05-06","wday":6,"wnumber":"18","mday":6,"include_date":false,"excluded_date":false},{"day":"dimanche","date":"2017-05-07","wday":0,"wnumber":"18","mday":7,"include_date":false,"excluded_date":false},{"day":"lundi","date":"2017-05-08","wday":1,"wnumber":"19","mday":8,"include_date":false,"excluded_date":false},{"day":"mardi","date":"2017-05-09","wday":2,"wnumber":"19","mday":9,"include_date":false,"excluded_date":false},{"day":"mercredi","date":"2017-05-10","wday":3,"wnumber":"19","mday":10,"include_date":false,"excluded_date":false},{"day":"jeudi","date":"2017-05-11","wday":4,"wnumber":"19","mday":11,"include_date":false,"excluded_date":false},{"day":"vendredi","date":"2017-05-12","wday":5,"wnumber":"19","mday":12,"include_date":false,"excluded_date":false},{"day":"samedi","date":"2017-05-13","wday":6,"wnumber":"19","mday":13,"include_date":false,"excluded_date":false},{"day":"dimanche","date":"2017-05-14","wday":0,"wnumber":"19","mday":14,"include_date":false,"excluded_date":false},{"day":"lundi","date":"2017-05-15","wday":1,"wnumber":"20","mday":15,"include_date":false,"excluded_date":false},{"day":"mardi","date":"2017-05-16","wday":2,"wnumber":"20","mday":16,"include_date":false,"excluded_date":false},{"day":"mercredi","date":"2017-05-17","wday":3,"wnumber":"20","mday":17,"include_date":false,"excluded_date":false},{"day":"jeudi","date":"2017-05-18","wday":4,"wnumber":"20","mday":18,"include_date":false,"excluded_date":false},{"day":"vendredi","date":"2017-05-19","wday":5,"wnumber":"20","mday":19,"include_date":false,"excluded_date":false},{"day":"samedi","date":"2017-05-20","wday":6,"wnumber":"20","mday":20,"include_date":false,"excluded_date":false},{"day":"dimanche","date":"2017-05-21","wday":0,"wnumber":"20","mday":21,"include_date":false,"excluded_date":false},{"day":"lundi","date":"2017-05-22","wday":1,"wnumber":"21","mday":22,"include_date":false,"excluded_date":false},{"day":"mardi","date":"2017-05-23","wday":2,"wnumber":"21","mday":23,"include_date":false,"excluded_date":false},{"day":"mercredi","date":"2017-05-24","wday":3,"wnumber":"21","mday":24,"include_date":false,"excluded_date":false},{"day":"jeudi","date":"2017-05-25","wday":4,"wnumber":"21","mday":25,"include_date":false,"excluded_date":false},{"day":"vendredi","date":"2017-05-26","wday":5,"wnumber":"21","mday":26,"include_date":false,"excluded_date":false},{"day":"samedi","date":"2017-05-27","wday":6,"wnumber":"21","mday":27,"include_date":false,"excluded_date":false},{"day":"dimanche","date":"2017-05-28","wday":0,"wnumber":"21","mday":28,"include_date":false,"excluded_date":false},{"day":"lundi","date":"2017-05-29","wday":1,"wnumber":"22","mday":29,"include_date":false,"excluded_date":false},{"day":"mardi","date":"2017-05-30","wday":2,"wnumber":"22","mday":30,"include_date":false,"excluded_date":false},{"day":"mercredi","date":"2017-05-31","wday":3,"wnumber":"22","mday":31,"include_date":false,"excluded_date":false}]
@@ -195,12 +196,15 @@ describe('timetable reducer with filled state', () => {
     let newDates = state.time_table_dates.concat({date: "2017-05-01", in_out: false})
 
     let newCM = newCurrentMonth.map((d,i) => {
-      if (i == 0) d.include_date = false
+      if (i == 0){
+        d.include_date = false
+        d.excluded_date = true
+      } 
       return d
     })
 
     let newState = Object.assign({}, state, {time_table_dates: newDates, current_month: newCM})
-    state.current_month[0].excluded_date = true
+
     expect(
       timetableReducer(state, {
         type: 'ADD_EXCLUDED_DATE',
@@ -213,11 +217,11 @@ describe('timetable reducer with filled state', () => {
 
   it('should handle REMOVE_EXCLUDED_DATE', () => {
     state.time_table_dates = [{date: "2017-05-01", in_out: false}]
-    state.current_month[0].excluded_date = true
+    state.current_month[0].excluded_date = false
     let newState = Object.assign({}, state, {time_table_dates: []})
     expect(
       timetableReducer(state, {
-        type: 'EXCLUDE_DATE_FROM_PERIOD',
+        type: 'REMOVE_EXCLUDED_DATE',
         index: 0,
         dayTypes: arrDayTypes,
         date: "2017-05-01"
@@ -227,9 +231,10 @@ describe('timetable reducer with filled state', () => {
 
   it('should handle UPDATE_DAY_TYPES and remove out_day that are out of day types', () => {
     state.time_table_dates = [{date: "2017-05-01", in_out: false}]
-    let newArrDayTypes = arrDayTypes.slice(0)
-    newArrDayTypes[1] = false
-    let newState = Object.assign({}, state, {time_table_dates: []})
+    let newArrDayTypes = Array.from(arrDayTypes, (dt, i) => {
+      if (i == 1) dt = false
+      return dt
+    })
     expect(
       timetableReducer(state, {
         type: 'UPDATE_DAY_TYPES',
@@ -238,9 +243,19 @@ describe('timetable reducer with filled state', () => {
     ).toEqual([])
   })
 
+  it('should handle UPDATE_DAY_TYPES and remove in_day that are in day types and in period', () => {
+    state.time_table_dates = [{ date: "2017-05-16", in_out: true }]
+    expect(
+      timetableReducer(state, {
+        type: 'UPDATE_DAY_TYPES',
+        dayTypes: arrDayTypes
+      }).time_table_dates
+    ).toEqual([])
+  })
+
   it('should handle VALIDATE_PERIOD_FORM and add period if modalProps index = false', () => {
     let newPeriods = state.time_table_periods.concat({"period_start": "2018-05-15", "period_end": "2018-05-24"})
-    let newState = Object.assign({}, state, {time_table_periods: newPeriods})
+    let newState = Object.assign({}, state, {time_table_periods: newPeriods, time_table_dates: []})
     let modalProps = {
       active: false,
       begin: {