From f1b1286393aeb690ac2d8f410d260f8615ebd718 Mon Sep 17 00:00:00 2001 From: Fabio Barbero Date: Fri, 26 Nov 2021 12:10:22 +0000 Subject: [PATCH] [IMP] survey: display final screen in live presentation Purpose ======= When presenting a live survey, the page does not give a confirmation message when the survey ends and stays on the last slide. A "Thank you!" message is now displayed when the presentation ends. Task-2700222 closes odoo/odoo#80447 Signed-off-by: Thibault Delavallee (tde) --- .../survey/static/src/js/survey_session_manage.js | 13 +++++-------- addons/survey/views/survey_templates_management.xml | 2 +- .../views/survey_templates_user_input_session.xml | 5 +++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/addons/survey/static/src/js/survey_session_manage.js b/addons/survey/static/src/js/survey_session_manage.js index 7988f4affdd..ef829dfe9ea 100644 --- a/addons/survey/static/src/js/survey_session_manage.js +++ b/addons/survey/static/src/js/survey_session_manage.js @@ -165,13 +165,8 @@ publicWidget.registry.SurveySessionManage = publicWidget.Widget.extend(SurveyPre this.$('.o_survey_session_navigation_next').addClass('d-none'); } this.leaderBoard.showLeaderboard(true, this.isScoredQuestion); - } else { - if (!this.isLastQuestion) { - this._nextQuestion(); - } else if (!this.sessionShowLeaderboard) { - // If we have no leaderboard to show, directly end the session - this.$('.o_survey_session_close').click(); - } + } else if (!this.isLastQuestion || !this.sessionShowLeaderboard) { + this._nextQuestion(); } this.currentScreen = screenToDisplay; @@ -394,7 +389,9 @@ publicWidget.registry.SurveySessionManage = publicWidget.Widget.extend(SurveyPre self.leaderBoard.showLeaderboard(false, false); }); } else { - this.$('.o_survey_session_close').click(); + self.$('.o_survey_session_close').click(); + self.$('.o_survey_session_results').addClass('d-none'); + self.$('.o_survey_session_description_done').prepend($("

").text(_t('Thank you!'))).removeClass('d-none'); } // Background Management diff --git a/addons/survey/views/survey_templates_management.xml b/addons/survey/views/survey_templates_management.xml index f1b2258c2fd..177ed698af5 100644 --- a/addons/survey/views/survey_templates_management.xml +++ b/addons/survey/views/survey_templates_management.xml @@ -118,7 +118,7 @@
-