From 937db5386a5b88386fe9c6a5e55255267ddb88e9 Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Thu, 22 Nov 2018 15:58:55 +0100
Subject: [PATCH 1/4] [FIX] survey : Fix datetimepicker single id issue.

In survey template, the datetimepicker was created with always the same id.
So if two date fields were present on the same page, it created a
multidemensional vortex that broke an alternative reality, resulting in
not being able to fill in both date fields and other crapy stuffs.

Also, the sass file needed to work with tempusdominus library were not
loaded with the js file that comes with it. Resulting in an hugly calendar
(if it could be called calendar) widget.
As survey does not load backend nor frontend assets, it's necessary to have
both files (js and sass files) in common assets.

Task ID : 1911291
Closes PR #28966
---
 addons/survey/views/survey_templates.xml | 6 +++---
 addons/web/views/webclient_templates.xml | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index 199e8bdd2e4..14746d56150 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -238,9 +238,9 @@
 
     <template id="date" name="Date box">
         <div class="form-group">
-            <div class="input-group date" id="datetimepicker" data-target-input="nearest">
-                <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker" t-att-name="prefix"/>
-                <div class="input-group-append" data-target="#datetimepicker" data-toggle="datetimepicker">
+            <div class="input-group date" t-attf-id="datetimepicker_#{question.id}" data-target-input="nearest">
+                <input type="text" class="form-control datetimepicker-input" t-attf-data-target="#datetimepicker_#{question.id}" t-att-name="prefix"/>
+                <div class="input-group-append" t-attf-data-target="#datetimepicker_#{question.id}" data-toggle="datetimepicker">
                     <div class="input-group-text"><i class="fa fa-calendar"></i></div>
                 </div>
             </div>
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index e5c5bd22979..46a71ed7703 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -50,6 +50,7 @@
         <link rel="stylesheet" type="text/css" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
         <link rel="stylesheet" type="text/css" href="/web/static/lib/select2/select2.css"/>
         <link rel="stylesheet" type="text/css" href="/web/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
+        <link rel="stylesheet" type="text/scss" href="/web/static/lib/tempusdominus/tempusdominus.scss"/>
 
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/fonts.scss"/>
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/ui.scss"/>
@@ -145,7 +146,6 @@
         <t t-call="web._assets_backend_helpers"/>
 
         <t t-call="web._assets_bootstrap"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/tempusdominus/tempusdominus.scss"/>
 
         <link rel="stylesheet" type="text/css" href="/base/static/src/css/modules.css"/>
 
@@ -318,7 +318,6 @@
         <t t-call="web._assets_frontend_helpers"/>
 
         <t t-call="web._assets_bootstrap"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/tempusdominus/tempusdominus.scss"/>
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/navbar_mobile.scss"/>
 
         <script type="text/javascript" src="/web/static/src/js/services/session.js"></script>

From 5738a046bebda93983da5fc3e31c674591e9b2e3 Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Thu, 22 Nov 2018 16:50:04 +0100
Subject: [PATCH 2/4] [FIX] survey : fix datetimepicker initialization - BS4

Since BS4, input-group is used instead of form-controll.
The initialisation was not correctly made because it didn't find
the datetimepicker.
There were several resulting issues:
- Max and Min date were not taken into account
- Clicking on the text area of date field was not opening the
    datetimepicker as config was not defined (allowInputToggle option)

Task ID : 1911291
Closes PR #28966
---
 addons/survey/static/src/js/survey.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/static/src/js/survey.js b/addons/survey/static/src/js/survey.js
