refs #5334 basicData solve e2e

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-one > vn-label-value:nth-child(3) > section > span',
-        code: 'vn-worker-department-summary vn-horizontal > vn-one > vn-label-value:nth-child(4) > section > span',
-        chat: 'vn-worker-department-summary vn-horizontal > vn-one > vn-label-value:nth-child(5) > section > span',
-        bossDepartment: 'vn-worker-department-summary vn-horizontal  > vn-one > vn-label-value:nth-child(6) > section > span',
-        email: 'vn-worker-department-summary vn-horizontal  > vn-one > vn-label-value:nth-child(7) > section > span',
-        clientFk: 'vn-worker-department-summary vn-horizontal  > vn-one > vn-label-value:nth-child(8) > section > span',
+        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',
     },
     workerBasicData: {
         name: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.firstName"]',

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

@@ -7,7 +7,7 @@ describe('department summary path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('hr','worker');
+        await page.loginAndModule('hr', 'worker');
         await page.accessToSection('worker.department');
         await page.doSearch('INFORMATICA');
         await page.click(selectors.department.firstDepartment);
@@ -18,7 +18,6 @@ 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');

loopback/locale/en.json

@@ -175,6 +175,7 @@
 	"Pass expired": "The password has expired, change it from Salix",
 	"Can't transfer claimed sales": "Can't transfer claimed sales",
 	"Invalid quantity": "Invalid quantity",
-    "Failed to upload delivery note": "Error to upload delivery note {{id}}",
-    "Mail not sent": "There has been an error sending the invoice to the client [{{clientId}}]({{{clientUrl}}}), please check the email address"
+	"Failed to upload delivery note": "Error to upload delivery note {{id}}",
+	"Mail not sent": "There has been an error sending the invoice to the client [{{clientId}}]({{{clientUrl}}}), please check the email address",
+	"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 3": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 3"
 }

modules/worker/front/department/basic-data/index.html

@@ -63,32 +63,31 @@
                     label="Self-consumption customer">
                 </vn-autocomplete>
             </vn-horizontal>
-            <vn-vertical>
-            <vn-check
-                label="Telework"
-                ng-model="$ctrl.department.isTeleworking">
-            </vn-check>
-            <vn-check
-                label="Notify on errors"
-                ng-model="$ctrl.department.hasToMistake">
-            </vn-check>
-            <vn-check
-                label="worksInProduction"
-                ng-model="$ctrl.department.isProduction">
-            </vn-check> 
-            <vn-one>
-            <vn-check
-                label="Fill in days without physical check-ins"
-                ng-model="$ctrl.department.hasToRefill">
-            </vn-check>
-            </vn-one>
-            <vn-one> 
-            <vn-check
-                label="Send check-ins by email"
-                ng-model="$ctrl.department.hasToSendMail">
-            </vn-check>
-            </vn-one>
-            </vn-vertical>
+            <vn-horizontal>
+                    <vn-check
+                        label="Telework"
+                        ng-model="$ctrl.department.isTeleworking">
+                    </vn-check>
+                    <vn-check
+                        label="Notify on errors"
+                        ng-model="$ctrl.department.hasToMistake">
+                    </vn-check>
+            </vn-horizontal>
+            <vn-horizontal>         
+                    <vn-check
+                        label="worksInProduction"
+                        ng-model="$ctrl.department.isProduction">
+                    </vn-check>
+                    <vn-check
+                        label="Fill in days without physical check-ins"
+                        ng-model="$ctrl.department.hasToRefill">
+                    </vn-check>
+            </vn-horizontal>        
+                    <vn-check
+                        label="Send check-ins by email"
+                        ng-model="$ctrl.department.hasToSendMail">
+                    </vn-check>    
+            </vn-horizontal>
         </vn-vertical>
     </vn-card>
     <vn-button-bar>

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

@@ -22,6 +22,7 @@
             on-drag-start="$ctrl.onDragStart(item)"
             on-drag-end="$ctrl.onDragEnd(item)">
             <a
+                style="display: block; color: inherit;"
                 ui-sref="worker.department.card.summary({id: item.id})"
                 translate>
                 {{::item.name}}

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

@@ -23,58 +23,57 @@
                 ng-show="!$ctrl.isHr">
                 Basic data
             </h4>
-            <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"
-                value="{{summary.worker.firstName}} {{summary.worker.lastName}}">
-            </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-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-one>
-            <vn-one> 
-                <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-one> 
-            </vn-vertical>
+            <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"
+                        value="{{summary.worker.firstName}} {{summary.worker.lastName}}">
+                    </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-horizontal>
 </vn-card>

modules/worker/front/department/summary/locale/es.yml

@@ -9,3 +9,4 @@ Notify on errors: Notificar errores
 worksInProduction: Pertenece a producción
 Fill in days without physical check-ins: Completar días sin registros físicos
 Send check-ins by email: Enviar fichadas por mail
+Are you sure you want to delete this department?: ¿Estás seguro de que quieres eliminar este departamento?