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

fixes #5287 Añadir campo Locker (Taquilla) en Worker/Basic Data y crear nueva sección Worker/PDA #1347

Merged
alexandre merged 6 commits from 5287-worker-locker-pda into dev 2023-02-28 12:55:36 +00:00
Conversation 0 Commits 6 Files Changed 32 +16 -9
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d5ea59e284 - Show all commits

18
db/changes/230801/00-workerLocker.sql
View File

@ -1,9 +1,15 @@
ALTER TABLE `vn`.`worker` ADD locker INT UNSIGNED NULL UNIQUE; ALTER TABLE `vn`.`worker` ADD locker INT UNSIGNED NULL UNIQUE;
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
VALUES VALUES
('DeviceProduction', '*', '*', 'ALLOW', 'ROLE', 'employee'), ('DeviceProduction', '*', '*', 'ALLOW', 'ROLE', 'hr'),
('DeviceProductionModels', '*', '*', 'ALLOW', 'ROLE', 'employee'), ('DeviceProductionModels', '*', '*', 'ALLOW', 'ROLE', 'hr'),
('DeviceProductionState', '*', '*', 'ALLOW', 'ROLE', 'employee'), ('DeviceProductionState', '*', '*', 'ALLOW', 'ROLE', 'hr'),
jgallego commented 2023-02-28 07:04:51 +00:00
Outdated
Review
Copy Link

Pregunta permisos a Juanjo

Pregunta permisos a Juanjo
('DeviceProductionUser', '*', '*', 'ALLOW', 'ROLE', 'employee'), ('DeviceProductionUser', '*', '*', 'ALLOW', 'ROLE', 'hr'),
('Worker', 'deallocatePDA', '*', 'ALLOW', 'ROLE', 'employee'), ('DeviceProduction', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
('Worker', 'allocatePDA', '*', 'ALLOW', 'ROLE', 'employee'); ('DeviceProductionModels', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
('DeviceProductionState', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
('DeviceProductionUser', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
('Worker', 'deallocatePDA', '*', 'ALLOW', 'ROLE', 'hr'),
('Worker', 'allocatePDA', '*', 'ALLOW', 'ROLE', 'hr'),
('Worker', 'deallocatePDA', '*', 'ALLOW', 'ROLE', 'productionAssi'),
('Worker', 'allocatePDA', '*', 'ALLOW', 'ROLE', 'productionAssi');

2
e2e/paths/03-worker/07_pda.spec.js
View File

@ -7,7 +7,7 @@ describe('Worker pda path', () => {
beforeAll(async() => { beforeAll(async() => {
browser = await getBrowser(); browser = await getBrowser();
page = browser.page; page = browser.page;
await page.loginAndModule('employee', 'worker'); await page.loginAndModule('hr', 'worker');
await page.accessToSearchResult('employeeNick'); await page.accessToSearchResult('employeeNick');
await page.accessToSection('worker.card.pda'); await page.accessToSection('worker.card.pda');
}); });

3
modules/worker/front/pda/index.html
View File

@ -10,7 +10,7 @@
icon="delete" icon="delete"
vn-tooltip="Deallocate PDA" vn-tooltip="Deallocate PDA"
ng-click="$ctrl.deallocatePDA()" ng-click="$ctrl.deallocatePDA()"
vn-acl="employee"> vn-acl="hr, productionAssi">
</vn-icon-button> </vn-icon-button>
</append> </append>
</vn-textfield> </vn-textfield>
@ -21,6 +21,7 @@
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-lg">
<vn-horizontal> <vn-horizontal>
<vn-autocomplete <vn-autocomplete
vn-acl="hr, productionAssi"
ng-model="$ctrl.newPDA" ng-model="$ctrl.newPDA"
url="DeviceProductions" url="DeviceProductions"
fields="['id', 'modelFk', 'serialNumber']" fields="['id', 'modelFk', 'serialNumber']"

2
modules/worker/front/routes.json
View File

@ -148,7 +148,7 @@
"state": "worker.card.pda", "state": "worker.card.pda",
"component": "vn-worker-pda", "component": "vn-worker-pda",
"description": "PDA", "description": "PDA",
"acl": ["employee"] "acl": ["hr", "productionAssi"]
} }
] ]
} }