[MERGE][ADD] website_slides_survey: add a new bridge between slide and survey #31060

awa-odoo · 2019-02-13T10:42:16Z

Task #1940360
Subtask of #1902304

Purpose

Adds certification capabilities to the website_slides module.
Channel/courses can now include certifications as a new type of slide.

This new type of slide is available as a "Certification" button on the slide creation
frontend view (next to "Video", "Presentation", ...).
Users have to link the slide to an actual survey that has the 'certificate' field
set to true (that will populate the slide's survey_id field).

Slides of type certification are handled in frontend in a very simple way for now:

A button "Begin certification" that redirects the user to the related survey frontend.
A button "Download certification" when the user has succeeded the certification.
(A new download route has been added in the survey module to make it work.)
When the survey is done, if it's linked to a slide, a button "Go back to course" allows
the user to go back to the slide frontend.

(There is a special use case for when the website_publisher designing the survey lands on a
certification slide: he is allowed to test the survey with a survey_input created as test_entry)

Survey creation as well as limited time, limited number of attempts, ... are still completely
handled in the survey module. That means that the user will have to first create a suitable survey
that is a certification and only then create a slide of type "certification" and link
the created survey to it.

Ideally, the taking of the survey should be transparently included in the slide frontend but
it requires a full refactoring of the way surveys are submitted. This will most likely come in
a later commit.

This commit is an advanced merge of full eLearning module (see task #1902304).

jem-odoo · 2019-02-14T14:12:49Z

addons/website_slides/views/slide_slide_views.xml

@@ -68,11 +68,14 @@
                            </page>
                            <page string="Document">
                                <group>
-                                    <field name="url" attrs="{'required': [('image', '=', False)]}"/>
+                                    <field name="url"
+                                        attrs="{'required': [('image', '=', False)], 'invisible': [('slide_type', 'not in', ('document', 'presentation', 'video'))]}" />


can you please coordonnate yourself with another guy that chipotated with those at 986267c
Histoire d'uniformiser et qu'on ait le meme commit. Premier qui merge a gagné, as usual.

I coordinated my chipoterie with the concerned dude sir.

jem-odoo

tiny review yeay

jem-odoo · 2019-02-14T14:25:36Z

addons/survey/controllers/main.py

+
+        report_sudo = request.env.ref('survey.certification_report').sudo()
+
+        report = getattr(report_sudo, 'render_qweb_pdf')([succeeded_attempt.id], data={'report_type': 'pdf'})[0]


why a getattr here ? O_0

Oops, failed copy/paste. Fixed it!

jem-odoo · 2019-02-14T14:30:34Z

addons/website_slides/models/slide_slide.py

@@ -127,6 +127,7 @@ class Slide(models.Model):
    partner_ids = fields.Many2many('res.partner', 'slide_slide_partner', 'slide_id', 'partner_id',
                                   string='Subscribers', groups='base.group_website_publisher')
    slide_partner_ids = fields.One2many('slide.slide.partner', 'slide_id', string='Subscribers information', groups='base.group_website_publisher')
+    slide_partner_id = fields.Many2one('slide.slide.partner', string="Subscriber information", compute='_compute_slide_partner_id')


help message or comment in compute method

Help message is indeed nice to have.

jem-odoo · 2019-02-14T14:40:15Z

addons/website_slides_survey/__manifest__.py

+    'category': 'Hidden',
+    'version': '0.1',
+
+    'depends': ['website_slides', 'survey'],


website_survey instead

jem-odoo · 2019-02-14T14:52:48Z

addons/website_slides_survey/controllers/main.py

+from odoo.http import request
+
+
+class WebsiteSlides(WebsiteSlides):


Can we split controller into separated file ? like survery.py, slides.py ....

Split and good to go!

This merge proposes a new homepage for slides module evolving towards an eLearning platform. This merge closes task 1936153 and PR #30770. More generally this merge is linked to currently under heavy work slides module update to eLearning [1][2]. It includes * a new main page displaying top courses / channels. It displays 3 most popular and newest channels as well as its ongoing courses (if logged). Achievements and karma update done by eLearning community allow to give a gamification look and feel; * an 'All' page displaying all courses / channels. Tag groups and tags allow to search / filter displayed courses; * a new pimped and revamped display for main course / channel page; * new demo data for slides and small addition of demo data in bridge module with website_sale and website_forum; Some features may not be completely working as other tasks will continue to improve the display, notably new slide display [1], some forum / slide link improvements [3] and certification integration [4]. Some code cleaning will come in future update as this merge allows to unblock those other tasks. For more details see sub commits. And thanks to the RD Fun SM Team. Much fun, much SM. [1] main eLearning task: task ID 1902304 - PR #29876 [2] new user profile /gamification: task ID 1922159 - PR #30514 [3] forum and comments upgrade: task ID 1940516 - PR #30514 and #31097 [4] certification inside eLearning: task ID 1940360 - PR #31060

tde-banana-odoo

Technical review

tde-banana-odoo · 2019-02-15T11:52:56Z

addons/survey/controllers/main.py

+            ('id', '=', survey_id),
+            ('certificate', '=', True)
+        ])
+        survey.ensure_one()


