diff --git a/addons/survey/__manifest__.py b/addons/survey/__manifest__.py index 66e79a12ce8..f23302b5d84 100644 --- a/addons/survey/__manifest__.py +++ b/addons/survey/__manifest__.py @@ -37,6 +37,7 @@ sent mails with personal token for the invitation of the survey. 'views/survey_templates.xml', 'views/gamification_badge_views.xml', 'wizard/survey_invite_views.xml', + 'views/res_partner_views.xml', ], 'demo': [ 'data/survey_demo_user.xml', diff --git a/addons/survey/models/__init__.py b/addons/survey/models/__init__.py index b51646132df..b539d063303 100644 --- a/addons/survey/models/__init__.py +++ b/addons/survey/models/__init__.py @@ -7,3 +7,4 @@ from . import survey_question from . import survey_user from . import badge from . import challenge +from . import res_partner diff --git a/addons/survey/models/res_partner.py b/addons/survey/models/res_partner.py new file mode 100644 index 00000000000..41ce56ddc0a --- /dev/null +++ b/addons/survey/models/res_partner.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + certifications_count = fields.Integer('Certifications Count', compute='_compute_certifications_count') + certifications_company_count = fields.Integer('Company Certifications Count', compute='_compute_certifications_company_count') + + @api.depends('is_company') + def _compute_certifications_count(self): + read_group_res = self.env['survey.user_input'].sudo().read_group( + [('partner_id', 'in', self.ids), ('quizz_passed', '=', True)], + ['partner_id'], 'partner_id' + ) + data = dict((res['partner_id'][0], res['partner_id_count']) for res in read_group_res) + for partner in self: + partner.certifications_count = data.get(partner.id, 0) + + @api.depends('is_company', 'child_ids.certifications_count') + def _compute_certifications_company_count(self): + self.certifications_company_count = sum(child.certifications_count for child in self.child_ids) + + def action_view_certifications(self): + action = self.env.ref('survey.res_partner_action_certifications').read()[0] + action['view_mode'] = 'tree' + action['domain'] = ['|', ('partner_id', 'in', self.ids), ('partner_id', 'in', self.child_ids.ids)] + + return action diff --git a/addons/survey/views/res_partner_views.xml b/addons/survey/views/res_partner_views.xml new file mode 100644 index 00000000000..d284039a8a5 --- /dev/null +++ b/addons/survey/views/res_partner_views.xml @@ -0,0 +1,40 @@ + + + + + Certifications Succeeded + survey.user_input + tree + {'search_default_quizz_passed': 1} + + + + res.partner.view.form.inherit.survey + res.partner + + + + + + + + + + + diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py index 73e09b11484..047c21cb97e 100644 --- a/addons/website_slides/__manifest__.py +++ b/addons/website_slides/__manifest__.py @@ -27,6 +27,7 @@ Featuring 'data': [ 'views/assets.xml', 'views/res_config_settings_views.xml', + 'views/res_partner_views.xml', 'views/slide_slide_views.xml', 'views/slide_channel_partner_views.xml', 'views/slide_channel_views.xml', diff --git a/addons/website_slides/models/__init__.py b/addons/website_slides/models/__init__.py index 9a55188c7ae..b8b6868cc0a 100644 --- a/addons/website_slides/models/__init__.py +++ b/addons/website_slides/models/__init__.py @@ -10,3 +10,4 @@ from . import res_config_settings from . import website from . import res_users from . import res_groups +from . import res_partner diff --git a/addons/website_slides/models/res_partner.py b/addons/website_slides/models/res_partner.py new file mode 100644 index 00000000000..6ee87be909d --- /dev/null +++ b/addons/website_slides/models/res_partner.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + slide_channels_count = fields.Integer('Course Count', compute='_compute_slide_channels_count') + slide_channels_company_count = fields.Integer('Company Course Count', compute='_compute_slide_channels_company_count') + + @api.depends('is_company') + def _compute_slide_channels_count(self): + read_group_res = self.env['slide.channel.partner'].sudo().read_group( + [('partner_id', 'in', self.ids)], + ['partner_id'], 'partner_id' + ) + data = dict((res['partner_id'][0], res['partner_id_count']) for res in read_group_res) + for partner in self: + partner.slide_channels_count = data.get(partner.id, 0) + + @api.depends('is_company', 'child_ids.slide_channels_count') + def _compute_slide_channels_company_count(self): + for partner in self: + if partner.is_company: + partner.slide_channels_company_count = self.env['slide.channel'].sudo().search_count( + [('partner_ids', 'in', partner.child_ids.ids)] + ) + else: + partner.slide_channels_company_count = 0 + + def action_view_courses(self): + action = self.env.ref('website_slides.res_partner_action_courses').read()[0] + action['view_mode'] = 'tree' + action['domain'] = ['|', ('partner_ids', 'in', self.ids), ('partner_ids', 'in', self.child_ids.ids)] + + return action diff --git a/addons/website_slides/views/res_partner_views.xml b/addons/website_slides/views/res_partner_views.xml new file mode 100644 index 00000000000..a5e7161c00b --- /dev/null +++ b/addons/website_slides/views/res_partner_views.xml @@ -0,0 +1,39 @@ + + + + + Followed Courses + slide.channel + tree + + + + res.partner.view.form.inherit.slides + res.partner + + + + + + + + + + +