From 3adc035cab712a30fb4bbc4edc002c2e448cc9cf Mon Sep 17 00:00:00 2001
From: Gerard <gerard@verdnatura.es>
Date: Mon, 18 Feb 2019 12:54:33 +0100
Subject: [PATCH] #1121 worker.descriptor

---
 front/core/components/label-value/label-value.js | 15 +++++++++++++++
 modules/worker/front/card/index.js               |  7 +++++++
 modules/worker/front/descriptor/index.html       | 11 +++++++----
 modules/worker/front/locale/es.yml               |  4 ++--
 modules/worker/front/summary/index.html          |  7 ++++---
 modules/worker/front/summary/index.js            |  7 +++++++
 6 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/front/core/components/label-value/label-value.js b/front/core/components/label-value/label-value.js
index ecf3bf4b3..515df45c7 100644
--- a/front/core/components/label-value/label-value.js
+++ b/front/core/components/label-value/label-value.js
@@ -8,23 +8,37 @@ export default class Controller {
         this.hasInfo = Boolean($attrs.info);
         this.info = $attrs.info || null;
     }
+
     set label(value) {
         let label = this.element.querySelector('vn-label');
         label.textContent = this._.instant(value);
         this._label = value;
     }
+
     get label() {
         return this._label;
     }
+
     set value(value) {
         let span = this.element.querySelector('span');
         span.title = value;
         span.textContent = value ? value : '-';
         this._value = value;
     }
+
     get value() {
         return this._value;
     }
+
+    get title() {
+        return this._title;
+    }
+
+    set title(value) {
+        let span = this.element.querySelector('span');
+        span.title = value;
+        this._title = value;
+    }
 }
 Controller.$inject = ['$element', '$translate', '$attrs'];
 
@@ -32,6 +46,7 @@ ngModule.component('vnLabelValue', {
     controller: Controller,
     template: require('./label-value.html'),
     bindings: {
+        title: '@?',
         label: '@',
         value: '@'
     }
diff --git a/modules/worker/front/card/index.js b/modules/worker/front/card/index.js
index c73c9f8ec..ea1457fc8 100644
--- a/modules/worker/front/card/index.js
+++ b/modules/worker/front/card/index.js
@@ -25,6 +25,13 @@ class Controller {
                 }, {
                     relation: 'sip',
                     scope: {fields: ['extension']}
+                }, {
+                    relation: 'department',
+                    scope: {
+                        include: {
+                            relation: 'department'
+                        }
+                    }
                 }
             ]
         };
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index 315ad7c9c..696f2a22f 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -10,12 +10,15 @@
     </vn-horizontal>
     <div class="body">
         <div class="attributes">
-            <h5>{{$ctrl.worker.firstName}} {{$ctrl.worker.name}}</h5>
+            <h5 title="{{$ctrl.worker.firstName}} {{$ctrl.worker.name}}">
+                {{$ctrl.worker.firstName}} {{$ctrl.worker.name}}
+            </h5>
             <vn-label-value label="Id" 
                 value="{{$ctrl.worker.id}}">
             </vn-label-value>
             <vn-label-value label="User" 
-                value="{{$ctrl.worker.user.name}}">
+                value="{{$ctrl.worker.user.name}}"
+                title="{{$ctrl.worker.firstName}} {{$ctrl.worker.name}}">
             </vn-label-value>
             <vn-label-value label="Email" 
                 value="{{$ctrl.worker.user.email}}">
@@ -24,13 +27,13 @@
                 value="{{$ctrl.worker.client.fi}}">
             </vn-label-value>
             <vn-label-value label="Department" 
-                value="{{$ctrl.worker.department.department}}">
+                value="{{$ctrl.worker.department.department.name}}">
             </vn-label-value>
             <vn-label-value label="Phone" 
                 value="{{$ctrl.worker.phone}}">
             </vn-label-value>
             <vn-label-value label="Extension" 
-                value="{{$ctrl.worker.sip.phone}}">
+                value="{{$ctrl.worker.sip.extension}}">
             </vn-label-value>
         </div>
         <div class="quicklinks">
diff --git a/modules/worker/front/locale/es.yml b/modules/worker/front/locale/es.yml
index cb945605b..7caf36e0b 100644
--- a/modules/worker/front/locale/es.yml
+++ b/modules/worker/front/locale/es.yml
@@ -1,8 +1,8 @@
 Workers: Trabajadores
 Last name: Apellidos
 User data: Datos de usuario
-Fiscal identifier: Identificador fiscal
-Email: Correo electrónico
+Fiscal identifier: NIF
+Email: E-mail
 Department: Departamento
 User id: Id de usuario
 Role: Rol
diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html
index 1cf31fc98..429db6d98 100644
--- a/modules/worker/front/summary/index.html
+++ b/modules/worker/front/summary/index.html
@@ -13,7 +13,7 @@
                 value="{{worker.user.email}}">
             </vn-label-value>
             <vn-label-value label="Department" 
-                value="{{worker.department.department}}">
+                value="{{worker.department.department.name}}">
             </vn-label-value>
             <vn-label-value label="Phone" 
                 value="{{worker.phone}}">
@@ -25,13 +25,14 @@
                 value="{{worker.userFk}}">
             </vn-label-value>
             <vn-label-value label="User" 
-                value="{{worker.user.name}}">
+                value="{{worker.user.name}}"
+                title="{{worker.firstName}} {{worker.name}}">
             </vn-label-value>
             <vn-label-value label="Role" 
                 value="{{worker.user.role.name}}">
             </vn-label-value>
             <vn-label-value label="Extension" 
-                value="{{worker.sip.phone}}">
+                value="{{worker.sip.extension}}">
             </vn-label-value>
         </vn-one>
     </vn-horizontal>
diff --git a/modules/worker/front/summary/index.js b/modules/worker/front/summary/index.js
index 693ec156c..9a69a1ea1 100644
--- a/modules/worker/front/summary/index.js
+++ b/modules/worker/front/summary/index.js
@@ -35,6 +35,13 @@ class Controller {
                 }, {
                     relation: 'sip',
                     scope: {fields: ['extension']}
+                }, {
+                    relation: 'department',
+                    scope: {
+                        include: {
+                            relation: 'department'
+                        }
+                    }
                 }
             ]
         };