From 3f8ee12ca041db5cae26fc53a58073152607c28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lanie?= <mepe@odoo.com>
Date: Wed, 4 Oct 2023 07:04:47 +0000
Subject: [PATCH] [IMP] *: redesign employee kanban card

* = hr, hr_holidays, hr_homeworking

Change the disposition in Kanban card.
Changes the behavior of the image in the kanban card: if an employee don't have an image the avatar's image is displayed.

task : 3527398

closes odoo/odoo#138858

X-original-commit: c55dd60baa8aeb6d54a2dc7f1039be1e84113cf8
Related: odoo/upgrade#5314
Signed-off-by: Sofie Gvaladze (sgv) <sgv@odoo.com>
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 addons/hr/static/src/scss/hr.scss             |  7 +++-
 addons/hr/views/hr_employee_public_views.xml  | 23 ++++++++----
 addons/hr/views/hr_employee_views.xml         | 35 +++++++++++++------
 .../views/hr_employee_views.xml               | 11 ------
 4 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/addons/hr/static/src/scss/hr.scss b/addons/hr/static/src/scss/hr.scss
index f45a7deb9ab..8c59a7d4624 100644
--- a/addons/hr/static/src/scss/hr.scss
+++ b/addons/hr/static/src/scss/hr.scss
@@ -42,7 +42,7 @@
 
 .o_hr_employee_kanban .o_kanban_renderer {
     .o_employee_availability {
-        margin: 0 1px;
+        margin: unset !important;
     }
     .o_kanban_record_bottom {
         margin: 0 var(--KanbanRecord-padding-h);
@@ -52,7 +52,12 @@
     }
 }
 
