From 85b0b37dccda2852503417434cb3a3a9f87d7a9b Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Tue, 12 Mar 2019 16:04:40 +0000
Subject: [PATCH] [IMP] survey : add retry survey button if no scoring or nbr
 of attempts left > 0

In order to allow the user to ealisy retake the survey he just either passed
or failed (in case of scoring activated), a retry button is added not only
in case of failed scoring survey (like it was already the case)
but also for non scoring survey.

This button is also added in the review survey page, to get direct access to
retry the survey.

The rule is the following and apply to all survey types :
If not quizz passed (this will be always true for non scoring survey):
    if is_attempts_limited
        if attempts left
            Add retry button
    else
        Add retry button

Task ID : 1950429
PR #31802

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/survey/views/survey_templates.xml | 44 +++++++++++++-----------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index daa8e446718..82c62e9ae8b 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -41,34 +41,37 @@
                             </t>
                             <t t-else="">
                                 <div>Unfortunately, you have failed the test.</div>
-                                <t t-if="survey.is_attempts_limited">
-                                    <t t-set="attempts_left" t-value="survey._get_number_of_attempts_lefts(answer.partner_id, answer.email, answer.invite_token)" />
-                                    <t t-if="attempts_left > 0">
-                                        <p><span>Number of attemps left</span>: <span t-esc="attempts_left"></span></p>
-                                        <p>
-                                            <a role="button" class="btn btn-primary btn-lg" t-att-href="'/survey/retry/%s/%s' % (survey.access_token, answer.token)">
-                                                Retry
-                                            </a>
-                                        </p>
-                                    </t>
-                                </t>
-                                <t t-else="">
-                                    <br/>
-                                    <p>
-                                        <a role="button" class="btn btn-primary btn-lg" t-att-href="'/survey/retry/%s/%s' % (survey.access_token, answer.token)">
-                                            Retry
-                                        </a>
-                                    </p>
-                                </t>
                             </t>
                         </t>
-                        <div t-if="survey.scoring_type != 'scoring_without_answers'">If you wish, you can <a t-att-href="'/survey/print/%s?answer_token=%s' % (survey.access_token, answer.token)">review your answers</a>.</div>
+                        <t t-call="survey.retake_survey_button"/>
+                        <div t-if="survey.scoring_type != 'scoring_without_answers'">
+                            If you wish, you can <a t-att-href="'/survey/print/%s?answer_token=%s' % (survey.access_token, answer.token)">review your answers</a>
+                        </div>
                     </div>
                 </div>
             </div>
         </t>
     </template>
 
+    <template id="retake_survey_button" name="Retake Survey Button">
+        <div>
+            <t t-if="not answer.quizz_passed">
+                <t t-if="survey.is_attempts_limited">
+                    <t t-set="attempts_left" t-value="survey._get_number_of_attempts_lefts(answer.partner_id, answer.email, answer.invite_token)" />
+                    <t t-if="attempts_left > 0">
+                        <p><span>Number of attemps left</span>: <span t-esc="attempts_left"></span></p>
+                        <p><a role="button" class="btn btn-primary btn-lg" t-att-href="'/survey/retry/%s/%s' % (survey.access_token, answer.token)">
+                        Retry</a></p>
+                    </t>
+                </t>
+                <t t-else="">
+                    <p><a role="button" class="btn btn-primary btn-lg" t-att-href="'/survey/retry/%s/%s' % (survey.access_token, answer.token)">
+                        Retry</a></p>
+                </t>
+            </t>
+        </div>
+    </template>
+
     <!-- Message when the survey is not open  -->
     <template id="survey_expired" name="Survey Expired">
         <t t-call="survey.layout">
@@ -479,6 +482,7 @@
                     <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>
+                        <t t-call="survey.retake_survey_button"/>
                     </div>
                     <div role="form" class="js_surveyform" t-att-name="'%s' % (survey.id)" t-att-data-prefill="'/survey/prefill/%s/%s' % (survey.access_token, answer.token)">
                         <t t-foreach='survey.question_and_page_ids' t-as='question'>