From f39e08e69b5f41f9a5944277a9f5d7d94c237cfa Mon Sep 17 00:00:00 2001
From: Dossogne Bertrand <bedo@odoo.com>
Date: Tue, 4 Oct 2022 14:45:31 +0000
Subject: [PATCH] [FIX] hr_skills: fix skills display

Fixes skills display on both employee and applicant page.

task-3002256

closes odoo/odoo#102463

X-original-commit: b93af7c2b502d7b884fbb6a271e5c5cda03af054
Signed-off-by: Kevin Baptiste <kba@odoo.com>
---
 addons/hr_skills/__manifest__.py                   |  1 +
 .../static/src/fields/resume_one2many.scss         |  6 +++++-
 .../static/src/fields/skills_one2many.xml          |  2 +-
 addons/hr_skills/static/src/scss/hr_employee.scss  | 12 ++++++++++++
 addons/hr_skills/views/hr_views.xml                | 14 +++++++-------
 5 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 addons/hr_skills/static/src/scss/hr_employee.scss

diff --git a/addons/hr_skills/__manifest__.py b/addons/hr_skills/__manifest__.py
index 4b6348431fe..94bc8bdbdb2 100644
--- a/addons/hr_skills/__manifest__.py
+++ b/addons/hr_skills/__manifest__.py
@@ -36,6 +36,7 @@ This module introduces skills and resumé management for employees.
         'web.assets_backend': [
             'hr_skills/static/src/fields/skills_one2many.xml',
             'hr_skills/static/src/fields/*',
+            'hr_skills/static/src/scss/*.scss',
             'hr_skills/static/src/views/*.js',
             'hr_skills/static/src/xml/**/*',
         ],
diff --git a/addons/hr_skills/static/src/fields/resume_one2many.scss b/addons/hr_skills/static/src/fields/resume_one2many.scss
index 9cf632714f0..c681b80a0d3 100644
--- a/addons/hr_skills/static/src/fields/resume_one2many.scss
+++ b/addons/hr_skills/static/src/fields/resume_one2many.scss
@@ -2,6 +2,10 @@
     $o-hrs-timeline-entry-padding: .5rem;
     $o-hrs-timeline-dot-size: .6rem;
 
+    .o_data_row {
+        border-bottom: none;
+    }
+
     .o_data_row td {
         padding: $o-hrs-timeline-entry-padding;
 
@@ -15,7 +19,7 @@
                 @include o-position-absolute(0, $left: ($o-hrs-timeline-dot-size * .5 + $o-hrs-timeline-entry-padding));
                 width: 1px;
                 height: 100%;
-                margin-left: -.01rem;
+                margin-left: 2.1rem;
                 background-color: $border-color;
                 content: "";
             }
diff --git a/addons/hr_skills/static/src/fields/skills_one2many.xml b/addons/hr_skills/static/src/fields/skills_one2many.xml
index bafe6b649a8..fa770f69c6b 100644
--- a/addons/hr_skills/static/src/fields/skills_one2many.xml
+++ b/addons/hr_skills/static/src/fields/skills_one2many.xml
@@ -9,7 +9,7 @@
         </xpath>
         <xpath expr="//table" position="after">
             <t t-if="!showTable">
-                <button t-on-click="props.onAdd" class="btn btn-secondary" role="button" t-if="isEditable">
+                <button t-on-click="props.onAdd" class="btn btn-secondary ms-4 mt-3" role="button" t-if="isEditable">
                     Create a new entry
                 </button>
             </t>
diff --git a/addons/hr_skills/static/src/scss/hr_employee.scss b/addons/hr_skills/static/src/scss/hr_employee.scss
new file mode 100644
index 00000000000..141c0117f16
--- /dev/null
+++ b/addons/hr_skills/static/src/scss/hr_employee.scss
@@ -0,0 +1,12 @@
+.o_hr_skills_group {
+    padding: 0 calc(var(--gutter-x) * 1)!important;
+    &:first-child {
+        padding-left: calc(var(--gutter-x) * .5)!important;
+    }
+    &:last-child {
+        padding-right: calc(var(--gutter-x) * .5)!important;
+    }
+    .o_list_renderer {
+        overflow-x: hidden!important;
+    }
+}
diff --git a/addons/hr_skills/views/hr_views.xml b/addons/hr_skills/views/hr_views.xml
index 724dd6ca1c9..cf9de4a975b 100644
--- a/addons/hr_skills/views/hr_views.xml
+++ b/addons/hr_skills/views/hr_views.xml
@@ -350,16 +350,16 @@
                         </h1>
                     </div>
                     <group string="Skills">
-                        <field name="skill_ids" nolabel="1" context="{'default_skill_type_id': id}">
-                            <tree editable="bottom">
-                                <field name="sequence" widget="handle" />
-                                <field name="name"/>
-                            </tree>
-                        </field>
                     </group>
+                    <field name="skill_ids" nolabel="1" context="{'default_skill_type_id': id}">
+                        <tree editable="bottom">
+                            <field name="sequence" widget="handle" />
+                            <field name="name"/>
+                        </tree>
+                    </field>
                     <group string="Levels">
-                        <field name="skill_level_ids" nolabel="1" context="{'default_skill_type_id': id}"/>
                     </group>
+                    <field name="skill_level_ids" nolabel="1" context="{'default_skill_type_id': id}"/>
                 </sheet>
             </form>
         </field>