+.hr_tags {
+    margin-right: 20%;
+}
+
 .o_hr_kanban_record {
+    min-height: fit-content;
     .fa-2x {
         font-size: 1.6em;
     }
diff --git a/addons/hr/views/hr_employee_public_views.xml b/addons/hr/views/hr_employee_public_views.xml
index 29c04146d2a..42d140c4874 100644
--- a/addons/hr/views/hr_employee_public_views.xml
+++ b/addons/hr/views/hr_employee_public_views.xml
@@ -135,20 +135,29 @@
                     <templates>
                         <t t-name="kanban-box">
                         <div class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record">
-                            <field name="image_1024" class="o_kanban_image_fill_left d-block" preview_image="image_128"
-                                widget="background_image" options="{'zoom': true, 'zoom_delay': 1000}"/>
-
+                            <t t-if="!record.image_1024.raw_value">
+                                <field name="avatar_128" class="o_kanban_image_fill_left d-block"
+                                    widget="background_image" options="{'zoom': true, 'zoom_delay': 1000}"/>
+                            </t>
+                            <t t-else="">
+                                <field name="image_1024" class="o_kanban_image_fill_left d-block" preview_image="image_128"
+                                    widget="background_image" options="{'zoom': true, 'zoom_delay': 1000}"/>
+                            </t>
                             <div class="oe_kanban_details">
                                 <div class="o_kanban_record_top">
                                     <div class="o_kanban_record_headings">
                                         <strong class="o_kanban_record_title">
                                             <field name="name" placeholder="Employee's Name"/>
+                                            <div class="float-end">
+                                                <t t-if="record.show_hr_icon_display.raw_value">
+                                                    <field name="hr_icon_display" class="o_employee_availability align-items-center" widget="hr_presence_status" />
+                                                </t>
+                                            </div>
                                         </strong>
                                         <span t-if="record.job_title.raw_value" class="o_kanban_record_subtitle"><field name="job_title"/></span>
                                     </div>
                                 </div>
                                 <ul>
-                                    <li id="last_login"/>
                                     <li t-if="record.show_hr_icon_display.raw_value">
                                         <field name="hr_icon_display" class="o_employee_availability align-items-center" widget="hr_presence_status" />
                                     </li>
@@ -162,10 +171,12 @@
                                     </li>
                                 </ul>
                                 <div class="oe_kanban_content position-absolute start-0 bottom-0 end-0 me-2">
-                                    <div class="o_kanban_record_bottom">
+                                    <div class="o_kanban_record_bottom mt-3">
                                         <div class="oe_kanban_bottom_left"/>
                                         <div class="oe_kanban_bottom_right">
-                                            <widget name="hr_employee_chat"/>
+                                            <div class="hr_avatar mb-1 ms-2 me-n1">
+                                                <field name="user_id" widget="many2one_avatar_user" readonly="1"/>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml
index 67afc3ff9da..c8da8946b90 100644
--- a/addons/hr/views/hr_employee_views.xml
+++ b/addons/hr/views/hr_employee_views.xml
@@ -279,22 +279,32 @@
                     <templates>
                         <t t-name="kanban-box">
                         <div class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record">
-                            <field name="image_1024" class="o_kanban_image_fill_left d-block" preview_image="image_128"
-                                widget="background_image" options="{'zoom': true, 'zoom_delay': 1000}"/>
+                            <t t-if="!record.image_1024.raw_value">
+                                <field name="avatar_128" class="o_kanban_image_fill_left d-block"
+                                    widget="background_image" options="{'zoom': true, 'zoom_delay': 1000}"/>
+                            </t>
+                            <t t-else="">
+                                <field name="image_1024" class="o_kanban_image_fill_left d-block" preview_image="image_128"
+                                    widget="background_image" options="{'zoom': true, 'zoom_delay': 1000}"/>
+                            </t>
+
                             <div class="oe_kanban_details">
                                 <div class="o_kanban_record_top">
                                     <div class="o_kanban_record_headings">
                                         <strong class="o_kanban_record_title">
                                             <field name="name" placeholder="Employee's Name"/>
+                                            <div class="float-end">
+                                                <div t-if="record.show_hr_icon_display.raw_value">
+                                                    <field name="hr_icon_display" class="o_employee_availability" widget="hr_presence_status" />
+                                                </div>
+                                            </div>
                                         </strong>
-                                        <span t-if="record.job_title.raw_value" class="o_kanban_record_subtitle"><field name="job_title"/></span>
+                                        <span t-if="record.job_title.raw_value" class="o_kanban_record_subtitle">
+                                            <field name="job_title"/>
+                                        </span>
                                     </div>
                                 </div>
                                 <ul>
-                                    <li id="last_login"/>
-                                    <li t-if="record.show_hr_icon_display.raw_value">
-                                        <field name="hr_icon_display" class="o_employee_availability" widget="hr_presence_status" />
-                                    </li>
                                     <li t-if="record.work_email.raw_value" class="o_text_overflow">
                                         <i class="fa fa-fw me-2 fa-envelope text-primary" title="Email"/>
                                         <field name="work_email" />
@@ -303,16 +313,19 @@
                                         <i class="fa fa-fw me-2 fa-phone text-primary" title="Phone"/>
                                         <field name="work_phone" />
                                     </li>
-                                    <li>
                                         <field name="employee_properties" widget="properties"/>
+                                    <li class="hr_tags">
+                                        <field name="category_ids" widget="many2many_tags" options="{'color_field': 'color'}" optional="hide"/>
                                     </li>
                                 </ul>
                             </div>
                             <div class="oe_kanban_content o_hr_employee_kanban_bottom position-absolute bottom-0 start-0 end-0">
-                                <div class="o_kanban_record_bottom">
+                                <div class="o_kanban_record_bottom mt-3">
                                     <div class="oe_kanban_bottom_left"/>
-                                    <div class="oe_kanban_bottom_right float-end pe-auto">
-                                        <widget name="hr_employee_chat"/>
+                                    <div class="oe_kanban_bottom_right">
+                                        <div class="hr_avatar mb-1 ms-2 me-n1">
+                                            <field name="user_id" widget="many2one_avatar_user" readonly="1"/>
+                                        </div>
                                         <div class="hr_activity_container mb-1 ms-2 me-n1">
                                             <field name="activity_ids" widget="kanban_activity"/>
                                         </div>
diff --git a/addons/hr_homeworking/views/hr_employee_views.xml b/addons/hr_homeworking/views/hr_employee_views.xml
index 566caa5dfc1..114a8a942b0 100644
--- a/addons/hr_homeworking/views/hr_employee_views.xml
+++ b/addons/hr_homeworking/views/hr_employee_views.xml
@@ -47,15 +47,4 @@
             </xpath>
         </field>
     </record>
-
-    <record id="hr_kanban_view_employees" model="ir.ui.view">
-        <field name="name">hr.employee.kanban.inherit.homeworking</field>
-        <field name="model">hr.employee</field>
-        <field name="inherit_id" ref="hr.hr_kanban_view_employees"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='hr_icon_display'][hasclass('o_employee_availability')]" position="after">
-                <field name="name_work_location_display" class="ps-2" string="Work Location"/>
-            </xpath>
-        </field>
-    </record>
 </odoo>