index 145005790ec..22cef677c45 100644
--- a/addons/survey/static/src/js/survey.js
+++ b/addons/survey/static/src/js/survey.js
@@ -183,7 +183,7 @@ if(!the_form.length) {
     // frontend does not load moment locale at all.
     // so wait until DOM ready with locale then init datetimepicker
     ready_with_locale.then(function(){
-        $('.form-control.date').datetimepicker({
+        $('.input-group.date').datetimepicker({
             format : time.getLangDateFormat(),
             minDate: moment({ y: 1900 }),
             maxDate: moment().add(200, "y"),

From 06e1a46c047bc98742016808872b599d7ba18a8d Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Fri, 23 Nov 2018 09:53:06 +0100
Subject: [PATCH 3/4] [FIX] survey : fix review survey page

The prefill of the date field must be done after the initialisation,
otherwise, it would override the value. so prefill must be done inside
the .then to avoid prefill before the locale is ready.

Since the datetime are real datetime in DB, we cannot give real datetime
to JSON but string instead.

Finally, no need to keep the div class row. Otherwise, it would put everything
on same line and the jumbotorn div wouldn't be on top on the rest of the page.

Special thanks to @awa-odoo that gave me his masterpiece brain
to help me on this.

Task ID : 1911291
Closes PR #28966
---
 addons/survey/controllers/main.py        |  2 +-
 addons/survey/static/src/js/survey.js    | 11 ++---
 addons/survey/views/survey_templates.xml | 60 ++++++++++++------------
 3 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index 3674012e091..856dd1bffd5 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -185,7 +185,7 @@ class Survey(http.Controller):
                     ret.setdefault(answer_tag, []).append(answer_value)
                 else:
                     _logger.warning("[survey] No answer has been found for question %s marked as non skipped" % answer_tag)
-        return json.dumps(ret)
+        return json.dumps(ret, default=str)
 
     # AJAX scores loading for quiz correction mode
     @http.route(['/survey/scores/<model("survey.survey"):survey>/<string:token>'],
diff --git a/addons/survey/static/src/js/survey.js b/addons/survey/static/src/js/survey.js
index 22cef677c45..6542f63a3dc 100644
--- a/addons/survey/static/src/js/survey.js
+++ b/addons/survey/static/src/js/survey.js
@@ -200,14 +200,13 @@ if(!the_form.length) {
             allowInputToggle: true,
             keyBinds: null,
         });
+        // Launch prefilling
+        prefill();
+        if(quiz_correction_mode === true){
+            display_scores();
+        }
     });
 
-    // Launch prefilling
-    prefill();
-    if(quiz_correction_mode === true){
-        display_scores();
-    }
-
     console.debug("[survey] Custom JS for survey loaded!");
 
 });
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index 14746d56150..0375b26626f 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -341,39 +341,37 @@
             <div class="wrap">
                 <div class="container">
                     <t t-call="survey.back" />
-                    <div class="row">
-                        <div class='jumbotron mt32'>
-                            <h1><span t-field='survey.title'/></h1>
-                            <t t-if="survey.description"><div t-field='survey.description' class="oe_no_empty"/></t>
-                        </div>
-                        <div role="form" class="js_surveyform" t-att-name="'%s' % (survey.id)" t-att-data-prefill="'/survey/prefill/%s/%s' % (slug(survey), token)">
-                            <t t-foreach="survey.page_ids" t-as="page">
-                                <div class="o_page_header">
-                                    <h1 t-field='page.title' />
-                                    <t t-if="page.description"><div t-field='page.description' class="oe_no_empty"/></t>
+                    <div class='jumbotron mt32'>
+                        <h1><span t-field='survey.title'/></h1>
+                        <t t-if="survey.description"><div t-field='survey.description' class="oe_no_empty"/></t>
+                    </div>
+                    <div role="form" class="js_surveyform" t-att-name="'%s' % (survey.id)" t-att-data-prefill="'/survey/prefill/%s/%s' % (slug(survey), token)">
+                        <t t-foreach="survey.page_ids" t-as="page">
+                            <div class="o_page_header">
+                                <h1 t-field='page.title' />
+                                <t t-if="page.description"><div t-field='page.description' class="oe_no_empty"/></t>
+                            </div>
+                            <t t-foreach='page.question_ids' t-as='question'>
+                                <t t-set="prefix" t-value="'%s_%s_%s' % (survey.id, page.id, question.id)" />
+                                <div class="js_question-wrapper" t-att-id="prefix">
+                                    <h2>
+                                        <span t-field='question.question' />
+                                        <span t-if="question.constr_mandatory" class="text-danger">*</span>
+                                        <span t-if="quizz_correction" class="badge badge-pill" t-att-data-score-question="question.id"></span>
+                                    </h2>
+                                    <t t-if="question.description"><div class="text-muted oe_no_empty" t-field='question.description'/></t>
+                                    <t t-if="question.type == 'free_text'"><t t-call="survey.free_text"/></t>
+                                    <t t-if="question.type == 'textbox'"><t t-call="survey.textbox"/></t>
+                                    <t t-if="question.type == 'numerical_box'"><t t-call="survey.numerical_box"/></t>
+                                    <t t-if="question.type == 'date'"><t t-call="survey.date"/></t>
+                                    <t t-if="question.type == 'simple_choice'"><t t-call="survey.simple_choice"/></t>
+                                    <t t-if="question.type == 'multiple_choice'"><t t-call="survey.multiple_choice"/></t>
+                                    <t t-if="question.type == 'matrix'"><t t-call="survey.matrix"/></t>
+                                    <div class="js_errzone alert alert-danger" style="display:none;" role="alert"></div>
                                 </div>
-                                <t t-foreach='page.question_ids' t-as='question'>
-                                    <t t-set="prefix" t-value="'%s_%s_%s' % (survey.id, page.id, question.id)" />
-                                    <div class="js_question-wrapper" t-att-id="prefix">
-                                        <h2>
-                                            <span t-field='question.question' />
-                                            <span t-if="question.constr_mandatory" class="text-danger">*</span>
-                                            <span t-if="quizz_correction" class="badge badge-pill" t-att-data-score-question="question.id"></span>
-                                        </h2>
-                                        <t t-if="question.description"><div class="text-muted oe_no_empty" t-field='question.description'/></t>
-                                        <t t-if="question.type == 'free_text'"><t t-call="survey.free_text"/></t>
-                                        <t t-if="question.type == 'textbox'"><t t-call="survey.textbox"/></t>
-                                        <t t-if="question.type == 'numerical_box'"><t t-call="survey.numerical_box"/></t>
-                                        <t t-if="question.type == 'date'"><t t-call="survey.date"/></t>
-                                        <t t-if="question.type == 'simple_choice'"><t t-call="survey.simple_choice"/></t>
-                                        <t t-if="question.type == 'multiple_choice'"><t t-call="survey.multiple_choice"/></t>
-                                        <t t-if="question.type == 'matrix'"><t t-call="survey.matrix"/></t>
-                                        <div class="js_errzone alert alert-danger" style="display:none;" role="alert"></div>
-                                    </div>
-                                </t>
-                                <hr/>
                             </t>
-                        </div>
+                            <hr/>
+                        </t>
                     </div>
                 </div>
             </div>

From 7d1c05216b318ea2a6bc3d991ff8aad6ea596e91 Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Mon, 26 Nov 2018 17:04:31 +0100
Subject: [PATCH 4/4] [FIX] survey : apply min and max date configuration in
 survey page

The configuration of question of type 'Date' was not used at all.
The datetimepicker configuration was hardcoded and did not take into
account the configuration of questions of type 'Date'.

Now, for each datetimepicker, we use the corresponding configuration
for min and max date.

Task ID : 1912194
Closes PR #28966
---
 addons/survey/static/src/js/survey.js    | 36 +++++++++++++-----------
 addons/survey/views/survey_templates.xml |  4 ++-
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/addons/survey/static/src/js/survey.js b/addons/survey/static/src/js/survey.js
index 6542f63a3dc..16def6107d2 100644
--- a/addons/survey/static/src/js/survey.js
+++ b/addons/survey/static/src/js/survey.js
@@ -183,22 +183,26 @@ if(!the_form.length) {
     // frontend does not load moment locale at all.
     // so wait until DOM ready with locale then init datetimepicker
     ready_with_locale.then(function(){
-        $('.input-group.date').datetimepicker({
-            format : time.getLangDateFormat(),
-            minDate: moment({ y: 1900 }),
-            maxDate: moment().add(200, "y"),
-            calendarWeeks: true,
-            icons: {
-                time: 'fa fa-clock-o',
-                date: 'fa fa-calendar',
-                next: 'fa fa-chevron-right',
-                previous: 'fa fa-chevron-left',
-                up: 'fa fa-chevron-up',
-                down: 'fa fa-chevron-down',
-            },
-            locale : moment.locale(),
-            allowInputToggle: true,
-            keyBinds: null,
+         _.each($('.input-group.date'), function(date_field){
+            var minDate = $(date_field).data('mindate') || moment({ y: 1900 });
+            var maxDate = $(date_field).data('maxdate') || moment().add(200, "y");
+            $('#' + date_field.id).datetimepicker({
+                format : time.getLangDateFormat(),
+                minDate: minDate,
+                maxDate: maxDate,
+                calendarWeeks: true,
+                icons: {
+                    time: 'fa fa-clock-o',
+                    date: 'fa fa-calendar',
+                    next: 'fa fa-chevron-right',
+                    previous: 'fa fa-chevron-left',
+                    up: 'fa fa-chevron-up',
+                    down: 'fa fa-chevron-down',
+                },
+                locale : moment.locale(),
+                allowInputToggle: true,
+                keyBinds: null,
+            });
         });
         // Launch prefilling
         prefill();
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index 0375b26626f..9efe5426187 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -238,7 +238,9 @@
 
     <template id="date" name="Date box">
         <div class="form-group">
-            <div class="input-group date" t-attf-id="datetimepicker_#{question.id}" data-target-input="nearest">
+            <div class="input-group date" t-attf-id="datetimepicker_#{question.id}" data-target-input="nearest"
+                    t-att-data-mindate="question.validation_min_date"
+                    t-att-data-maxdate="question.validation_max_date">
                 <input type="text" class="form-control datetimepicker-input" t-attf-data-target="#datetimepicker_#{question.id}" t-att-name="prefix"/>
                 <div class="input-group-append" t-attf-data-target="#datetimepicker_#{question.id}" data-toggle="datetimepicker">
                     <div class="input-group-text"><i class="fa fa-calendar"></i></div>