From 8deb11d33336d0da988f581992b8a6b7cd408cce Mon Sep 17 00:00:00 2001
From: jorgebl <jorgebl.verdnatura@gmail.com>
Date: Fri, 19 Feb 2021 17:45:45 +0100
Subject: [PATCH 1/3] Added boss on basic data and summary

---
 modules/worker/back/models/worker.json     | 5 +++++
 modules/worker/front/basic-data/index.html | 9 +++++++++
 modules/worker/front/summary/index.html    | 4 ++++
 modules/worker/front/summary/index.js      | 3 +++
 4 files changed, 21 insertions(+)

diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index 45eee23bf3..906f9baef7 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -61,6 +61,11 @@
             "type": "hasMany",
             "model": "WorkerTeamCollegues",
             "foreignKey": "workerFk"
+        },
+        "boss": {
+            "type": "belongsTo",
+            "model": "Worker",
+            "foreignKey": "bossFk"
         }
     }
 }
\ No newline at end of file
diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html
index a2cbbc637b..a767eccc4a 100644
--- a/modules/worker/front/basic-data/index.html
+++ b/modules/worker/front/basic-data/index.html
@@ -29,6 +29,15 @@
                     ng-model="$ctrl.worker.phone"
                     rule>
                 </vn-textfield>
+                <vn-autocomplete
+                disabled="false"
+                ng-model="$ctrl.worker.bossFk"
+                url="Clients/activeWorkersWithRole"
+                show-field="nickname"
+                search-function="{firstName: $search}"
+                where="{role: 'employee'}"
+                label="Boss">
+                </vn-autocomplete>
             </vn-horizontal>
         </vn-vertical>
     </vn-card>
diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html
index 0a99959e4f..cc7a0b03c8 100644
--- a/modules/worker/front/summary/index.html
+++ b/modules/worker/front/summary/index.html
@@ -30,6 +30,10 @@
             <vn-label-value label="Department" 
                 value="{{worker.department.department.name}}">
             </vn-label-value>
+            <vn-label-value
+                label="Boss" 
+                value="{{worker.boss.firstName}}">
+            </vn-label-value>
             <vn-label-value label="Phone" 
                 value="{{worker.phone}}">
             </vn-label-value>
diff --git a/modules/worker/front/summary/index.js b/modules/worker/front/summary/index.js
index 6a4d870074..631b307a2c 100644
--- a/modules/worker/front/summary/index.js
+++ b/modules/worker/front/summary/index.js
@@ -34,6 +34,9 @@ class Controller extends Summary {
                 }, {
                     relation: 'client',
                     scope: {fields: ['fi']}
+                }, {
+                    relation: 'boss',
+                    scope: {fields: ['id', 'firstName']}
                 }, {
                     relation: 'sip',
                     scope: {fields: ['extension']}
-- 
2.40.1


From 9855bd14fef0c5336a44d13cb3c84d84797dd4bb Mon Sep 17 00:00:00 2001
From: jorgebl <jorgebl.verdnatura@gmail.com>
Date: Tue, 23 Feb 2021 11:08:57 +0100
Subject: [PATCH 2/3] Translate Boss

---
 modules/worker/front/locale/es.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/worker/front/locale/es.yml b/modules/worker/front/locale/es.yml
index 63570ddf07..1414d089bc 100644
--- a/modules/worker/front/locale/es.yml
+++ b/modules/worker/front/locale/es.yml
@@ -7,6 +7,7 @@ Extension: Extensión
 Fiscal identifier: NIF
 Go to client: Ir al cliente
 Last name: Apellidos
+Boss: Jefe
 Log: Historial
 Private Branch Exchange: Centralita
 Role: Rol
-- 
2.40.1


From 1f1db53d415d6f3a8b14a6ae9ff33a24964ee0a8 Mon Sep 17 00:00:00 2001
From: jorgebl <jorgebl.verdnatura@gmail.com>
Date: Wed, 24 Feb 2021 16:12:44 +0100
Subject: [PATCH 3/3] Summary boss shown on descriptor

---
 modules/worker/back/models/worker.json  | 10 +++++-----
 modules/worker/front/summary/index.html | 13 ++++++++++---
 modules/worker/front/summary/index.js   | 18 +++++++++++-------
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index 906f9baef7..cad38ac3ba 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -42,6 +42,11 @@
             "model": "Account",
             "foreignKey": "userFk"
         },
+        "boss": {
+            "type": "belongsTo",
+            "model": "Account",
+            "foreignKey": "bossFk"
+        },
         "client": {
             "type": "belongsTo",
             "model": "Client",
@@ -61,11 +66,6 @@
             "type": "hasMany",
             "model": "WorkerTeamCollegues",
             "foreignKey": "workerFk"
-        },
-        "boss": {
-            "type": "belongsTo",
-            "model": "Worker",
-            "foreignKey": "bossFk"
         }
     }
 }
\ No newline at end of file
diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html
index cc7a0b03c8..d2a7e750bd 100644
--- a/modules/worker/front/summary/index.html
+++ b/modules/worker/front/summary/index.html
@@ -31,8 +31,12 @@
                 value="{{worker.department.department.name}}">
             </vn-label-value>
             <vn-label-value
-                label="Boss" 
-                value="{{worker.boss.firstName}}">
+                label="Boss">
+                <span
+                    ng-click="workerDescriptor.show($event, worker.boss.id)"
+                    class="link">
+                    {{::worker.boss.nickname}}
+                </span>
             </vn-label-value>
             <vn-label-value label="Phone" 
                 value="{{worker.phone}}">
@@ -54,4 +58,7 @@
             </vn-label-value>
         </vn-one>
     </vn-horizontal>
-</vn-card>
\ No newline at end of file
+</vn-card>
+<vn-worker-descriptor-popover 
+    vn-id="workerDescriptor">
+</vn-worker-descriptor-popover>
\ No newline at end of file
diff --git a/modules/worker/front/summary/index.js b/modules/worker/front/summary/index.js
index 631b307a2c..3cdb2c36f1 100644
--- a/modules/worker/front/summary/index.js
+++ b/modules/worker/front/summary/index.js
@@ -11,8 +11,8 @@ class Controller extends Summary {
         this.$.worker = null;
         if (!value) return;
 
-        let query = `Workers/${value.id}`;
-        let filter = {
+        const query = `Workers/${value.id}`;
+        const filter = {
             include: [
                 {
                     relation: 'user',
@@ -31,16 +31,20 @@ class Controller extends Summary {
                             }
                         }]
                     }
-                }, {
+                },
+                {
                     relation: 'client',
                     scope: {fields: ['fi']}
-                }, {
+                },
+                {
                     relation: 'boss',
-                    scope: {fields: ['id', 'firstName']}
-                }, {
+                    scope: {fields: ['id', 'nickname']}
+                },
+                {
                     relation: 'sip',
                     scope: {fields: ['extension']}
-                }, {
+                },
+                {
                     relation: 'department',
                     scope: {
                         include: {
-- 
2.40.1