verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

5334-editDepartment #1521

Merged
carlossa merged 84 commits from 5334-editDepartment into dev 2023-07-06 07:09:06 +00:00
Conversation 0 Commits 84 Files Changed 33 +89 -89
7 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dc36c6fd9d - Show all commits

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');

7
loopback/locale/en.json
View File

@ -175,6 +175,7 @@
"Pass expired": "The password has expired, change it from Salix", "Pass expired": "The password has expired, change it from Salix",
"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"
}

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

@ -63,32 +63,31 @@
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"
carlossa marked this conversation as resolved Outdated
jgallego commented 2023-06-29 06:58:08 +00:00
Outdated
Review
Copy Link

chatgpt
dime en ingles una variable para indicar que alguien trabaja en produccion
ChatGPT
La variable para indicar que alguien trabaja en producción podría denominarse worksInProduction.

chatgpt dime en ingles una variable para indicar que alguien trabaja en produccion ChatGPT La variable para indicar que alguien trabaja en producción podría denominarse worksInProduction.
ng-model="$ctrl.department.isTeleworking"> ng-model="$ctrl.department.isTeleworking">
</vn-check> </vn-check>
<vn-check <vn-check
label="Notify on errors" label="Notify on errors"
ng-model="$ctrl.department.hasToMistake"> ng-model="$ctrl.department.hasToMistake">
</vn-check> </vn-check>
<vn-check </vn-horizontal>
label="worksInProduction" <vn-horizontal>
ng-model="$ctrl.department.isProduction"> <vn-check
</vn-check> label="worksInProduction"
<vn-one> ng-model="$ctrl.department.isProduction">
<vn-check </vn-check>
label="Fill in days without physical check-ins" <vn-check
ng-model="$ctrl.department.hasToRefill"> label="Fill in days without physical check-ins"
</vn-check> ng-model="$ctrl.department.hasToRefill">
</vn-one> </vn-check>
<vn-one> </vn-horizontal>
<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}}

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

@ -23,58 +23,57 @@
ng-show="!$ctrl.isHr"> ng-show="!$ctrl.isHr">
Basic data Basic data
</h4> </h4>
<vn-label-value label="Nombre" <vn-horizontal>
value="{{summary.name}}"> <vn-vertical>
</vn-label-value> <vn-label-value label="Nombre"
<vn-label-value label="Code" value="{{summary.name}}">
value="{{summary.code}}"> </vn-label-value>
</vn-label-value> <vn-label-value label="Code"
<vn-label-value label="Chat" value="{{summary.code}}">
value="{{summary.chatName}}"> </vn-label-value>
</vn-label-value> <vn-label-value label="Chat"
<vn-label-value value="{{summary.chatName}}">
label="Boss department" </vn-label-value>
value="{{summary.worker.firstName}} {{summary.worker.lastName}}"> <vn-label-value
</vn-label-value> label="Boss department"
<vn-label-value label="Email" value="{{summary.worker.firstName}} {{summary.worker.lastName}}">
value="{{summary.notificationEmail}}"> </vn-label-value>
carlossa marked this conversation as resolved Outdated
jgallego commented 2023-06-28 06:49:55 +00:00
Outdated
Review
Copy Link

teleworking

teleworking
</vn-label-value> <vn-label-value
<vn-label-value label="Self-consumption customer" label="Email"
value="{{summary.client.name}}"> value="{{summary.notificationEmail}}">
</vn-label-value> </vn-label-value>
<vn-vertical> <vn-label-value label="Self-consumption customer"
carlossa marked this conversation as resolved Outdated
jgallego commented 2023-06-29 07:03:40 +00:00
Outdated
Review
Copy Link

Notify on errors

Notify on errors
<vn-one> value="{{summary.client.name}}">
<vn-check </vn-label-value>
label="Telework" </vn-vertical>
ng-model="summary.isTeleworking" <vn-vertical>
disabled="true"> <vn-check
</vn-check> label="Telework"
<vn-check ng-model="summary.isTeleworking"
label="Notify on errors" disabled="true">
ng-model="summary.hasToMistake" </vn-check>
disabled="true"> <vn-check
</vn-check> label="Notify on errors"
</vn-one> ng-model="summary.hasToMistake"
<vn-one> disabled="true">
<vn-check </vn-check>
label="worksInProduction" <vn-check
ng-model="summary.isProduction" label="worksInProduction"
disabled="true"> ng-model="summary.isProduction"
</vn-check> disabled="true">
</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-vertical>
</vn-one> </vn-horizontal>
</vn-vertical>
</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
carlossa marked this conversation as resolved Outdated
jgallego commented 2023-06-29 07:04:54 +00:00
Outdated
Review
Copy Link

Completar días sin registros físicos

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?