I would return to / or /web if not survey.exists() . It is clearer than using ensure_one I think.

Done it with if not survey:

tde-banana-odoo · 2019-02-15T11:54:11Z

addons/survey/controllers/main.py

@@ -501,6 +509,34 @@ def survey_report(self, survey, answer_token=None, **post):
        #     filter_finish: boolean => only finished surveys or not
        #

+    @http.route(['/survey/download_certification/<int:survey_id>'], type='http', auth='user', methods=['POST'], website=True)


/survey/int/get_certification ? So that we namespace a bit survey routes. I think we alread had this discussion; for new routes like this one I think we don't have to be like old routes.

Renamed the route to fit the nice namespace.

tde-banana-odoo · 2019-02-15T11:58:25Z

addons/website_slides/models/slide_slide.py

@@ -127,6 +127,8 @@ class Slide(models.Model):
    partner_ids = fields.Many2many('res.partner', 'slide_slide_partner', 'slide_id', 'partner_id',
                                   string='Subscribers', groups='base.group_website_publisher')
    slide_partner_ids = fields.One2many('slide.slide.partner', 'slide_id', string='Subscribers information', groups='base.group_website_publisher')
+    slide_partner_id = fields.Many2one('slide.slide.partner', string="Subscriber information", compute='_compute_slide_partner_id',


I find this name confusing. user_membership_id, current_slide_partner_id, current_subscription_id, .. ? I don't have any good idea. slide_partner_id is unclear compared to slide_partner_ids .

Don't have any nicer proposition so I went with "user_membership_id".

tde-banana-odoo · 2019-02-15T12:00:11Z

addons/website_slides/views/website_slides_templates.xml

@@ -153,7 +153,7 @@
            <div class="row" t-if="not search">
                <!-- Navigation -->
                <div class="col-lg-8 col-md-12 col-12">
-                    <ul class="nav nav-tabs nav-tabs-border" role="tablist">
+                    <ul class="nav nav-tabs nav-tabs-border o_wslides_channel_type_nav_tabs" role="tablist">


Should not be necessary I think with shiny '%ss' mechanism.

Praise the '%ss'

tde-banana-odoo · 2019-02-15T12:00:21Z

addons/website_slides_survey/views/website_slides_templates.xml

+            </xpath>
+        </template>
+
+        <template id="slides_channel_header_inherit_survey" inherit_id="website_slides.slides_channel_header">


Should not be necessary I think with shiny '%ss' mechanism.

Praise the '%ss'

tde-banana-odoo · 2019-02-15T12:10:01Z

addons/website_slides_survey/models/slide_slide.py

+    def _action_set_viewed(self, target_partner):
+        """ If the slide viewed is a certification, we initialize the first survey.user_input
+        for the current partner. """
+        created_slide_partners = super(Slide, self)._action_set_viewed(target_partner)


new_slide_partners ? We gain 3 characters :D

Yes <- this is also 3 characters btw

tde-banana-odoo · 2019-02-15T12:11:45Z

addons/website_slides_survey/models/slide_slide.py

+class SlidePartnerRelation(models.Model):
+    _inherit = 'slide.slide.partner'
+
+    user_input_ids = fields.One2many('survey.user_input', 'slide_partner_id', 'Certification attempts')


Actually I don't really like this field as there are access rights limitations and I think it is not really useful. In order to use it you will have to be in sudo mode or have survey officer / manager group. I think we can achieve current result without the o2m (I will update / check others occurrences of it).

Common you know you like it.

tde-banana-odoo · 2019-02-15T12:15:49Z

addons/website_slides_survey/models/slide_slide.py

+            ('survey_id', '!=', False)
+        ])
+
+        for created_slide_partner in created_slide_partners:


