verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refs #5334 basicData solve e2e
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Satorres 2023-06-30 13:52:46 +02:00
parent 3d93043b98
commit dc36c6fd9d
7 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
e2e/helpers/selectors.js
View File

@ -899,12 +899,12 @@ export default {
}, },
departmentSummary: { departmentSummary: {
header: 'vn-worker-department-summary h5', header: 'vn-worker-department-summary h5',
name: 'vn-worker-department-summary vn-horizontal > vn-one > vn-label-value:nth-child(3) > 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-one > vn-label-value:nth-child(4) > 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-one > vn-label-value:nth-child(5) > 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-one > vn-label-value:nth-child(6) > 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-one > vn-label-value:nth-child(7) > 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-one > vn-label-value:nth-child(8) > section > span', clientFk: 'vn-worker-department-summary vn-horizontal > vn-vertical > vn-label-value:nth-child(6) > section > span',
}, },
workerBasicData: { workerBasicData: {
name: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.firstName"]', name: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.firstName"]',

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

@ -7,7 +7,7 @@ describe('department summary path', () => {
beforeAll(async() => { beforeAll(async() => {
browser = await getBrowser(); browser = await getBrowser();
page = browser.page; page = browser.page;
await page.loginAndModule('hr','worker'); await page.loginAndModule('hr', 'worker');
await page.accessToSection('worker.department'); await page.accessToSection('worker.department');
await page.doSearch('INFORMATICA'); await page.doSearch('INFORMATICA');
await page.click(selectors.department.firstDepartment); 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() => { 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.waitToGetProperty(selectors.departmentSummary.header, 'innerText')).toEqual('INFORMATICA');
expect(await page.getProperty(selectors.departmentSummary.name, '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');

3
loopback/locale/en.json
View File

@ -176,5 +176,6 @@
"Can't transfer claimed sales": "Can't transfer claimed sales", "Can't transfer claimed sales": "Can't transfer claimed sales",
"Invalid quantity": "Invalid quantity", "Invalid quantity": "Invalid quantity",
"Failed to upload delivery note": "Error to upload delivery note {{id}}", "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" "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"
} }

11
modules/worker/front/department/basic-data/index.html
View File

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

1
modules/worker/front/department/index/index.html
View File

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

13
modules/worker/front/department/summary/index.html
View File

@ -23,6 +23,8 @@
ng-show="!$ctrl.isHr"> ng-show="!$ctrl.isHr">
Basic data Basic data
</h4> </h4>
<vn-horizontal>
<vn-vertical>
<vn-label-value label="Nombre" <vn-label-value label="Nombre"
value="{{summary.name}}"> value="{{summary.name}}">
</vn-label-value> </vn-label-value>
@ -36,14 +38,15 @@
label="Boss department" label="Boss department"
value="{{summary.worker.firstName}} {{summary.worker.lastName}}"> value="{{summary.worker.firstName}} {{summary.worker.lastName}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Email" <vn-label-value
label="Email"
value="{{summary.notificationEmail}}"> value="{{summary.notificationEmail}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Self-consumption customer" <vn-label-value label="Self-consumption customer"
value="{{summary.client.name}}"> value="{{summary.client.name}}">
</vn-label-value> </vn-label-value>
</vn-vertical>
<vn-vertical> <vn-vertical>
<vn-one>
<vn-check <vn-check
label="Telework" label="Telework"
ng-model="summary.isTeleworking" ng-model="summary.isTeleworking"
@ -54,27 +57,23 @@
ng-model="summary.hasToMistake" ng-model="summary.hasToMistake"
disabled="true"> disabled="true">
</vn-check> </vn-check>
</vn-one>
<vn-one>
<vn-check <vn-check
label="worksInProduction" label="worksInProduction"
ng-model="summary.isProduction" ng-model="summary.isProduction"
disabled="true"> disabled="true">
</vn-check> </vn-check>
<vn-check <vn-check
label="Fill in days without physical check-ins" label="Fill in days without physical check-ins"
ng-model="summary.hasToRefill" ng-model="summary.hasToRefill"
disabled="true"> disabled="true">
</vn-check> </vn-check>
<vn-check <vn-check
label="Send check-ins by email" label="Send check-ins by email"
ng-model="summary.hasToSendMail" ng-model="summary.hasToSendMail"
disabled="true"> disabled="true">
</vn-check> </vn-check>
</vn-one>
</vn-vertical> </vn-vertical>
</vn-horizontal>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
</vn-card> </vn-card>

1
modules/worker/front/department/summary/locale/es.yml
View File

@ -9,3 +9,4 @@ Notify on errors: Notificar errores
worksInProduction: Pertenece a producción worksInProduction: Pertenece a producción
Fill in days without physical check-ins: Completar días sin registros físicos Fill in days without physical check-ins: Completar días sin registros físicos
Send check-ins by email: Enviar fichadas por mail 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?