summaryrefslogtreecommitdiff
path: root/addons/website_slides_survey
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2019-03-08 09:19:43 +0000
committerThibault Delavallée <tde@odoo.com>2019-03-08 11:15:07 +0000
commit7afd23e56c6cfe6d1f5b5bbcb08911f79cccd9ff (patch)
treeea3cb1527a34d605c89ab8b19929f32113207c1c /addons/website_slides_survey
parent523c1276a13bc63c79e499286d3883ee3cbd953d (diff)
[FIX] website_slides: various fixes
Display * improve color of trophy displayed on top of course main page (success if course done, warning while working on it); * correctly fetch and display karma/xp points on course lesson list. It is either gain of next try, either awarded points depending on slide completion; * fix control buttons in course main page (prev, next, set done, set completed, fullscren), notably correctly set them disabled; Linting / Code * put demo in no update; * rename some parameter in website_slides_survey to avoid conflict between quiz (on a slide) and certification (a survey); Commit linked to task ID 1941250 and PR #31697. Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Diffstat (limited to 'addons/website_slides_survey')
-rw-r--r--addons/website_slides_survey/controllers/slides.py7
-rw-r--r--addons/website_slides_survey/data/slide_slide_demo.xml2
-rw-r--r--addons/website_slides_survey/views/website_slides_templates_lesson.xml8
3 files changed, 9 insertions, 8 deletions
diff --git a/addons/website_slides_survey/controllers/slides.py b/addons/website_slides_survey/controllers/slides.py
index c232c865474..b65b3c3333b 100644
--- a/addons/website_slides_survey/controllers/slides.py
+++ b/addons/website_slides_survey/controllers/slides.py
@@ -7,6 +7,7 @@ from odoo.http import request
class WebsiteSlides(WebsiteSlides):
+
def _get_valid_slide_post_values(self):
result = super(WebsiteSlides, self)._get_valid_slide_post_values()
result.append('survey_id')
@@ -24,10 +25,12 @@ class WebsiteSlides(WebsiteSlides):
This is used in the context of a website_publisher designing a course."""
result = super(WebsiteSlides, self)._get_slide_detail(slide)
if not request.env.user._is_public() and slide.slide_type == 'certification' and slide.survey_id:
+ result['certification_test_entry'] = not slide.channel_id.is_member
+ result['certification_done'] = False
if slide.channel_id.is_member:
user_membership_id_sudo = slide.user_membership_id.sudo()
quizz_passed = user_membership_id_sudo.survey_quizz_passed
- result['quizz_passed'] = quizz_passed
+ result['certification_done'] = quizz_passed
result['survey_id'] = slide.survey_id.id
if not quizz_passed:
last_user_input = next(user_input for user_input in user_membership_id_sudo.user_input_ids.sorted(
@@ -35,8 +38,6 @@ class WebsiteSlides(WebsiteSlides):
))
result['certification_url'] = last_user_input._get_survey_url()
else:
- result['quizz_passed'] = False
- result['test_entry'] = True
user_input = slide.survey_id._create_answer(
partner=request.env.user.partner_id,
check_attempts=False,
diff --git a/addons/website_slides_survey/data/slide_slide_demo.xml b/addons/website_slides_survey/data/slide_slide_demo.xml
index 3e006b6ee05..fe4642fbaf5 100644
--- a/addons/website_slides_survey/data/slide_slide_demo.xml
+++ b/addons/website_slides_survey/data/slide_slide_demo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<odoo><data noupdate="0">
+<odoo><data noupdate="1">
<!-- CHANNEL 5: Basics of Furniture Creation -->
<!-- ======================================= -->
diff --git a/addons/website_slides_survey/views/website_slides_templates_lesson.xml b/addons/website_slides_survey/views/website_slides_templates_lesson.xml
index 8d6a4d1f123..c6233535bed 100644
--- a/addons/website_slides_survey/views/website_slides_templates_lesson.xml
+++ b/addons/website_slides_survey/views/website_slides_templates_lesson.xml
@@ -3,9 +3,9 @@
<data>
<template id="slide_content_detailed" inherit_id="website_slides.slide_content_detailed">
<xpath expr="//div[hasclass('o_wslides_lesson_content_type')]" position="inside">
- <t t-if="not test_entry" t-set="begin_certification_label" t-value="'Begin certification'" />
- <t t-if="test_entry" t-set="begin_certification_label" t-value="'Test certification'" />
- <div t-if="slide.slide_type == 'certification' and not quizz_passed" class="mb8">
+ <t t-if="not certification_test_entry" t-set="begin_certification_label" t-value="'Begin certification'" />
+ <t t-if="certification_test_entry" t-set="begin_certification_label" t-value="'Test certification'" />
+ <div t-if="slide.slide_type == 'certification' and not certification_done" class="col mt32 mb8 d-flex justify-content-center">
<a role="button"
class="btn btn-primary btn-lg"
t-att-href="certification_url">
@@ -13,7 +13,7 @@
<t t-esc="begin_certification_label" />
</a>
</div>
- <div t-if="slide.slide_type == 'certification' and quizz_passed" class="mb8">
+ <div t-if="slide.slide_type == 'certification' and certification_done" class="col mt32 mb8 d-flex justify-content-center">
<a role="button"
t-att-data-survey_id="survey_id"
class="btn btn-primary btn-lg o_wslides_survey_download_certification"