refs #5334 merge + e2e solve

e2e/helpers/selectors.js

@@ -899,12 +899,12 @@ export default {
     },
     departmentSummary: {
         header: 'vn-worker-department-summary h5',
-        name: 'vn-worker-department-summary vn-horizontal > vn-vertical > vn-label-value:nth-child(1) > section > span',
-        code: 'vn-worker-department-summary vn-horizontal > vn-vertical > vn-label-value:nth-child(2) > section > span',
-        chat: 'vn-worker-department-summary vn-horizontal > vn-vertical > vn-label-value:nth-child(3) > section > span',
-        bossDepartment: 'vn-worker-department-summary vn-horizontal  > vn-vertical > vn-label-value:nth-child(4) > section > span',
-        email: 'vn-worker-department-summary vn-horizontal  > vn-vertical > vn-label-value:nth-child(5) > section > span',
-        clientFk: 'vn-worker-department-summary vn-horizontal  > vn-vertical > vn-label-value:nth-child(6) > section > span',
+        name: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(1) > section > span',
+        code: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(2) > section > span',
+        chat: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(3) > section > span',
+        bossDepartment: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(4) > section > span',
+        email: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(5) > section > span',
+        clientFk: 'vn-worker-department-summary vn-horizontal > vn-one > vn-vertical > vn-label-value:nth-child(6) > section > span',
     },
     workerBasicData: {
         name: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.firstName"]',

e2e/paths/03-worker/01-department/01_summary.spec.js

@@ -20,7 +20,7 @@ describe('department summary path', () => {
     it('should reach the employee summary section and check all properties', async() => {
         expect(await page.waitToGetProperty(selectors.departmentSummary.header, 'innerText')).toEqual('INFORMATICA');
         expect(await page.getProperty(selectors.departmentSummary.name, 'innerText')).toEqual('INFORMATICA');
-        expect(await page.getProperty(selectors.departmentSummary.code, 'innerText')).toEqual('IT');
+        expect(await page.getProperty(selectors.departmentSummary.code, 'innerText')).toEqual('it');
         expect(await page.getProperty(selectors.departmentSummary.chat, 'innerText')).toEqual('informatica-cau');
         expect(await page.getProperty(selectors.departmentSummary.bossDepartment, 'innerText')).toEqual('');
         expect(await page.getProperty(selectors.departmentSummary.email, 'innerText')).toEqual('-');

loopback/locale/es.json

@@ -297,6 +297,8 @@
 	"Fecha fuera de rango": "Fecha fuera de rango",
 	"Error while generating PDF": "Error al generar PDF",
 	"Error when sending mail to client": "Error al enviar el correo al cliente",
-    "Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
-	"The renew period has not been exceeded": "El periodo de renovación no ha sido superado"
-}
+	"Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
+	"The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
+	"Valid priorities: 1,2,3": "Valid priorities: 1,2,3",
+	"No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº 3": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº 3"
+}

modules/worker/back/models/worker.json

@@ -60,7 +60,7 @@
         "user": {
             "type": "belongsTo",
             "model": "VnUser",
-            "foreignKey": "userFk"
+            "foreignKey": "id"
         },
         "boss": {
             "type": "belongsTo",

modules/worker/front/department/card/index.js

@@ -15,7 +15,13 @@ class Controller extends ModuleCard {
                 }, {
                     relation: 'worker',
                     scope: {
-                        fields: ['id', 'firstName', 'lastName']
+                        fields: ['id', 'firstName', 'lastName'],
+                        include: {
+                            relation: 'user',
+                            scope: {
+                                fields: ['name']
+                            }
+                        }
                     }
                 }
             ]

modules/worker/front/department/summary/index.html

@@ -11,73 +11,75 @@
         <span>{{summary.name}}</span>
     </h5>
     <vn-horizontal class="vn-pa-md">
-        <vn-one>
+        <vn-one class="expand">
             <h4 ng-show="$ctrl.isHr">
                 <a
-                    ui-sref="worker.department.card.basicData({id:summary.id})">
-                    <span translate vn-tooltip="Go to">Basic data</span>
-                </a>
+                ui-sref="worker.department.card.basicData({id:summary.id})">
+                <span translate vn-tooltip="Go to">Basic data</span>
+            </a>
             </h4>
             <h4
                 translates
                 ng-show="!$ctrl.isHr">
                 Basic data
             </h4>
-            <vn-horizontal>
-                <vn-vertical>
-                    <vn-label-value label="Nombre"
-                        value="{{summary.name}}">
-                    </vn-label-value>
-                    <vn-label-value label="Code"
-                        value="{{summary.code}}">
-                    </vn-label-value>
-                    <vn-label-value label="Chat"
-                        value="{{summary.chatName}}">
-                    </vn-label-value>
-                    <vn-label-value
-                        label="Boss department">
-                        <span
-                            ng-click="workerDescriptor.show($event, summary.worker.id)"
-                            class="link">
-                            {{summary.worker.firstName}} {{summary.worker.lastName}} 
-                        </span>
-                    </vn-label-value>
-                    <vn-label-value 
-                        label="Email"
-                        value="{{summary.notificationEmail}}">
-                    </vn-label-value>
-                    <vn-label-value label="Self-consumption customer"
-                        value="{{summary.client.name}}">
-                    </vn-label-value>
-                </vn-vertical>
-                <vn-vertical>
-                    <vn-check
-                        label="Telework"
-                        ng-model="summary.isTeleworking"
-                        disabled="true">
-                    </vn-check>
-                    <vn-check
-                        label="Notify on errors"
-                        ng-model="summary.hasToMistake"
-                        disabled="true">
-                    </vn-check>
-                    <vn-check
-                        label="worksInProduction"
-                        ng-model="summary.isProduction"
-                        disabled="true">
-                    </vn-check>
-                    <vn-check
-                        label="Fill in days without physical check-ins"
-                        ng-model="summary.hasToRefill"
-                        disabled="true">
-                    </vn-check>
-                    <vn-check
-                        label="Send check-ins by email"
-                        ng-model="summary.hasToSendMail"
-                        disabled="true">
-                    </vn-check>
-                </vn-vertical>
-        </vn-horizontal>
+        </vn-one>
+        <vn-one>
+            <vn-vertical>
+                <vn-label-value label="Nombre"
+                    value="{{summary.name}}">
+                </vn-label-value>
+                <vn-label-value label="Code"
+                    value="{{summary.code}}">
+                </vn-label-value>
+                <vn-label-value label="Chat"
+                    value="{{summary.chatName}}">
+                </vn-label-value>
+                <vn-label-value
+                    label="Boss department">
+                    <span
+                        ng-click="workerDescriptor.show($event, summary.worker.id)"
+                        class="link">
+                        {{summary.worker.user.name}}
+                    </span>
+                </vn-label-value>
+                <vn-label-value 
+                    label="Email"
+                    value="{{summary.notificationEmail}}">
+                </vn-label-value>
+                <vn-label-value label="Self-consumption customer"
+                    value="{{summary.client.name}}">
+                </vn-label-value>
+            </vn-vertical>
+        </vn-one>
+        <vn-one>
+            <vn-vertical>
+                <vn-check
+                    label="Telework"
+                    ng-model="summary.isTeleworking"
+                    disabled="true">
+                </vn-check>
+                <vn-check
+                    label="Notify on errors"
+                    ng-model="summary.hasToMistake"
+                    disabled="true">
+                </vn-check>
+                <vn-check
+                    label="worksInProduction"
+                    ng-model="summary.isProduction"
+                    disabled="true">
+                </vn-check>
+                <vn-check
+                    label="Fill in days without physical check-ins"
+                    ng-model="summary.hasToRefill"
+                    disabled="true">
+                </vn-check>
+                <vn-check
+                    label="Send check-ins by email"
+                    ng-model="summary.hasToSendMail"
+                    disabled="true">
+                </vn-check>
+            </vn-vertical>
         </vn-one>
     </vn-horizontal>
 </vn-card>

modules/worker/front/department/summary/index.js

@@ -1,5 +1,6 @@
 import ngModule from '../../module';
 import Component from 'core/lib/component';
+import './style.scss';
 
 class Controller extends Component {
     set department(value) {

modules/worker/front/department/summary/style.scss

@@ -0,0 +1,8 @@
+@import "./variables";
+
+vn-worker-department-summary {
+    .expand {
+        min-width: 100%;
+    }
+}
+

modules/worker/front/summary/index.html

@@ -39,7 +39,7 @@
                 <span
                     ng-click="workerDescriptor.show($event, worker.boss.id)"
                     class="link">
-                    {{::worker.boss.nickname}}
+                    {{::worker.boss.name}}
                 </span>
             </vn-label-value>
             <vn-label-value label="Mobile extension"

modules/worker/front/summary/index.js

@@ -38,7 +38,7 @@ class Controller extends Summary {
                 },
                 {
                     relation: 'boss',
-                    scope: {fields: ['id', 'nickname']}
+                    scope: {fields: ['id', 'name']}
                 },
                 {
                     relation: 'sip',