From 69cc8589376d30cd262dbd7cf71dc3e500d09c98 Mon Sep 17 00:00:00 2001 From: Kevin Baptiste Date: Tue, 21 Jun 2022 14:24:09 +0000 Subject: [PATCH] [IMP] hr_skills: add default group by on reports Add a default group by on the reporting views. closes odoo/odoo#94177 Taskid: 2884672 Related: odoo/enterprise#28685 Signed-off-by: Kevin Baptiste --- addons/hr_skills/__manifest__.py | 2 +- .../hr_skills/static/src/js/skills_graph.js | 24 +++++++++++++++++++ .../views/hr_employee_skill_log_views.xml | 8 +++---- 3 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 addons/hr_skills/static/src/js/skills_graph.js diff --git a/addons/hr_skills/__manifest__.py b/addons/hr_skills/__manifest__.py index 6d895d20dfc..c02cc428108 100644 --- a/addons/hr_skills/__manifest__.py +++ b/addons/hr_skills/__manifest__.py @@ -35,7 +35,7 @@ This module introduces skills and resumé management for employees. 'assets': { 'web.assets_backend': [ 'hr_skills/static/src/css/hr_skills.scss', - 'hr_skills/static/src/js/resume_widget.js', + 'hr_skills/static/src/js/*.js', ], 'web.qunit_suite_tests': [ 'hr_skills/static/tests/**/*', diff --git a/addons/hr_skills/static/src/js/skills_graph.js b/addons/hr_skills/static/src/js/skills_graph.js new file mode 100644 index 00000000000..71f031afcd7 --- /dev/null +++ b/addons/hr_skills/static/src/js/skills_graph.js @@ -0,0 +1,24 @@ +/** @odoo-module **/ + +import { registry } from "@web/core/registry"; +import { GraphRenderer } from "@web/views/graph/graph_renderer"; +import { graphView } from "@web/views/graph/graph_view"; + +export class SkillsGraphRenderer extends GraphRenderer { + getScaleOptions() { + const scaleOptions = super.getScaleOptions(); + + if ('yAxes' in scaleOptions) { + scaleOptions['yAxes'][0]['ticks']['suggestedMax'] = 100; + } + + return scaleOptions; + } +} + +export const skillsGraphView = { + ...graphView, + Renderer: SkillsGraphRenderer, +}; + +registry.category("views").add("skills_graph", skillsGraphView); diff --git a/addons/hr_skills/views/hr_employee_skill_log_views.xml b/addons/hr_skills/views/hr_employee_skill_log_views.xml index eb00782e9a3..5459d205c31 100644 --- a/addons/hr_skills/views/hr_employee_skill_log_views.xml +++ b/addons/hr_skills/views/hr_employee_skill_log_views.xml @@ -4,7 +4,7 @@ hr.employee.skill.log.view.graph hr.employee.skill.log - + @@ -17,7 +17,7 @@ hr.employee.skill.log.view.graph hr.employee.skill.log - + @@ -67,7 +67,6 @@ graph,tree {'fill_temporal': 0} - current @@ -77,8 +76,7 @@ hr.employee.skill.log graph,tree - {'fill_temporal': 0} - + {'fill_temporal': 0, 'search_default_group_by_skill_type_id': 1, 'search_default_group_by_skill_id': 2} current