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

Merge pull request 'fix(ticketTracking): refs #6398 assign ticket workerFk to userFk' (!1924) from 6398-ticketTrackingAsignFix into master
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1924
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
This commit is contained in:
Pablo Natek 2024-01-10 13:04:24 +00:00
parent 2d93452bda a623e5b90e
commit fd0ee6b7a2
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/helpers/selectors.js
View File

@ -735,7 +735,7 @@ export default {
},
createStateView: {
state: 'vn-autocomplete[ng-model="$ctrl.stateFk"]',
worker: 'vn-worker-autocomplete[ng-model="$ctrl.workerFk"]',
worker: 'vn-worker-autocomplete[ng-model="$ctrl.userFk"]',
saveStateButton: `button[type=submit]`
},
claimsIndex: {

2
modules/ticket/front/tracking/edit/index.html
View File

@ -21,7 +21,7 @@
</vn-autocomplete>
<vn-worker-autocomplete
vn-one
ng-model="$ctrl.workerFk">
ng-model="$ctrl.userFk">
</vn-worker-autocomplete>
</vn-horizontal>
</vn-card>

10
modules/ticket/front/tracking/edit/index.js
View File

@ -17,19 +17,19 @@ class Controller extends Section {
set stateFk(value) {
this.params.stateFk = value;
this.isPickerDesignedState = this.getIsPickerDesignedState(value);
this.workerFk = window.localStorage.currentUserWorkerId;
this.userFk = window.localStorage.currentUserWorkerId;
}
get stateFk() {
return this.params.stateFk;
}
set workerFk(value) {
this.params.workerFk = value;
set userFk(value) {
this.params.userFk = value;
}
get workerFk() {
return this.params.workerFk;
get userFk() {
return this.params.userFk;
}
getPickerDesignedState() {

8
modules/ticket/front/tracking/edit/index.spec.js
View File

@ -29,11 +29,11 @@ describe('Ticket', () => {
});
});
describe('workerFk setter', () => {
it('should set params.workerFk', () => {
controller.workerFk = 1;
describe('userFk setter', () => {
it('should set params.userFk', () => {
controller.userFk = 1;
expect(controller.params.workerFk).toEqual(1);
expect(controller.params.userFk).toEqual(1);
});
});