I think we could simplify a bit with something like (à pouf)

existing_answers = self.env['survey.user_input'].sudo().search([('partner_id', '=', target_partner.id), ('survey_id', 'in', new_slide_partners.mapped('slide_id.survey_id').ids)]) new_surveys = self.mapped('survey_id') - existing_answers.mapped('survey_id') if new_surveys: # create answer

If we want to batch on target partners we will have to do something smarter but this is currently not the case.

I guess that's not necessary anymore after our discussion?

tde-banana-odoo · 2019-02-15T12:18:07Z

addons/website_slides_survey/models/survey_user.py

+from odoo import fields, models
+
+
+class SurveyUserInput(models.Model):


I would add a small explanation about having slide_partner_id (member) or slide_id (test entry for publishers, should not happen in other cases).

Added some "help" parameters on those two.

tde-banana-odoo · 2019-02-15T12:18:43Z

addons/website_slides_survey/views/slide_channel_views.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="slide_channel_view_form" model="ir.ui.view">


Such naming 😍

Task #1940360 Subtask of #1902304 Purpose ======= Some fields displayed on the slide.slide form view are not relevant for all slide_types and should be hidden.

Purpose ======= Website publisher should be allowed to access slides on the frontend even if he's not a member of the channel.

Task #1940360 Subtask of #1902304 Purpose ======= This commit adds a route allowing to download a certification for a user that has succeeded it. It's currently not used in any views but it's a preliminary work for the future slide bridge.

Task #1940360 Subtask of #1902304 Purpose ======= Adds certification capabilities to the website_slides module. Channel/courses can now include certifications as a new type of slide. This new type of slide is available as a "Certification" button on the slide creation frontend view (next to "Video", "Presentation", ...). Users have to link the slide to an actual survey that has the 'certificate' field set to true (that will populate the slide's survey_id field). Slides of type certification are handled in frontend in a very simple way for now: - A button "Begin certification" that redirects the user to the related survey frontend. - A button "Download certification" when the user has succeeded the certification. - When the survey is done, if it's linked to a slide, a button "Go back to course" allows the user to go back to the slide frontend. (There is a special use case for when the website_publisher designing the survey lands on a certification slide: he is allowed to test the survey with a survey_input created as test_entry) Survey creation as well as limited time, limited number of attempts, ... are still completely handled in the survey module. That means that the user will have to first create a suitable survey that is a certification and only then create a slide of type "certification" and link the created survey to it. Ideally, the taking of the survey should be transparently included in the slide frontend but it requires a full refactoring of the way surveys are submitted. This will most likely come in a later commit. This commit is an advanced merge of full eLearning module (see task #1902304).

Purpose ======= Channel statistics computation in the _compute_slides_statistics method did not work for a batch of channels. (The stats dict was shared for all the channels).

tde-banana-odoo · 2019-02-15T15:42:54Z

@robodoo r+ rebase-merge

robodoo · 2019-02-15T15:43:46Z

Merge method set to rebase and merge, using the PR as merge commit message

tde-banana-odoo · 2019-02-15T15:44:11Z

Thanks @robodoo you are handsome

…d survey Task #1940360 Subtask of #1902304 Purpose ======= Adds certification capabilities to the website_slides module. Channel/courses can now include certifications as a new type of slide. This new type of slide is available as a "Certification" button on the slide creation frontend view (next to "Video", "Presentation", ...). Users have to link the slide to an actual survey that has the 'certificate' field set to true (that will populate the slide's survey_id field). Slides of type certification are handled in frontend in a very simple way for now: - A button "Begin certification" that redirects the user to the related survey frontend. - A button "Download certification" when the user has succeeded the certification. (A new download route has been added in the survey module to make it work.) - When the survey is done, if it's linked to a slide, a button "Go back to course" allows the user to go back to the slide frontend. (There is a special use case for when the website_publisher designing the survey lands on a certification slide: he is allowed to test the survey with a survey_input created as test_entry) Survey creation as well as limited time, limited number of attempts, ... are still completely handled in the survey module. That means that the user will have to first create a suitable survey that is a certification and only then create a slide of type "certification" and link the created survey to it. Ideally, the taking of the survey should be transparently included in the slide frontend but it requires a full refactoring of the way surveys are submitted. This will most likely come in a later commit. This commit is an advanced merge of full eLearning module (see task #1902304). closes #31060

robodoo · 2019-02-15T17:36:34Z

Merged, thanks!

