[FIX] website_slides{_*}: fix completion computation, notably with certifications
PURPOSE
Test frontend and UI tools of eLearning.
SPECIFICATIONS
Since 9920f20e4c course completion when finishing a certification survey
is broken. Indeed channel completion is not correctly recomputed. A
certification course can therefore never be completed and awarded. This
commit fixes that and correctly update channel completion based on survey.
In this commit we also rename some methods
* _compute_completion: renamed to _recompute_completion to avoid naming issue
with computed field convention;
* _post_completion_hook is not unnecessary as code in hr_skill can be done
after calling super of _recompute_completion;
* _completed_callback is renamed to _set_completed_callback to be coherent
with slides naming;
LINKS
Task ID 1937768
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from . import hr_resume_line
|
||||
from . import slide_channel
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from odoo import fields, models
|
||||
|
||||
|
||||
class ResumeLine(models.Model):
|
||||
_inherit = 'hr.resume.line'
|
||||
|
||||
display_type = fields.Selection(selection_add=[('course', 'Course')])
|
||||
channel_id = fields.Many2one('slide.channel', string="Course", readonly=True)
|
||||
@@ -4,10 +4,11 @@
|
||||
from odoo import fields, models
|
||||
|
||||
|
||||
class ChannelUsersRelation(models.Model):
|
||||
class SlideChannelPartner(models.Model):
|
||||
_inherit = 'slide.channel.partner'
|
||||
|
||||
def _post_completion_hook(self):
|
||||
def _recompute_completion(self):
|
||||
res = super(SlideChannelPartner, self)._recompute_completion()
|
||||
partner_has_completed = {channel_partner.partner_id.id: channel_partner.channel_id for channel_partner in self}
|
||||
employees = self.env['hr.employee'].sudo().search([('user_id.partner_id', 'in', list(partner_has_completed.keys()))])
|
||||
for employee in employees:
|
||||
@@ -23,11 +24,4 @@ class ChannelUsersRelation(models.Model):
|
||||
'display_type': 'course',
|
||||
'channel_id': channel.id
|
||||
})
|
||||
return super()._post_completion_hook()
|
||||
|
||||
|
||||
class ResumeLine(models.Model):
|
||||
_inherit = 'hr.resume.line'
|
||||
|
||||
display_type = fields.Selection(selection_add=[('course', 'Course')])
|
||||
channel_id = fields.Many2one('slide.channel', string="Course", readonly=True)
|
||||
return res
|
||||
|
||||
@@ -6,7 +6,6 @@ import uuid
|
||||
from odoo import api, fields, models, tools, _
|
||||
from odoo.addons.http_routing.models.ir_http import slug
|
||||
from odoo.addons.gamification.models.gamification_karma_rank import KarmaError
|
||||
from odoo.exceptions import UserError, AccessError
|
||||
from odoo.osv import expression
|
||||
|
||||
|
||||
@@ -22,7 +21,7 @@ class ChannelUsersRelation(models.Model):
|
||||
partner_id = fields.Many2one('res.partner', index=True, required=True, ondelete='cascade')
|
||||
partner_email = fields.Char(related='partner_id.email', readonly=True)
|
||||
|
||||
def _compute_completion(self):
|
||||
def _recompute_completion(self):
|
||||
read_group_res = self.env['slide.slide.partner'].sudo().read_group(
|
||||
['&', '&', ('channel_id', 'in', self.mapped('channel_id').ids),
|
||||
('partner_id', 'in', self.mapped('partner_id').ids),
|
||||
@@ -47,17 +46,11 @@ class ChannelUsersRelation(models.Model):
|
||||
partner_karma = {partner_id: karma_to_add
|
||||
for partner_id, karma_to_add in partner_karma.items() if karma_to_add > 0}
|
||||
|
||||
self._post_completion_hook()
|
||||
|
||||
if partner_karma:
|
||||
users = self.env['res.users'].sudo().search([('partner_id', 'in', list(partner_karma.keys()))])
|
||||
for user in users:
|
||||
users.add_karma(partner_karma[user.partner_id.id])
|
||||
|
||||
|
||||
def _post_completion_hook(self):
|
||||
pass
|
||||
|
||||
def unlink(self):
|
||||
"""
|
||||
Override unlink method :
|
||||
|
||||
@@ -37,20 +37,21 @@ class SlidePartnerRelation(models.Model):
|
||||
res = super(SlidePartnerRelation, self).create(values)
|
||||
completed = res.filtered('completed')
|
||||
if completed:
|
||||
completed._completed_callback()
|
||||
completed._set_completed_callback()
|
||||
return res
|
||||
|
||||
def write(self, values):
|
||||
res = super(SlidePartnerRelation, self).write(values)
|
||||
if values.get('completed'):
|
||||
self._completed_callback()
|
||||
self._set_completed_callback()
|
||||
return res
|
||||
|
||||
def _completed_callback(self):
|
||||
def _set_completed_callback(self):
|
||||
self.env['slide.channel.partner'].search([
|
||||
('channel_id', 'in', self.channel_id.ids),
|
||||
('partner_id', 'in', self.partner_id.ids),
|
||||
])._compute_completion()
|
||||
])._recompute_completion()
|
||||
|
||||
|
||||
class SlideLink(models.Model):
|
||||
_name = 'slide.slide.link'
|
||||
@@ -410,7 +411,7 @@ class Slide(models.Model):
|
||||
|
||||
if 'is_published' in values or 'active' in values:
|
||||
# if the slide is published/unpublished, recompute the completion for the partners
|
||||
self.slide_partner_ids._completed_callback()
|
||||
self.slide_partner_ids._set_completed_callback()
|
||||
|
||||
return res
|
||||
|
||||
|
||||
@@ -22,15 +22,17 @@ class SlidePartnerRelation(models.Model):
|
||||
|
||||
@api.model_create_multi
|
||||
def create(self, vals_list):
|
||||
for vals in vals_list:
|
||||
if vals.get('survey_quizz_passed'):
|
||||
vals['completed'] = True
|
||||
return super(SlidePartnerRelation, self).create(vals_list)
|
||||
res = super(SlidePartnerRelation, self).create(vals_list)
|
||||
completed = res.filtered('survey_quizz_passed')
|
||||
if completed:
|
||||
completed.write({'completed': True})
|
||||
return res
|
||||
|
||||
def _write(self, vals):
|
||||
res = super(SlidePartnerRelation, self)._write(vals)
|
||||
if vals.get('survey_quizz_passed'):
|
||||
vals['completed'] = True
|
||||
return super(SlidePartnerRelation, self)._write(vals)
|
||||
self.sudo().write({'completed': True})
|
||||
return res
|
||||
|
||||
|
||||
class Slide(models.Model):
|
||||
|
||||
Reference in New Issue
Block a user