[DEL]partner_skills:disabled skill level for now
This commit is contained in:
@@ -165,7 +165,7 @@ msgstr "Niveaux"
|
||||
#. module: partner_skills
|
||||
#: model:ir.model,name:partner_skills.model_partner_skill_type
|
||||
msgid "Partner Skill Type"
|
||||
msgstr "Type"
|
||||
msgstr "Domaine"
|
||||
|
||||
#. module: partner_skills
|
||||
#: model:ir.ui.menu,name:partner_skills.menu_partner_skills
|
||||
@@ -227,13 +227,13 @@ msgstr "Niveau"
|
||||
#: model:ir.model.fields,field_description:partner_skills.field_partner_skill_line__skill_type_id
|
||||
#: model_terms:ir.ui.view,arch_db:partner_skills.partner_skill_view_search
|
||||
msgid "Skill Type"
|
||||
msgstr "Type"
|
||||
msgstr "Domaine"
|
||||
|
||||
#. module: partner_skills
|
||||
#: model:ir.actions.act_window,name:partner_skills.partner_skill_type_action
|
||||
#: model:ir.ui.menu,name:partner_skills.menu_action_res_bank_form
|
||||
msgid "Skill Types"
|
||||
msgstr "Types"
|
||||
msgstr "Domaines"
|
||||
|
||||
#. module: partner_skills
|
||||
#: model:ir.model,name:partner_skills.model_partner_skill_line
|
||||
@@ -256,7 +256,7 @@ msgstr "Compétences"
|
||||
#: code:addons/partner_skills/models/partner_skill_line.py:0
|
||||
msgid "The skill %(name)s and skill type %(type)s doesn't match"
|
||||
msgstr ""
|
||||
"La compétence %(name)s et le type de compétences %(type)s ne correspondent "
|
||||
"La compétence %(name)s et le domaine de compétences %(type)s ne correspondent "
|
||||
"pas"
|
||||
|
||||
#. module: partner_skills
|
||||
@@ -264,7 +264,7 @@ msgstr ""
|
||||
#: code:addons/partner_skills/models/partner_skill_line.py:0
|
||||
msgid "The skill level %(level)s is not valid for skill type: %(type)s"
|
||||
msgstr ""
|
||||
"Le niveau de compétence %(level)s n'est pas valide pour le type de "
|
||||
"Le niveau de compétence %(level)s n'est pas valide pour le domaine de "
|
||||
"compétences : %(type)s"
|
||||
|
||||
#. module: partner_skills
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from odoo import api, fields, models, _
|
||||
from odoo.exceptions import ValidationError
|
||||
from odoo.exceptions import UserError, ValidationError
|
||||
|
||||
|
||||
class PartnerSkillLine(models.Model):
|
||||
@@ -13,10 +13,15 @@ class PartnerSkillLine(models.Model):
|
||||
'partner.skill', compute='_compute_skill_id', store=True,
|
||||
domain="[('skill_type_id', '=', skill_type_id)]",
|
||||
readonly=False, required=True, ondelete='cascade')
|
||||
# Skill levels are hidden from the UI for now (client request). The field is
|
||||
# kept so existing data is preserved and the feature can be re-enabled later.
|
||||
skill_level_id = fields.Many2one(
|
||||
'partner.skill.level', compute='_compute_skill_level_id',
|
||||
'partner.skill.level',
|
||||
# compute='_compute_skill_level_id', # re-enable with the method below
|
||||
domain="[('skill_type_id', '=', skill_type_id)]",
|
||||
store=True, readonly=False, required=True, ondelete='cascade')
|
||||
store=True, readonly=False,
|
||||
# required=True, # re-enable when skill levels come back
|
||||
ondelete='cascade')
|
||||
skill_type_id = fields.Many2one(
|
||||
'partner.skill.type',
|
||||
default=lambda self: self.env['partner.skill.type'].search([], limit=1),
|
||||
@@ -39,15 +44,17 @@ class PartnerSkillLine(models.Model):
|
||||
type=record.skill_type_id.name,
|
||||
))
|
||||
|
||||
@api.constrains('skill_type_id', 'skill_level_id')
|
||||
def _check_skill_level(self):
|
||||
for record in self:
|
||||
if record.skill_level_id not in record.skill_type_id.skill_level_ids:
|
||||
raise ValidationError(_(
|
||||
"The skill level %(level)s is not valid for skill type: %(type)s",
|
||||
level=record.skill_level_id.name,
|
||||
type=record.skill_type_id.name,
|
||||
))
|
||||
# Temporarily disabled: references skill_type_id.skill_level_ids which is
|
||||
# commented out on partner.skill.type while levels are hidden.
|
||||
# @api.constrains('skill_type_id', 'skill_level_id')
|
||||
# def _check_skill_level(self):
|
||||
# for record in self:
|
||||
# if record.skill_level_id not in record.skill_type_id.skill_level_ids:
|
||||
# raise ValidationError(_(
|
||||
# "The skill level %(level)s is not valid for skill type: %(type)s",
|
||||
# level=record.skill_level_id.name,
|
||||
# type=record.skill_type_id.name,
|
||||
# ))
|
||||
|
||||
@api.depends('skill_type_id')
|
||||
def _compute_skill_id(self):
|
||||
@@ -57,16 +64,42 @@ class PartnerSkillLine(models.Model):
|
||||
else:
|
||||
record.skill_id = False
|
||||
|
||||
@api.depends('skill_id')
|
||||
def _compute_skill_level_id(self):
|
||||
for record in self:
|
||||
if not record.skill_id:
|
||||
record.skill_level_id = False
|
||||
else:
|
||||
skill_levels = record.skill_type_id.skill_level_ids
|
||||
record.skill_level_id = skill_levels.filtered('default_level') or skill_levels[0] if skill_levels else False
|
||||
# Temporarily disabled: references skill_type_id.skill_level_ids which is
|
||||
# commented out on partner.skill.type while levels are hidden.
|
||||
# @api.depends('skill_id')
|
||||
# def _compute_skill_level_id(self):
|
||||
# for record in self:
|
||||
# if not record.skill_id:
|
||||
# record.skill_level_id = False
|
||||
# else:
|
||||
# skill_levels = record.skill_type_id.skill_level_ids
|
||||
# record.skill_level_id = skill_levels.filtered('default_level') or skill_levels[0] if skill_levels else False
|
||||
|
||||
def action_add_all_skills_of_type(self):
|
||||
self.ensure_one()
|
||||
if not self.skill_type_id:
|
||||
raise UserError(_("Please select a skill type first."))
|
||||
if not isinstance(self.partner_id.id, int):
|
||||
raise UserError(_("Please save the contact before adding skills in bulk."))
|
||||
existing_skills = self.partner_id.partner_skill_ids.filtered(
|
||||
lambda l: l.skill_type_id == self.skill_type_id
|
||||
).skill_id
|
||||
skills_to_add = self.skill_type_id.skill_ids - existing_skills
|
||||
if skills_to_add:
|
||||
self.create([{
|
||||
'partner_id': self.partner_id.id,
|
||||
'skill_type_id': self.skill_type_id.id,
|
||||
'skill_id': skill.id,
|
||||
} for skill in skills_to_add])
|
||||
return {
|
||||
'type': 'ir.actions.client',
|
||||
'tag': 'soft_reload',
|
||||
}
|
||||
|
||||
@api.depends('skill_id', 'skill_level_id')
|
||||
def _compute_display_name(self):
|
||||
for record in self:
|
||||
if record.skill_level_id:
|
||||
record.display_name = f"{record.skill_id.name}: {record.skill_level_id.name}"
|
||||
else:
|
||||
record.display_name = record.skill_id.name or ""
|
||||
|
||||
@@ -13,7 +13,7 @@ class PartnerSkillType(models.Model):
|
||||
active = fields.Boolean('Active', default=True)
|
||||
name = fields.Char(required=True, translate=True)
|
||||
skill_ids = fields.One2many('partner.skill', 'skill_type_id', string="Skills")
|
||||
skill_level_ids = fields.One2many('partner.skill.level', 'skill_type_id', string="Levels", copy=True)
|
||||
#skill_level_ids = fields.One2many('partner.skill.level', 'skill_type_id', string="Levels", copy=True)
|
||||
color = fields.Integer('Color', default=_get_default_color)
|
||||
|
||||
def copy_data(self, default=None):
|
||||
|
||||
@@ -13,4 +13,4 @@ class ResPartner(models.Model):
|
||||
@api.depends('partner_skill_ids.skill_id')
|
||||
def _compute_skill_ids(self):
|
||||
for partner in self:
|
||||
partner.skill_ids = partner.partner_skill_ids.skill_id
|
||||
partner.skill_ids = partner.partner_skill_ids.skill_id or None
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<odoo>
|
||||
|
||||
<!-- Skill Level Tree -->
|
||||
<record id="partner_skill_level_view_tree" model="ir.ui.view">
|
||||
<!-- <record id="partner_skill_level_view_tree" model="ir.ui.view">
|
||||
<field name="name">partner.skill.level.view.tree</field>
|
||||
<field name="model">partner.skill.level</field>
|
||||
<field name="arch" type="xml">
|
||||
@@ -13,10 +13,10 @@
|
||||
<field name="default_level" widget="boolean_toggle" />
|
||||
</list>
|
||||
</field>
|
||||
</record>
|
||||
</record> -->
|
||||
|
||||
<!-- Skill Level Form -->
|
||||
<record id="partner_skill_level_view_form" model="ir.ui.view">
|
||||
<!-- <record id="partner_skill_level_view_form" model="ir.ui.view">
|
||||
<field name="name">partner.skill.level.view.form</field>
|
||||
<field name="model">partner.skill.level</field>
|
||||
<field name="arch" type="xml">
|
||||
@@ -29,7 +29,7 @@
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
</record> -->
|
||||
|
||||
<!-- Skill Tree -->
|
||||
<record id="partner_skill_view_tree" model="ir.ui.view">
|
||||
@@ -68,7 +68,7 @@
|
||||
<search>
|
||||
<field name="name" />
|
||||
<field name="skill_ids" />
|
||||
<field name="skill_level_ids" />
|
||||
<!-- <field name="skill_level_ids" /> -->
|
||||
<filter name="inactive" string="Archived" domain="[('active', '=', False)]" />
|
||||
</search>
|
||||
</field>
|
||||
@@ -83,7 +83,7 @@
|
||||
<field name="name" />
|
||||
<field name="color" widget="color_picker" />
|
||||
<field name="skill_ids" widget="many2many_tags" />
|
||||
<field name="skill_level_ids" widget="many2many_tags" />
|
||||
<!-- <field name="skill_level_ids" widget="many2many_tags" /> -->
|
||||
</list>
|
||||
</field>
|
||||
</record>
|
||||
@@ -117,7 +117,7 @@
|
||||
</list>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Levels" name="levels">
|
||||
<!-- <page string="Levels" name="levels">
|
||||
<field name="skill_level_ids" nolabel="1">
|
||||
<list editable="bottom">
|
||||
<field name="name" />
|
||||
@@ -126,7 +126,7 @@
|
||||
<field name="default_level" widget="boolean_toggle_load" />
|
||||
</list>
|
||||
</field>
|
||||
</page>
|
||||
</page> -->
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
@@ -134,6 +134,8 @@
|
||||
</record>
|
||||
|
||||
<!-- Partner Skill Line Form (Select Skills dialog) -->
|
||||
<!-- Skill level / progress fields are hidden (client request). To restore
|
||||
them, un-comment the XML block marked "SKILL LEVEL BLOCK" below. -->
|
||||
<record id="partner_skill_line_view_form" model="ir.ui.view">
|
||||
<field name="name">partner.skill.line.view.form</field>
|
||||
<field name="model">partner.skill.line</field>
|
||||
@@ -146,10 +148,17 @@
|
||||
<field name="skill_type_id" widget="radio"/>
|
||||
</group>
|
||||
<group>
|
||||
<div class="text-end mb-2" invisible="not skill_type_id">
|
||||
<button name="action_add_all_skills_of_type"
|
||||
type="object"
|
||||
string="Add all skills of this type"
|
||||
class="btn btn-link btn-sm p-0"/>
|
||||
</div>
|
||||
<field name="skill_id" options="{'no_open': True, 'no_create': True}"
|
||||
context="{'default_skill_type_id': skill_type_id}"
|
||||
domain="[('skill_type_id', '=', skill_type_id)]"
|
||||
invisible="not skill_type_id"/>
|
||||
<!-- SKILL LEVEL BLOCK (hidden for now)
|
||||
<label for="skill_level_id"
|
||||
invisible="not (skill_id or skill_type_id)"/>
|
||||
<div class="o_row" invisible="not (skill_id or skill_type_id)">
|
||||
@@ -163,9 +172,14 @@
|
||||
<field name="level_progress" widget="progressbar" class="o_partner_skills_progress" invisible="not skill_level_id"/>
|
||||
</span>
|
||||
</div>
|
||||
-->
|
||||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
<footer>
|
||||
<button string="Save" special="save" class="btn-primary" data-hotkey="q"/>
|
||||
<button string="Discard" special="cancel" data-hotkey="x"/>
|
||||
</footer>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
<field mode="list" nolabel="1" name="partner_skill_ids" widget="partner_skills_one2many" class="mt-2">
|
||||
<list>
|
||||
<field name="skill_id"/>
|
||||
<field name="skill_level_id"/>
|
||||
<field name="level_progress" widget="progressbar"/>
|
||||
<!-- <field name="skill_level_id"/> -->
|
||||
<!-- <field name="level_progress" widget="progressbar"/> -->
|
||||
<field name="skill_type_id" optional="hidden"/>
|
||||
</list>
|
||||
</field>
|
||||
|
||||
Reference in New Issue
Block a user