robodoo added the seen 🙂 label Feb 13, 2019

awa-odoo added the RD research & development, internal work label Feb 13, 2019

awa-odoo force-pushed the master-slides-survey-bridge-awa branch 4 times, most recently from 0f708cd to 57fc0e9 Compare February 13, 2019 13:02

robodoo added the CI 🤖 Robodoo has seen passing statuses label Feb 13, 2019

awa-odoo force-pushed the master-slides-survey-bridge-awa branch from 57fc0e9 to af894e5 Compare February 14, 2019 09:06

robodoo removed the CI 🤖 Robodoo has seen passing statuses label Feb 14, 2019

awa-odoo force-pushed the master-slides-survey-bridge-awa branch 3 times, most recently from aabb8c5 to b402da9 Compare February 14, 2019 10:49

robodoo added the CI 🤖 Robodoo has seen passing statuses label Feb 14, 2019

awa-odoo force-pushed the master-slides-survey-bridge-awa branch from b402da9 to a996a22 Compare February 14, 2019 14:00

robodoo removed the CI 🤖 Robodoo has seen passing statuses label Feb 14, 2019

jem-odoo reviewed Feb 14, 2019

View reviewed changes

awa-odoo force-pushed the master-slides-survey-bridge-awa branch 2 times, most recently from 5f09598 to 7dfbd99 Compare February 14, 2019 14:38

jem-odoo suggested changes Feb 14, 2019

View reviewed changes

awa-odoo force-pushed the master-slides-survey-bridge-awa branch from 7dfbd99 to 1b10278 Compare February 14, 2019 15:28

robodoo added the CI 🤖 Robodoo has seen passing statuses label Feb 14, 2019

tde-banana-odoo mentioned this pull request Feb 14, 2019

[MERGE][IMP] website_slides: introduce a new home page for slides #30770

Closed

tde-banana-odoo reviewed Feb 15, 2019

View reviewed changes

awa-odoo added 3 commits February 15, 2019 13:54

[IMP] website_slides: add visibility criteria to some slide fields

887cd51

Task #1940360 Subtask of #1902304 Purpose ======= Some fields displayed on the slide.slide form view are not relevant for all slide_types and should be hidden.

[FIX] website_slides: fix publisher slides frontend access

2dc97b3

Purpose ======= Website publisher should be allowed to access slides on the frontend even if he's not a member of the channel.

awa-odoo force-pushed the master-slides-survey-bridge-awa branch from 1b10278 to 2be23bf Compare February 15, 2019 14:08

robodoo removed the CI 🤖 Robodoo has seen passing statuses label Feb 15, 2019

awa-odoo added 2 commits February 15, 2019 16:32

[FIX] website_slides: fix channel statistics computation

f73cd7c

Purpose ======= Channel statistics computation in the _compute_slides_statistics method did not work for a batch of channels. (The stats dict was shared for all the channels).

awa-odoo force-pushed the master-slides-survey-bridge-awa branch from 2550ce4 to f73cd7c Compare February 15, 2019 15:40

robodoo added the r+ 👌 label Feb 15, 2019

robodoo added the CI 🤖 Robodoo has seen passing statuses label Feb 15, 2019

robodoo added merging 👷 and removed merging 👷 labels Feb 15, 2019

robodoo closed this Feb 15, 2019

fw-bot deleted the master-slides-survey-bridge-awa branch October 19, 2019 21:47


		report_sudo = request.env.ref('survey.certification_report').sudo()

		report = getattr(report_sudo, 'render_qweb_pdf')([succeeded_attempt.id], data={'report_type': 'pdf'})[0]

		from odoo.http import request


		class WebsiteSlides(WebsiteSlides):

		from odoo import fields, models


		class SurveyUserInput(models.Model):

[MERGE][ADD] website_slides_survey: add a new bridge between slide and survey #31060

[MERGE][ADD] website_slides_survey: add a new bridge between slide and survey #31060

Conversation

awa-odoo commented Feb 13, 2019 • edited by tde-banana-odoo

Purpose

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jem-odoo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tde-banana-odoo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tde-banana-odoo Feb 15, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tde-banana-odoo commented Feb 15, 2019

robodoo commented Feb 15, 2019

tde-banana-odoo commented Feb 15, 2019

robodoo commented Feb 15, 2019

awa-odoo commented Feb 13, 2019 •

edited by tde-banana-odoo

tde-banana-odoo Feb 15, 2019 •

edited