Refs #3905 @3h : Use smart_date in timetable#edit

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>

3 files changed, 16 insertions, 14 deletions

diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodForm.js b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodForm.js
index 1a6c67b6b..a8a92c522 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodForm.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodForm.js
@@ -61,30 +61,30 @@ const PeriodForm = ({modal, timetable, metas, onOpenAddPeriodForm, onClosePeriod
               <div className="nested-fields">
                 <div className="wrapper">
                   <div>
-                    <div className={'form-group date' + (modal.modalProps.error ? ' has-error' : '')}>
+                    <div className={'form-group date smart_date' + (modal.modalProps.error ? ' has-error' : '')}>
                       <div className="form-inline">
-                        <select value={formatNumber(modal.modalProps.begin.day)} onChange={(e) => onUpdatePeriodForm(e.currentTarget.value, 'begin', 'day')} id="q_validity_period_begin_gteq_3i" className="date required form-control">
+                        <select value={formatNumber(modal.modalProps.begin.day)} onChange={(e) => onUpdatePeriodForm(e, 'begin', 'day')} id="q_validity_period_begin_gteq_3i" className="date required form-control">
                           {makeDaysOptions(modal.modalProps.begin.day)}
                         </select>
-                        <select value={formatNumber(modal.modalProps.begin.month)} onChange={(e) => onUpdatePeriodForm(e.currentTarget.value, 'begin', 'month')} id="q_validity_period_begin_gteq_2i" className="date required form-control">
+                        <select value={formatNumber(modal.modalProps.begin.month)} onChange={(e) => onUpdatePeriodForm(e, 'begin', 'month')} id="q_validity_period_begin_gteq_2i" className="date required form-control">
                           {makeMonthsOptions(modal.modalProps.begin.month)}
                         </select>
-                        <select value={modal.modalProps.begin.year} onChange={(e) => onUpdatePeriodForm(e.currentTarget.value, 'begin', 'year')} id="q_validity_period_begin_gteq_1i" className="date required form-control">
+                        <select value={modal.modalProps.begin.year} onChange={(e) => onUpdatePeriodForm(e, 'begin', 'year')} id="q_validity_period_begin_gteq_1i" className="date required form-control">
                           {makeYearsOptions(modal.modalProps.begin.year)}
                         </select>
                       </div>
                     </div>
                   </div>
                   <div>
-                    <div className={'form-group date' + (modal.modalProps.error ? ' has-error' : '')}>
+                    <div className={'form-group date smart_date' + (modal.modalProps.error ? ' has-error' : '')}>
                       <div className="form-inline">
-                        <select value={formatNumber(modal.modalProps.end.day)} onChange={(e) => onUpdatePeriodForm(e.currentTarget.value, 'end', 'day')} id="q_validity_period_end_gteq_3i" className="date required form-control">
+                        <select value={formatNumber(modal.modalProps.end.day)} onChange={(e) => onUpdatePeriodForm(e, 'end', 'day')} id="q_validity_period_end_gteq_3i" className="date required form-control">
                           {makeDaysOptions(modal.modalProps.end.day)}
                         </select>
-                        <select value={formatNumber(modal.modalProps.end.month)} onChange={(e) => onUpdatePeriodForm(e.currentTarget.value, 'end', 'month')} id="q_validity_period_end_gteq_2i" className="date required form-control">
+                        <select value={formatNumber(modal.modalProps.end.month)} onChange={(e) => onUpdatePeriodForm(e, 'end', 'month')} id="q_validity_period_end_gteq_2i" className="date required form-control">
                           {makeMonthsOptions(modal.modalProps.end.month)}
                         </select>
-                        <select value={modal.modalProps.end.year} onChange={(e) => onUpdatePeriodForm(e.currentTarget.value, 'end', 'year')} id="q_validity_period_end_gteq_1i" className="date required form-control">
+                        <select value={modal.modalProps.end.year} onChange={(e) => onUpdatePeriodForm(e, 'end', 'year')} id="q_validity_period_end_gteq_1i" className="date required form-control">
                           {makeYearsOptions(modal.modalProps.end.year)}
                         </select>
                       </div>
diff --git a/app/assets/javascripts/es6_browserified/time_tables/containers/PeriodForm.js b/app/assets/javascripts/es6_browserified/time_tables/containers/PeriodForm.js
index b6004c7f1..a7edbc328 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/containers/PeriodForm.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/containers/PeriodForm.js
@@ -18,8 +18,10 @@ const mapDispatchToProps = (dispatch) => {
     onClosePeriodForm: () => {
       dispatch(actions.closePeriodForm())
     },
-    onUpdatePeriodForm: (val, group, selectType) => {
-      dispatch(actions.updatePeriodForm(val, group, selectType))
+    onUpdatePeriodForm: (e, group, selectType) => {
+      dispatch(actions.updatePeriodForm(e.currentTarget.value, group, selectType))
+      let selector = '#q_validity_period_' + group + '_gteq_3i'
+      dispatch(actions.updatePeriodForm($(selector).val(), group, 'day'))
     },
     onValidatePeriodForm: (modalProps, timeTablePeriods, metas) => {
       dispatch(actions.validatePeriodForm(modalProps, timeTablePeriods, metas))
diff --git a/app/assets/javascripts/smart_date.coffee b/app/assets/javascripts/smart_date.coffee
index 7ea634a19..8e416de82 100644
--- a/app/assets/javascripts/smart_date.coffee
+++ b/app/assets/javascripts/smart_date.coffee
@@ -1,15 +1,15 @@
-legalDaysPerMonth       = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+window.legalDaysPerMonth       = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
 
-isLeapYear = (year) ->
+window.isLeapYear = (year) ->
   (year % 4 == 0) && ((year % 400 == 0) || (year % 100 != 0))
 
-correctDay = (dateValues) ->
+window.correctDay = (dateValues) ->
   [day, month, year] = dateValues
   return day if legalDaysPerMonth[month-1] >= day
   return 29 if day == 29 && isLeapYear(year)
   legalDaysPerMonth[month-1]
 
-smartCorrectDate = ->
+window.smartCorrectDate = ->
   allSelectors = $(@).parent().children('select') # N'a pas un sibbling('select', include_self = true) ?
   allVals      = allSelectors.map (index, sel) ->
     parseInt($(sel).val())