Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
d88957d157
|
|
@ -0,0 +1,4 @@
|
||||||
|
UPDATE salix.ACL SET principalId = "hr" WHERE property IN ('find','findById','findOne') AND model = "Worker";
|
||||||
|
|
||||||
|
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
|
||||||
|
VALUES ('Worker', '__get__summary', 'READ', 'ALLOW', 'ROLE', 'employee');
|
||||||
|
|
@ -2,7 +2,6 @@ import selectors from '../../helpers/selectors.js';
|
||||||
import getBrowser from '../../helpers/puppeteer';
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
describe('Worker summary path', () => {
|
describe('Worker summary path', () => {
|
||||||
const workerId = 3;
|
|
||||||
let browser;
|
let browser;
|
||||||
let page;
|
let page;
|
||||||
beforeAll(async() => {
|
beforeAll(async() => {
|
||||||
|
|
@ -10,7 +9,7 @@ describe('Worker summary path', () => {
|
||||||
page = browser.page;
|
page = browser.page;
|
||||||
await page.loginAndModule('employee', 'worker');
|
await page.loginAndModule('employee', 'worker');
|
||||||
const httpDataResponse = page.waitForResponse(response => {
|
const httpDataResponse = page.waitForResponse(response => {
|
||||||
return response.status() === 200 && response.url().includes(`Workers/${workerId}`);
|
return response.status() === 200 && response.url().includes(`Workers/summary`);
|
||||||
});
|
});
|
||||||
await page.accessToSearchResult('agencyNick');
|
await page.accessToSearchResult('agencyNick');
|
||||||
await httpDataResponse;
|
await httpDataResponse;
|
||||||
|
|
|
||||||
|
|
@ -92,5 +92,87 @@
|
||||||
"model": "WorkerTeamCollegues",
|
"model": "WorkerTeamCollegues",
|
||||||
"foreignKey": "workerFk"
|
"foreignKey": "workerFk"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"scopes":{
|
||||||
|
"summary": {
|
||||||
|
"include": [
|
||||||
|
{
|
||||||
|
"relation": "user",
|
||||||
|
"scope": {
|
||||||
|
"fields": ["email", "name", "nickname", "roleFk"],
|
||||||
|
"include": [
|
||||||
|
{
|
||||||
|
"relation": "role",
|
||||||
|
"scope": {
|
||||||
|
"fields": ["name"]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"relation": "emailUser",
|
||||||
|
"scope": {
|
||||||
|
"fields": ["email"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
"relation": "department",
|
||||||
|
"scope": {
|
||||||
|
"include": {
|
||||||
|
"relation": "department"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
"relation": "boss"
|
||||||
|
}, {
|
||||||
|
"relation": "client",
|
||||||
|
"scope": {
|
||||||
|
"fields": [
|
||||||
|
"id",
|
||||||
|
"name",
|
||||||
|
"fi",
|
||||||
|
"socialName",
|
||||||
|
"contact",
|
||||||
|
"street",
|
||||||
|
"city",
|
||||||
|
"postcode",
|
||||||
|
"email",
|
||||||
|
"mobile",
|
||||||
|
"isActive",
|
||||||
|
"credit",
|
||||||
|
"creditInsurance",
|
||||||
|
"iban",
|
||||||
|
"dueDay",
|
||||||
|
"isEqualizated",
|
||||||
|
"isFreezed",
|
||||||
|
"hasToInvoiceByAddress",
|
||||||
|
"hasToInvoice",
|
||||||
|
"isToBeMailed",
|
||||||
|
"hasSepaVnl",
|
||||||
|
"hasLcr",
|
||||||
|
"hasCoreVnl",
|
||||||
|
"hasCoreVnh",
|
||||||
|
"hasIncoterms",
|
||||||
|
"isTaxDataChecked",
|
||||||
|
"eypbc",
|
||||||
|
"quality",
|
||||||
|
"isVies",
|
||||||
|
"isRelevant",
|
||||||
|
"accountingAccount",
|
||||||
|
"created",
|
||||||
|
"sageTaxTypeFk",
|
||||||
|
"sageTransactionTypeFk",
|
||||||
|
"businessTypeFk",
|
||||||
|
"salesPersonFk",
|
||||||
|
"hasElectronicInvoice",
|
||||||
|
"rating",
|
||||||
|
"recommendedCredit"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
"relation": "sip"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,37 +4,13 @@ import ModuleCard from 'salix/components/module-card';
|
||||||
class Controller extends ModuleCard {
|
class Controller extends ModuleCard {
|
||||||
reload() {
|
reload() {
|
||||||
const filter = {
|
const filter = {
|
||||||
include: [
|
where: {
|
||||||
{
|
id: this.$params.id}
|
||||||
relation: 'user',
|
|
||||||
scope: {
|
|
||||||
fields: ['name', 'emailVerified'],
|
|
||||||
include: {
|
|
||||||
relation: 'emailUser',
|
|
||||||
scope: {
|
|
||||||
fields: ['email']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
relation: 'sip',
|
|
||||||
scope: {
|
|
||||||
fields: ['extension', 'secret']
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
relation: 'department',
|
|
||||||
scope: {
|
|
||||||
include: {
|
|
||||||
relation: 'department'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
};
|
};
|
||||||
|
|
||||||
return Promise.all([
|
return Promise.all([
|
||||||
this.$http.get(`Workers/${this.$params.id}`, {filter})
|
this.$http.get(`Workers/summary`, {filter})
|
||||||
.then(res => this.worker = res.data),
|
.then(res => this.worker = res.data[0]),
|
||||||
this.$http.get(`Workers/${this.$params.id}/activeContract`)
|
this.$http.get(`Workers/${this.$params.id}/activeContract`)
|
||||||
.then(res => this.hasWorkCenter = res.data?.workCenterFk)
|
.then(res => this.hasWorkCenter = res.data?.workCenterFk)
|
||||||
]);
|
]);
|
||||||
|
|
|
||||||
|
|
@ -37,41 +37,11 @@ class Controller extends Descriptor {
|
||||||
|
|
||||||
loadData() {
|
loadData() {
|
||||||
const filter = {
|
const filter = {
|
||||||
include: [
|
where: {id: this.id},
|
||||||
{
|
|
||||||
relation: 'user',
|
|
||||||
scope: {
|
|
||||||
fields: ['name', 'emailVerified'],
|
|
||||||
include: {
|
|
||||||
relation: 'emailUser',
|
|
||||||
scope: {
|
|
||||||
fields: ['email']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
relation: 'client',
|
|
||||||
scope: {
|
|
||||||
fields: ['fi']
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
relation: 'sip',
|
|
||||||
scope: {
|
|
||||||
fields: ['extension']
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
relation: 'department',
|
|
||||||
scope: {
|
|
||||||
include: {
|
|
||||||
relation: 'department'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
};
|
};
|
||||||
|
|
||||||
return this.getData(`Workers/${this.id}`, {filter})
|
return this.getData(`Workers/summary`, {filter})
|
||||||
.then(res => this.entity = res.data);
|
.then(res => this.entity = res.data[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
getPassRequirements() {
|
getPassRequirements() {
|
||||||
|
|
|
||||||
|
|
@ -14,14 +14,14 @@ describe('vnWorkerDescriptor', () => {
|
||||||
describe('loadData()', () => {
|
describe('loadData()', () => {
|
||||||
it(`should perform a get query to store the worker data into the controller`, () => {
|
it(`should perform a get query to store the worker data into the controller`, () => {
|
||||||
const id = 1;
|
const id = 1;
|
||||||
const response = 'foo';
|
const response = ['foo'];
|
||||||
|
|
||||||
$httpBackend.whenGET('UserConfigs/getUserConfig').respond({});
|
$httpBackend.whenGET('UserConfigs/getUserConfig').respond({});
|
||||||
$httpBackend.expectRoute('GET', `Workers/${id}`).respond(response);
|
$httpBackend.expectRoute('GET', `Workers/summary`).respond(response);
|
||||||
controller.id = id;
|
controller.id = id;
|
||||||
$httpBackend.flush();
|
$httpBackend.flush();
|
||||||
|
|
||||||
expect(controller.worker).toEqual(response);
|
expect([controller.worker]).toEqual(response);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,53 +10,14 @@ class Controller extends Summary {
|
||||||
this.$.worker = null;
|
this.$.worker = null;
|
||||||
if (!value) return;
|
if (!value) return;
|
||||||
|
|
||||||
const query = `Workers/${value.id}`;
|
|
||||||
const filter = {
|
const filter = {
|
||||||
include: [
|
where: {
|
||||||
{
|
id: value.id
|
||||||
relation: 'user',
|
}
|
||||||
scope: {
|
|
||||||
fields: ['name', 'roleFk'],
|
|
||||||
include: [{
|
|
||||||
relation: 'role',
|
|
||||||
scope: {
|
|
||||||
fields: ['name']
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
relation: 'emailUser',
|
|
||||||
scope: {
|
|
||||||
fields: ['email']
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
relation: 'client',
|
|
||||||
scope: {fields: ['fi', 'phone']}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
relation: 'boss',
|
|
||||||
scope: {fields: ['id', 'name']}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
relation: 'sip',
|
|
||||||
scope: {fields: ['extension']}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
relation: 'department',
|
|
||||||
scope: {
|
|
||||||
include: {
|
|
||||||
relation: 'department',
|
|
||||||
scope: {fields: ['id', 'code', 'name']}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.$http.get(query, {params: {filter}}).then(res => {
|
this.$http.get(`Workers/summary`, {filter}).then(res => {
|
||||||
this.$.worker = res.data;
|
this.$.worker = res.data[0];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue