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

Merge branch 'dev' into 5090-renameGoLabel
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Carlos Satorres 2023-03-02 10:44:24 +00:00
parent 1ef78ce8be d836874b7c
commit ea9a15ece1
73 changed files with 1146 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CHANGELOG.md
View File

@ -5,17 +5,28 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [2308.01] - 2023-03-09
## [2310.01] - 2023-03-23
### Added
- (Client -> Descriptor) Nuevo icono $ con barrotes para los clientes con impago
-
### Changed
-
-
### Fixed
-
## [2308.01] - 2023-03-09
### Added
- (Proveedores -> Datos fiscales) Añadido checkbox 'Vies'
- (Client -> Descriptor) Nuevo icono $ con barrotes para los clientes con impago
- (Trabajador -> Datos Básicos) Añadido nuevo campo Taquilla
- (Trabajador -> PDA) Nueva sección
### Changed
- (Ticket -> Borrar ticket) Restringido el borrado de tickets con abono
## [2306.01] - 2023-02-23
### Added

5
back/tests.js
View File

@ -30,7 +30,10 @@ async function test() {
const bootOptions = {dataSources};
const app = require('vn-loopback/server/server');
app.boot(bootOptions);
await new Promise((resolve, reject) => {
app.boot(bootOptions,
err => err ? reject(err) : resolve());
});
const Jasmine = require('jasmine');
const jasmine = new Jasmine();

16
db/changes/230801/00-supplierIsVies.sql Normal file
View File

@ -0,0 +1,16 @@
ALTER TABLE `vn`.`supplier` ADD `isVies` tinyint(4) DEFAULT 0 NOT NULL;
UPDATE `vn`.`supplier` s
JOIN vn.country c ON c.id = s.countryFk
SET s.nif = MID(s.nif, 3, LENGTH(s.nif)-1), s.isVies = TRUE
WHERE s.nif <> TRIM(IF(c.code = LEFT(s.nif, 2), MID(s.nif, 3, LENGTH(s.nif)-1), s.nif));
INSERT IGNORE INTO `vn`.`chat`
(senderFk, recipient, checkUserStatus, message, status, attempts)
VALUES(19263, '#informatica-cau', 0, '
```
UPDATE `vn`.`supplier` s
JOIN vn.country c ON c.id = s.countryFk
SET s.nif = MID(s.nif, 3, LENGTH(s.nif)-1), s.isVies = TRUE
WHERE s.nif <> TRIM(IF(c.code = LEFT(s.nif, 2), MID(s.nif, 3, LENGTH(s.nif)-1), s.nif));
```', 0, 0);

15
db/changes/230801/00-workerLocker.sql Normal file
View File

@ -0,0 +1,15 @@
ALTER TABLE `vn`.`worker` ADD locker INT UNSIGNED NULL UNIQUE;
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
VALUES
('DeviceProduction', '*', '*', 'ALLOW', 'ROLE', 'hr'),
('DeviceProductionModels', '*', '*', 'ALLOW', 'ROLE', 'hr'),
('DeviceProductionState', '*', '*', 'ALLOW', 'ROLE', 'hr'),
('DeviceProductionUser', '*', '*', 'ALLOW', 'ROLE', 'hr'),
('DeviceProduction', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
('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');

127
db/changes/230801/01-sage_supplierAdd.sql Normal file
View File

@ -0,0 +1,127 @@
DROP PROCEDURE IF EXISTS `sage`.`clientSupplier_add`;
DELIMITER $$
$$
CREATE DEFINER=`root`@`localhost` PROCEDURE `sage`.`clientSupplier_add`(vCompanyFk INT)
BEGIN
/**
* Prepara los datos de clientes y proveedores para exportarlos a Sage
* @vCompanyFk Empresa dela que se quiere trasladar datos
*/
DECLARE vCountryCeutaMelillaFk INT;
DECLARE vCountryCanariasCode, vCountryCeutaMelillaCode VARCHAR(2);
SELECT SiglaNacion INTO vCountryCanariasCode
FROM Naciones
WHERE Nacion ='ISLAS CANARIAS';
SELECT CodigoNacion, SiglaNacion INTO vCountryCeutaMelillaFk, vCountryCeutaMelillaCode
FROM Naciones
WHERE Nacion ='CEUTA Y MELILLA';
TRUNCATE TABLE clientesProveedores;
INSERT INTO clientesProveedores
(CodigoEmpresa,
ClienteOProveedor,
CodigoClienteProveedor,
RazonSocial,
Nombre,
Domicilio,
CodigoCuenta,
CifDni,
CifEuropeo,
CodigoPostal,
Municipio,
CodigoProvincia,
Provincia,
CodigoNacion,
SiglaNacion,
PersonaFisicaJuridica,
TipoDocumentoPersona,
CodigoIva,
Nacion,
Telefono,
Telefono2,
CodigoTransaccion,
CodigoRetencion,
Email1,
iban)
SELECT
company_getCode(vCompanyFk),
'C',
c.id,
c.socialName,
c.socialName,
IFNULL(c.street, ''),
c.accountingAccount,
TRIM(IF(c.isVies, CONCAT(cu.code,c.fi), c.fi)),
IF(n.NacionCEE,TRIM(IF(cu.code = LEFT(c.fi, 2), c.fi, CONCAT(cu.code,c.fi))) , ''),
IFNULL(c.postcode, ''),
IFNULL(c.city, ''),
IFNULL(pr.CodigoProvincia, ''),
IFNULL(p.name, ''),
IF(n.SiglaNacion = vCountryCanariasCode COLLATE utf8mb3_unicode_ci, IF(@isCeutaMelilla := IF(pr.Provincia IN ('CEUTA', 'MELILLA'), TRUE, FALSE), vCountryCeutaMelillaFk, IF (@isCanarias, vCountryCanariasCode, n.CodigoNacion)), n.CodigoNacion),
IF(n.SiglaNacion = vCountryCanariasCode COLLATE utf8mb3_unicode_ci, IF(@isCeutaMelilla, vCountryCeutaMelillaCode, IF (@isCanarias, vCountryCanariasCode, n.SiglaNacion)), n.SiglaNacion),
IF((c.fi REGEXP '^([[:blank:]]|[[:digit:]])'), 'J','F'),
IF(cu.code IN('ES','EX'),
1,
IF((cu.isUeeMember AND c.isVies), 2, 4)),
IFNULL(c.taxTypeSageFk,0),
IF(n.SiglaNacion = vCountryCanariasCode COLLATE utf8mb3_unicode_ci,
IF(@isCeutaMelilla, 'CEUTA Y MELILLA', IF (@isCanarias, 'ISLAS CANARIAS', n.Nacion)),
n.Nacion),
IFNULL(c.phone, ''),
IFNULL(c.mobile, ''),
IFNULL(c.transactionTypeSageFk, 0),
'0',
IFNULL(SUBSTR(c.email, 1, LOCATE(',', CONCAT(c.email, ','))-1), ''),
IFNULL(c.iban, '')
FROM vn.`client` c
JOIN clientLastTwoMonths clm ON clm.clientFk = c.id
LEFT JOIN vn.country cu ON cu.id = c.countryFk
LEFT JOIN Naciones n ON n.countryFk = cu.id
LEFT JOIN vn.province p ON p.id = c.provinceFk
LEFT JOIN Provincias pr ON pr.provinceFk = p.id
WHERE c.isRelevant
AND clm.companyFk = vCompanyFk
UNION ALL
SELECT company_getCode(vCompanyFk),
'P',
s.id,
s.name,
s.name,
IFNULL(s.street, ''),
s.account,
TRIM(IF(s.isVies, CONCAT(co.code,s.nif), s.nif)),
IF(n.NacionCEE, TRIM(CONCAT(co.code, IF(co.code = LEFT(s.nif, 2), MID(s.nif, 3, LENGTH(s.nif) - 1), s.nif))), ''),
IFNULL(s.postCode,''),
IFNULL(s.city, ''),
IFNULL(pr.CodigoProvincia, ''),
IFNULL(p.name, ''),
n.CodigoNacion,
n.SiglaNacion COLLATE utf8mb3_unicode_ci,
IF((s.nif REGEXP '^([[:blank:]]|[[:digit:]])'),'J','F'),
IF(co.country IN ('España', 'España exento'), 1,IF(co.isUeeMember = 1, 2, 4)),
IFNULL(s.taxTypeSageFk, 0),
n.Nacion,
IFNULL(sc.phone, ''),
IFNULL(sc.mobile, ''),
IFNULL(s.transactionTypeSageFk, 0),
IFNULL(s.withholdingSageFk, '0'),
IFNULL(SUBSTR(sc.email, 1, (COALESCE(NULLIF(LOCATE(',', sc.email), 0), 99) - 1)), ''),
IFNULL(iban, '')
FROM vn.supplier s
JOIN supplierLastThreeMonths pl ON pl.supplierFk = s.id
LEFT JOIN vn.country co ON co.id = s.countryFk
LEFT JOIN Naciones n ON n.countryFk = co.id
LEFT JOIN vn.province p ON p.id = s.provinceFk
LEFT JOIN Provincias pr ON pr.provinceFk = p.id
LEFT JOIN vn.supplierContact sc ON sc.supplierFk = s.id
LEFT JOIN vn.supplierAccount sa ON sa.supplierFk = s.id
WHERE pl.companyFk = vCompanyFk AND
s.isActive AND
s.nif <> ''
GROUP BY pl.supplierFk, pl.companyFk;
END$$
DELIMITER ;

0
db/changes/230801/.gitkeep → db/changes/231001/.gitkeep
View File

31
db/dump/fixtures.sql
View File

@ -2787,3 +2787,34 @@ INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`)
VALUES
(1, NULL, 1);
INSERT INTO `vn`.`ticketRefund`(`refundTicketFk`, `originalTicketFk`)
VALUES
(1, 12);
INSERT INTO `vn`.`deviceProductionModels` (`code`)
VALUES
('BLACKVIEW'),
('DODGEE'),
('ZEBRA');
INSERT INTO `vn`.`deviceProductionState` (`code`, `description`)
VALUES
('active', 'activo'),
('idle', 'inactivo'),
('lost', 'perdida'),
('repair', 'reparación'),
('retired', 'retirada');
INSERT INTO `vn`.`deviceProduction` (`imei`, `modelFk`, `macWifi`, `serialNumber`, `android_id`, `purchased`, `stateFk`, `isInScalefusion`, `description`)
VALUES
('ime1', 'BLACKVIEW', 'macWifi1', 'serialNumber1', 'android_id1', util.VN_NOW(), 'active', 0, NULL),
('ime2', 'DODGEE', 'macWifi2', 'serialNumber2', 'android_id2', util.VN_NOW(), 'idle', 0, NULL),
('ime3', 'ZEBRA', 'macWifi3', 'serialNumber3', 'android_id3', util.VN_NOW(), 'active', 0, NULL),
('ime4', 'BLACKVIEW', 'macWifi4', 'serialNumber4', 'android_id4', util.VN_NOW(), 'idle', 0, NULL);
INSERT INTO `vn`.`deviceProductionUser` (`deviceProductionFk`, `userFk`, `created`)
VALUES
(1, 1, util.VN_NOW()),
(3, 3, util.VN_NOW());

10
db/tests/vn/ticketCalculateClon.spec.js
View File

@ -22,7 +22,7 @@ describe('ticket ticketCalculateClon()', () => {
originalTicketId: 11
};
stmt = new ParameterizedSQL('CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [
stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [
params.clientFk,
params.shipped,
params.warehouseFk,
@ -31,7 +31,8 @@ describe('ticket ticketCalculateClon()', () => {
params.agencyType,
params.routeFk,
params.landed,
params.userId
params.userId,
true
]);
stmts.push(stmt);
@ -71,7 +72,7 @@ describe('ticket ticketCalculateClon()', () => {
originalTicketId: 11
};
stmt = new ParameterizedSQL('CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [
stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [
params.clientFk,
params.shipped,
params.warehouseFk,
@ -80,7 +81,8 @@ describe('ticket ticketCalculateClon()', () => {
params.agencyType,
params.routeFk,
params.landed,
params.userId
params.userId,
true
]);
stmts.push(stmt);

22
db/tests/vn/ticketCreateWithUser.spec.js
View File

@ -1,7 +1,7 @@
const app = require('vn-loopback/server/server');
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
describe('ticket ticketCreateWithUser()', () => {
describe('ticket ticket_add()', () => {
const today = Date.vnNew();
it('should confirm the procedure creates the expected ticket', async() => {
let stmts = [];
@ -21,7 +21,7 @@ describe('ticket ticketCreateWithUser()', () => {
userId: 18
};
stmt = new ParameterizedSQL(`CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
params.clientFk,
params.shipped,
params.warehouseFk,
@ -30,7 +30,8 @@ describe('ticket ticketCreateWithUser()', () => {
params.agencyModeFk,
params.routeFk,
params.landed,
params.userId
params.userId,
true
]);
stmts.push(stmt);
@ -70,7 +71,7 @@ describe('ticket ticketCreateWithUser()', () => {
userId: 18
};
stmt = new ParameterizedSQL('CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)', [
stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)', [
params.clientFk,
params.shipped,
params.warehouseFk,
@ -79,7 +80,8 @@ describe('ticket ticketCreateWithUser()', () => {
params.agencyModeFk,
params.routeFk,
params.landed,
params.userId
params.userId,
true
]);
stmts.push(stmt);
@ -120,7 +122,7 @@ describe('ticket ticketCreateWithUser()', () => {
userId: 18
};
stmt = new ParameterizedSQL(`CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
params.clientFk,
params.shipped,
params.warehouseFk,
@ -129,7 +131,8 @@ describe('ticket ticketCreateWithUser()', () => {
params.agencyModeFk,
params.routeFk,
params.landed,
params.userId
params.userId,
true
]);
stmts.push(stmt);
@ -172,7 +175,7 @@ describe('ticket ticketCreateWithUser()', () => {
]);
stmts.push(stmt);
stmt = new ParameterizedSQL(`CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
params.clientFk,
params.shipped,
params.warehouseFk,
@ -181,7 +184,8 @@ describe('ticket ticketCreateWithUser()', () => {
params.agencyModeFk,
params.routeFk,
params.landed,
params.userId
params.userId,
true
]);
stmts.push(stmt);
stmts.push(`select @newTicketId`);

9
e2e/helpers/selectors.js
View File

@ -22,6 +22,7 @@ export default {
userConfigSecondAutocomplete: '#localBank',
userConfigThirdAutocomplete: '#localCompany',
acceptButton: '.vn-confirm.shown button[response=accept]',
cancelButton: '.vn-confirm.shown input[response=cancel]',
searchButton: 'vn-searchbar vn-icon[icon="search"]'
},
moduleIndex: {
@ -973,6 +974,7 @@ export default {
id: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(3) > section > span',
email: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(4) > section > span',
department: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(5) > section > span',
locker: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(10) > section > span',
userId: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(2) > section > span',
userName: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(3) > section > span',
role: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(4) > section > span',
@ -983,6 +985,7 @@ export default {
name: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.firstName"]',
surname: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.lastName"]',
phone: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.phone"]',
locker: 'vn-worker-basic-data vn-input-number[ng-model="$ctrl.worker.locker"]',
saveButton: 'vn-worker-basic-data button[type=submit]'
},
workerPbx: {
@ -1040,6 +1043,12 @@ export default {
switft: 'vn-worker-create vn-autocomplete[ng-model="$ctrl.worker.bankEntityFk"]',
createButton: 'vn-worker-create vn-submit[label="Create"]',
},
workerPda: {
currentPDA: 'vn-worker-pda vn-textfield[ng-model="$ctrl.currentPDA.description"]',
newPDA: 'vn-worker-pda vn-autocomplete[ng-model="$ctrl.newPDA"]',
delete: 'vn-worker-pda vn-icon-button[icon=delete]',
submit: 'vn-worker-pda vn-submit[label="Assign"]',
},
invoiceOutIndex: {
topbarSearch: 'vn-searchbar',
searchResult: 'vn-invoice-out-index vn-card > vn-table > div > vn-tbody > a.vn-tr',

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

@ -29,5 +29,6 @@ describe('Worker summary path', () => {
expect(await page.getProperty(selectors.workerSummary.userName, 'innerText')).toEqual('agency');
expect(await page.getProperty(selectors.workerSummary.role, 'innerText')).toEqual('agency');
expect(await page.getProperty(selectors.workerSummary.extension, 'innerText')).toEqual('1101');
expect(await page.getProperty(selectors.workerSummary.locker, 'innerText')).toEqual('-');
});
});

2
e2e/paths/03-worker/02_basicData.spec.js
View File

@ -25,6 +25,7 @@ describe('Worker basic data path', () => {
await page.overwrite(selectors.workerBasicData.name, 'David C.');
await page.overwrite(selectors.workerBasicData.surname, 'H.');
await page.overwrite(selectors.workerBasicData.phone, '444332211');
await page.overwrite(selectors.workerBasicData.locker, '1');
await page.click(selectors.workerBasicData.saveButton);
const message = await page.waitForSnackbar();
@ -36,5 +37,6 @@ describe('Worker basic data path', () => {
expect(await page.waitToGetProperty(selectors.workerBasicData.name, 'value')).toEqual('David C.');
expect(await page.waitToGetProperty(selectors.workerBasicData.surname, 'value')).toEqual('H.');
expect(await page.waitToGetProperty(selectors.workerBasicData.phone, 'value')).toEqual('444332211');
expect(await page.waitToGetProperty(selectors.workerBasicData.locker, 'value')).toEqual('1');
});
});

41
e2e/paths/03-worker/07_pda.spec.js Normal file
View File

@ -0,0 +1,41 @@
import selectors from '../../helpers/selectors.js';
import getBrowser from '../../helpers/puppeteer';
describe('Worker pda path', () => {
let browser;
let page;
beforeAll(async() => {
browser = await getBrowser();
page = browser.page;
await page.loginAndModule('hr', 'worker');
await page.accessToSearchResult('employeeNick');
await page.accessToSection('worker.card.pda');
});
afterAll(async() => {
await browser.close();
});
it('should check if worker has already a PDA allocated', async() => {
expect(await page.waitToGetProperty(selectors.workerPda.currentPDA, 'value')).toContain('serialNumber1');
});
it('should deallocate the PDA', async() => {
await page.waitToClick(selectors.workerPda.delete);
let message = await page.waitForSnackbar();
expect(message.text).toContain('PDA deallocated');
});
it('should allocate a new PDA', async() => {
await page.autocompleteSearch(selectors.workerPda.newPDA, 'serialNumber2');
await page.waitToClick(selectors.workerPda.submit);
let message = await page.waitForSnackbar();
expect(message.text).toContain('PDA allocated');
});
it('should check if a new PDA has been allocated', async() => {
expect(await page.waitToGetProperty(selectors.workerPda.currentPDA, 'value')).toContain('serialNumber2');
});
});

12
e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
View File

@ -227,9 +227,21 @@ describe('Ticket Edit sale path', () => {
await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
await page.waitToClick(selectors.ticketSales.moreMenu);
await page.waitToClick(selectors.ticketSales.moreMenuRefund);
await page.waitForSnackbar();
await page.waitForState('ticket.card.sale');
});
it('should show error trying to delete a ticket with a refund', async() => {
await page.accessToSearchResult('16');
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
await page.waitToClick(selectors.globalItems.acceptButton);
const message = await page.waitForSnackbar();
expect(message.text).toContain('Tickets with associated refunds can\'t be deleted');
await page.waitToClick(selectors.globalItems.cancelButton);
});
it('should select the third sale and create a claim of it', async() => {
await page.accessToSearchResult('16');
await page.accessToSection('ticket.card.sale');

4
front/core/components/autocomplete/style.scss
View File

@ -19,6 +19,10 @@
padding-right: 0;
}
}
& > .icons.pre {
min-width: 22px
}
}
&.readonly > .container > .icons.post {
display: none;

27
front/core/components/chip/style.scss
View File

@ -58,10 +58,33 @@ vn-chip {
background-color: $color-font-bg-dark;
color: $color-font-bg;
}
&.pink,
&.pink.clickable:hover,
&.pink.clickable:focus {
background-color: $color-pink;
}
&.dark-notice,
&.dark-notice.clickable:hover,
&.dark-notice.clickable:focus {
background-color: $color-notice;
}
&.yellow,
&.yellow.clickable:hover,
&.yellow.clickable:focus {
background-color: $color-yellow;
}
&.none,
&.none.clickable:hover,
&.none.clickable:focus {
background-color: $color-bg-panel;
border-radius: 50%;
border: 1px solid $color-font-link
}
&.clickable {
@extend %clickable;
opacity: 0.8;
&:hover,
&:focus {
opacity: 1;
@ -118,4 +141,4 @@ vn-avatar {
display: inline-block;
min-width: 28px;
border-radius: 50%;
}
}

2
front/core/components/field/index.html
View File

@ -12,7 +12,7 @@
<span class="required">*</span>
</label>
</div>
<div class="icons pre">
<div class="icons pre" ng-class="{'clearable': $ctrl.clearDisabled != true}">
<vn-icon ng-show="::$ctrl.clearDisabled != true"
icon="clear"
translate-attr="{title: 'Clear'}"

3
front/core/components/field/style.scss
View File

@ -151,6 +151,9 @@
display: none;
}
}
& > .icons.pre.clearable {
min-width: 22px
}
& > .underline {
position: absolute;
bottom: 0;

1
front/salix/locale/es.yml
View File

@ -23,6 +23,7 @@ There is a new version, click here to reload: Hay una nueva versión, pulse aqu
Back: Volver
Save: Guardar
Assign: Asignar
Create: Crear
Send: Enviar
Delete: Eliminar

4
loopback/locale/en.json
View File

@ -147,8 +147,8 @@
"Receipt's bank was not found": "Receipt's bank was not found",
"This receipt was not compensated": "This receipt was not compensated",
"Client's email was not found": "Client's email was not found",
"Tickets with associated refunds": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº {{id}}",
"It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
"It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
"It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
"Valid priorities: 1,2,3": "Valid priorities: 1,2,3"
"It is not possible to modify cloned sales": "It is not possible to modify cloned sales"
}

12
loopback/locale/es.json
View File

@ -259,10 +259,12 @@
"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
"Failed to upload file": "Error al subir archivo",
"The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
"It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
"It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
"It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
"It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
"It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
"It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
"A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
"There is no assigned email for this client": "No hay correo asignado para este cliente"
"There is no assigned email for this client": "No hay correo asignado para este cliente",
"This locker has already been assigned": "Esta taquilla ya ha sido asignada",
"Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº {{id}}",
"Not exist this branch": "La rama no existe"
}

1
modules/item/back/methods/item/new.js
View File

@ -57,6 +57,7 @@ module.exports = Self => {
const itemType = await models.ItemType.findById(params.typeFk, {fields: ['isLaid']}, myOptions);
params.isLaid = itemType.isLaid;
params.isPhotoRequested = true;
const item = await models.Item.create(params, myOptions);

6
modules/item/back/models/item.json
View File

@ -146,6 +146,12 @@
},
"isLaid": {
"type": "boolean"
},
"isPhotoRequested": {
"type": "boolean",
"mysql":{
"columnName": "doPhoto"
}
}
},
"relations": {

6
modules/item/front/basic-data/index.html
View File

@ -182,6 +182,12 @@
ng-model="$ctrl.item.isFragile"
info="Is shown at website, app that this item cannot travel (wreath, palms, ...)">
</vn-check>
<vn-check
vn-one
label="Do photo"
ng-model="$ctrl.item.isPhotoRequested"
info="This item does need a photo">
</vn-check>
</vn-horizontal>
</vn-card>
<vn-button-bar>

4
modules/item/front/basic-data/locale/es.yml
View File

@ -11,4 +11,6 @@ Identifier: Identificador
Fragile: Frágil
Is shown at website, app that this item cannot travel (wreath, palms, ...): Se muestra en la web, app que este artículo no puede viajar (coronas, palmas, ...)
Multiplier: Multiplicador
Generic: Genérico
Generic: Genérico
This item does need a photo: Este artículo necesita una foto
Do photo: Hacer foto

3
modules/item/front/descriptor/index.js
View File

@ -91,6 +91,9 @@ class Controller extends Descriptor {
this.$.photo.setAttribute('src', newSrc);
this.$.photo.setAttribute('zoom-image', newZoomSrc);
if (this.item.isPhotoRequested)
this.$http.patch(`Items/${this.item.id}`, {isPhotoRequested: false});
}
getWarehouseName(warehouseFk) {

15
modules/item/front/descriptor/index.spec.js
View File

@ -8,7 +8,8 @@ describe('vnItemDescriptor', () => {
id: 1,
itemType: {
warehouseFk: 1
}
},
isPhotoRequested: true
};
const stock = {
visible: 1,
@ -43,4 +44,16 @@ describe('vnItemDescriptor', () => {
expect(controller.item).toEqual(item);
});
});
describe('onUploadResponse()', () => {
it(`should change isPhotoRequested when a new photo is uploaded`, () => {
controller.item = item;
controller.$rootScope = {imagePath: () => {}};
controller.$.photo = {setAttribute: () => {}};
$httpBackend.expectPATCH(`Items/${item.id}`).respond(200);
controller.onUploadResponse();
$httpBackend.flush();
});
});
});

3
modules/item/front/diary/index.js
View File

@ -70,7 +70,8 @@ class Controller extends Section {
}
$onDestroy() {
this.card.reload();
if (this.$state.getCurrentPath()[2].state.name === 'item')
this.card.reload();
}
}

9
modules/item/front/summary/index.html
View File

@ -75,6 +75,15 @@
{{$ctrl.summary.item.itemType.worker.user.name}}
</span>
</vn-label-value>
<vn-horizontal>
<vn-check
label="Do photo"
disabled="true"
vn-one
ng-model="$ctrl.item.isPhotoRequested"
info="This item does need a photo">
</vn-check>
</vn-horizontal>
</vn-one>
<vn-one name="otherData">
<h4 ng-show="$ctrl.isBuyer">

6
modules/item/front/waste/index/index.html
View File

@ -33,16 +33,16 @@
</vn-icon-button>
</vn-td>
</vn-tr>
<vn-tr ng-repeat="waste in detail.lines" class="clickable vn-tr"
<a ng-repeat="waste in detail.lines" class="clickable vn-tr"
ui-sref="item.waste.detail({buyer: waste.buyer, family: waste.family})"
ng-class="{'hidden': !$ctrl.wasteConfig[detail.buyer].hidden}">
ng-show="$ctrl.wasteConfig[detail.buyer].hidden">
<vn-td></vn-td>
<vn-td>{{::waste.family}}</vn-td>
<vn-td number>{{::(waste.percentage / 100) | percentage: 2}}</vn-td>
<vn-td number>{{::waste.dwindle | currency: 'EUR'}}</vn-td>
<vn-td number>{{::waste.total | currency: 'EUR'}}</vn-td>
<vn-td shrink></vn-td>
</vn-tr>
</a>
</vn-tbody>
</vn-table>
</vn-card>

24
modules/mdb/back/methods/mdbVersion/upload.js
View File

@ -47,7 +47,16 @@ module.exports = Self => {
verb: 'POST'
}
});
Self.upload = async(ctx, options) => {
Self.upload = async(
ctx,
appName,
toVersion,
branch,
fromVersion,
description,
unlock,
options
) => {
const models = Self.app.models;
const myOptions = {};
const $t = ctx.req.__; // $translate
@ -55,12 +64,6 @@ module.exports = Self => {
const AccessContainer = models.AccessContainer;
const fileOptions = {};
let tx;
const appName = ctx.args.appName;
const toVersion = ctx.args.toVersion;
const branch = ctx.args.branch;
const fromVersion = ctx.args.fromVersion;
let description = ctx.args.description;
const unlock = ctx.args.unlock;
if (typeof options == 'object')
Object.assign(myOptions, options);
@ -153,11 +156,14 @@ module.exports = Self => {
formatDesc += `*${appName.toUpperCase()}* v.${toVersion} `;
const oldVersion = await models.MdbVersionTree.findOne({
where: {version: fromVersion},
where: {
version: fromVersion,
app: appName
},
fields: ['branchFk']
}, myOptions);
if (branch == oldVersion.branchFk)
if (!oldVersion || branch == oldVersion.branchFk)
formatDesc += `[*${branch}*]: `;
else
formatDesc += `[*${oldVersion.branchFk}* » *${branch}*]: `;

9
modules/route/front/summary/index.html
View File

@ -93,7 +93,14 @@
<vn-tr ng-repeat="ticket in $ctrl.summary.tickets">
<vn-td shrink>{{ticket.priority | dashIfEmpty}}</vn-td>
<vn-td expand title="{{ticket.address.street}}">{{ticket.street}}</vn-td>
<vn-td expand>{{ticket.city}}</vn-td>
<vn-td
expand
ng-click="$ctrl.goToBuscaman(ticket)"
class="link"
vn-tooltip="Open buscaman"
tooltip-position="up">
{{::ticket.city}}
</vn-td>
<vn-td shrink>{{ticket.postalCode}}</vn-td>
<vn-td>
<span

15
modules/route/front/summary/index.js
View File

@ -31,6 +31,21 @@ class Controller extends Summary {
this.sumPackages();
});
}
goToBuscaman(ticket) {
if (!this.route.vehicleFk)
throw new UserError(`The route doesn't have a vehicle`);
let query = `Routes/${this.route.vehicleFk}/getDeliveryPoint`;
this.$http.get(query).then(response => {
if (!response.data)
throw new UserError(`The route's vehicle doesn't have a delivery point`);
const address = response.data + '+to:' + ticket.postalCode + ' ' + ticket.city + ' ' + ticket.street;
const url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=';
window.open(url + encodeURI(address), '_blank');
});
}
}
ngModule.vnComponent('vnRouteSummary', {

24
modules/route/front/summary/index.spec.js
View File

@ -37,5 +37,29 @@ describe('Route', () => {
expect(controller.packagesTotal).toEqual(4);
});
});
describe('goToBuscaman()', () => {
it('should open buscaman with the given arguments', () => {
jest.spyOn(window, 'open').mockReturnThis();
const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460%20Av%20Espioca%20100+to:n19%20London%20my%20street';
controller.route = {vehicleFk: 1};
const url = `Routes/${controller.route.vehicleFk}/getDeliveryPoint`;
$httpBackend.when('GET', `Routes/1/summary`).respond();
$httpBackend.expectGET(url).respond('46460 Av Espioca 100');
const ticket = {
id: 1,
checked: true,
street: 'my street',
postalCode: 'n19',
city: 'London'
};
controller.goToBuscaman(ticket);
$httpBackend.flush();
expect(window.open).toHaveBeenCalledWith(expectedUrl, '_blank');
});
});
});
});

9
modules/route/front/tickets/index.html
View File

@ -93,7 +93,14 @@
</vn-input-number>
</vn-td>
<vn-td expand title="{{::ticket.street}}">{{::ticket.street}}</vn-td>
<vn-td expand>{{::ticket.city}}</vn-td>
<vn-td
expand
ng-click="$ctrl.goToBuscaman(ticket)"
class="link"
vn-tooltip="Open buscaman"
tooltip-position="up">
{{::ticket.city}}
</vn-td>
<vn-td shrink>{{::ticket.postalCode}}</vn-td>
<vn-td expand>
<span

23
modules/route/front/tickets/index.js
View File

@ -74,29 +74,24 @@ class Controller extends Section {
return selectedItems;
}
goToBuscaman() {
goToBuscaman(ticket) {
if (!this.route.vehicleFk)
throw new UserError(`The route doesn't have a vehicle`);
let query = `Routes/${this.route.vehicleFk}/getDeliveryPoint`;
this.$http.get(query).then(response => {
if (!response.data)
this.$http.get(`Routes/${this.route.vehicleFk}/getDeliveryPoint`).then(res => {
if (!res.data)
throw new UserError(`The route's vehicle doesn't have a delivery point`);
return response.data;
}).then(address => {
let addresses;
if (address) addresses = address;
let lines = this.getSelectedItems(this.tickets);
let url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=';
let addresses = res.data;
const lines = ticket ? [ticket] : this.getSelectedItems(this.tickets);
lines.forEach((line, index) => {
const previusLine = lines[index - 1] ? lines[index - 1].street : null;
if (previusLine != line.street)
const previousLine = lines[index - 1] ? lines[index - 1].street : null;
if (previousLine != line.street)
addresses = addresses + '+to:' + line.postalCode + ' ' + line.city + ' ' + line.street;
});
window.open(url + addresses, '_blank');
const url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=';
window.open(url + encodeURI(addresses), '_blank');
});
}

2
modules/route/front/tickets/index.spec.js
View File

@ -136,7 +136,7 @@ describe('Route', () => {
describe('goToBuscaman()', () => {
it('should open buscaman with the given arguments', () => {
jest.spyOn(window, 'open').mockReturnThis();
const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460 Av Espioca 100+to:n19 London my street';
const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460%20Av%20Espioca%20100+to:n19%20London%20my%20street';
controller.route = {vehicleFk: 1};
const url = `Routes/${controller.route.vehicleFk}/getDeliveryPoint`;
$httpBackend.expectGET(url).respond('46460 Av Espioca 100');

8
modules/supplier/back/methods/supplier/updateFiscalData.js
View File

@ -64,6 +64,14 @@ module.exports = Self => {
{
arg: 'healthRegister',
type: 'string'
},
{
arg: 'isVies',
type: 'boolean'
},
{
arg: 'isTrucker',
type: 'boolean'
}],
returns: {
arg: 'res',

5
modules/supplier/back/models/supplier.json
View File

@ -110,6 +110,9 @@
},
"healthRegister": {
"type": "string"
},
"isVies": {
"type": "boolean"
}
},
"relations": {
@ -175,4 +178,4 @@
"foreignKey": "supplierActivityFk"
}
}
}
}

23
modules/supplier/front/fiscal-data/index.html
View File

@ -129,7 +129,7 @@
show-field="code"
rule>
<tpl-item>
{{code}} - {{town.name}} ({{town.province.name}},
{{code}} - {{town.name}} ({{town.province.name}},
{{town.province.country.country}})
</tpl-item>
<append>
@ -144,7 +144,7 @@
</vn-datalist>
</vn-horizontal>
<vn-horizontal>
<vn-datalist vn-id="town" vn-one
<vn-datalist vn-id="town" vn-one
label="City"
ng-model="$ctrl.supplier.city"
selection="$ctrl.town"
@ -172,7 +172,7 @@
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal>
<vn-autocomplete vn-id="country" vn-one
<vn-autocomplete vn-id="country" vn-two
ng-model="$ctrl.supplier.countryFk"
data="countries"
show-field="country"
@ -180,10 +180,17 @@
label="Country"
rule>
</vn-autocomplete>
<vn-check
label="Trucker"
ng-model="$ctrl.supplier.isTrucker">
</vn-check>
<vn-two class="vn-pl-xs">
<vn-check
label="Trucker"
ng-model="$ctrl.supplier.isTrucker">
</vn-check>
<vn-check
class="vn-ml-lg"
label="Vies"
ng-model="$ctrl.supplier.isVies">
</vn-check>
</vn-two>
</vn-horizontal>
</vn-card>
<vn-button-bar>
@ -203,4 +210,4 @@
<vn-geo-postcode
vn-id="postcode"
on-response="$ctrl.onResponse($response)">
</vn-geo-postcode>
</vn-geo-postcode>

3
modules/ticket/back/methods/ticket/new.js
View File

@ -111,7 +111,7 @@ module.exports = Self => {
args.landed = landedResult && landedResult.landed;
}
query = `CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @result);
query = `CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @result);
SELECT @result newTicketId;`;
const result = await Self.rawSql(query, [
args.clientId,
@ -122,6 +122,7 @@ module.exports = Self => {
args.agencyModeId || null,
args.routeId || null,
args.landed,
true,
myUserId
], myOptions);

12
modules/ticket/back/methods/ticket/setDeleted.js
View File

@ -42,6 +42,14 @@ module.exports = Self => {
if (!isEditable)
throw new UserError(`The sales of this ticket can't be modified`);
// Check if ticket has refunds
const ticketRefunds = await models.TicketRefund.find({
where: {originalTicketFk: id},
fields: ['id']}
, myOptions);
if (ticketRefunds.length > 0)
throw new UserError($t('Tickets with associated refunds', {id: ticketRefunds[0].id}));
// Check if has sales with shelving
const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant', myOptions);
const sales = await models.Sale.find({
@ -134,12 +142,12 @@ module.exports = Self => {
await models.TicketCollection.destroyById(ticketCollection.id, myOptions);
await Self.rawSql(`
DELETE sc
DELETE sc
FROM vn.saleGroup sg
JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sg.id
JOIN vn.sectorCollection sc ON sc.id = scsg.sectorCollectionFk
JOIN vn.saleGroupDetail sgd ON sgd.saleGroupFk = sg.id
JOIN vn.sale s ON s.id = sgd.saleFk
JOIN vn.sale s ON s.id = sgd.saleFk
WHERE s.ticketFk = ?;`, [ticket.id], myOptions);
if (tx) await tx.commit();

28
modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
View File

@ -101,4 +101,32 @@ describe('ticket setDeleted()', () => {
throw e;
}
});
it('should show error trying to delete a ticket with a refund', async() => {
const tx = await models.Ticket.beginTransaction({});
let error;
try {
const options = {transaction: tx};
const ctx = {
req: {
accessToken: {userId: 9},
headers: {origin: 'http://localhost:5000'},
}
};
ctx.req.__ = value => {
return value;
};
const ticketId = 12;
await models.Ticket.setDeleted(ctx, ticketId, options);
await tx.rollback();
} catch (e) {
await tx.rollback();
error = e;
}
expect(error.message).toContain('Tickets with associated refunds');
});
});

28
modules/ticket/back/methods/ticket/specs/transferSales.spec.js
View File

@ -80,34 +80,6 @@ describe('sale transferSales()', () => {
expect(error.message).toEqual(`Can't transfer claimed sales`);
});
it('should be able to transfer claimed sales if the role is claimManager', async() => {
const tx = await models.Ticket.beginTransaction({});
let error;
try {
const options = {transaction: tx};
const claimManagerId = 72;
const myActiveCtx = {
accessToken: {userId: claimManagerId},
};
const myCtx = {req: myActiveCtx};
const ticketId = 11;
const receiverTicketId = null;
const sales = await models.Ticket.getSales(ticketId, options);
await models.Ticket.transferSales(myCtx, ticketId, receiverTicketId, sales, options);
await tx.rollback();
} catch (e) {
await tx.rollback();
error = e;
}
expect(error).toBeUndefined();
});
it('should transfer the sales from a ticket to a new one', async() => {
const tx = await models.Ticket.beginTransaction({});

3
modules/ticket/back/methods/ticket/transferSales.js
View File

@ -77,9 +77,8 @@ module.exports = Self => {
const saleIds = sales.map(sale => sale.id);
const isClaimManager = await models.Account.hasRole(userId, 'claimManager');
const hasClaimedSales = await models.ClaimBeginning.findOne({where: {saleFk: {inq: saleIds}}});
if (hasClaimedSales && !isClaimManager)
if (hasClaimedSales)
throw new UserError(`Can't transfer claimed sales`);
for (const sale of sales) {

44
modules/ticket/front/sale-tracking/index.html
View File

@ -24,12 +24,44 @@
<vn-tbody>
<vn-tr ng-repeat="sale in $ctrl.sales">
<vn-td center>
<span class="chip {{$ctrl.chipHasSaleGroupDetail(sale.preparingList.hasSaleGroupDetail)}} vn-mx-xs chip2" vn-tooltip="has saleGroupDetail"></span>
<span class="chip {{$ctrl.chipIsPreviousSelected(sale.preparingList.isPreviousSelected)}} vn-ml-xs" vn-tooltip="is previousSelected"></span>
<span class="chip {{$ctrl.chipIsPrevious(sale.preparingList.isPrevious)}} vn-mr-xs" vn-tooltip="is previous"></span>
<span class="chip {{$ctrl.chipIsPrepared(sale.preparingList.isPrepared)}} vn-mx-xs" vn-tooltip="is prepared"></span>
<span class="chip {{$ctrl.chipIsControled(sale.preparingList.isControled)}} vn-mx-xs" vn-tooltip="is controled"></span>
</vn-td>
<vn-chip
ng-class="::{
'pink': sale.preparingList.hasSaleGroupDetail,
'none': !sale.preparingList.hasSaleGroupDetail,
}"
class="circle"
vn-tooltip="has saleGroupDetail"
>
</vn-chip>
<vn-chip ng-class="::{
'notice': sale.preparingList.isPreviousSelected,
'none': !sale.preparingList.isPreviousSelected,
}"
class="circle"
vn-tooltip="is previousSelected">
</vn-chip>
<vn-chip ng-class="::{
'dark-notice': sale.preparingList.isPrevious,
'none': !sale.preparingList.isPrevious,
}"
class="circle"
vn-tooltip="is previous">
</vn-chip>
<vn-chip ng-class="::{
'warning': sale.preparingList.isPrepared,
'none': !sale.preparingList.isPrepared,
}"
class="circle"
vn-tooltip="is prepared">
</vn-chip>
<vn-chip ng-class="::{
'yellow': sale.preparingList.isControled,
'none': !sale.preparingList.isControled,
}"
class="circle"
vn-tooltip="is controled">
</vn-chip>
</vn-td>
<vn-td number>
<span
ng-click="itemDescriptor.show($event, sale.item.id)"

25
modules/ticket/front/sale-tracking/index.js
View File

@ -74,31 +74,6 @@ class Controller extends Section {
this.$.itemDescriptor.show(event.target, sale.item.id);
}
chipHasSaleGroupDetail(hasSaleGroupDetail) {
if (hasSaleGroupDetail) return 'pink';
else return 'message';
}
chipIsPreviousSelected(isPreviousSelected) {
if (isPreviousSelected) return 'notice';
else return 'message';
}
chipIsPrevious(isPrevious) {
if (isPrevious) return 'dark-notice';
else return 'message';
}
chipIsPrepared(isPrepared) {
if (isPrepared) return 'warning';
else return 'message';
}
chipIsControled(isControled) {
if (isControled) return 'yellow';
else return 'message';
}
showSaleTracking(sale) {
this.saleId = sale.id;
this.$.saleTracking.show();

11
modules/ticket/front/sale-tracking/style.scss
View File

@ -1,7 +1,12 @@
@import "variables";
.chip {
.circle {
display: inline-block;
min-width: 15px;
min-height: 25px;
justify-content: center;
align-items: center;
border-radius: 50%;
font-size: .9rem;
width: 30px;
height: 30px;
cursor: pointer;
}

66
modules/worker/back/methods/worker/allocatePDA.js Normal file
View File

@ -0,0 +1,66 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('allocatePDA', {
description: 'Deallocate the PDA of the worker',
accepts: [{
arg: 'id',
type: 'number',
required: true,
description: 'The worker id',
http: {source: 'path'}
}, {
arg: 'pda',
type: 'number',
required: true,
description: 'The pda id'
}],
returns: {
type: ['object'],
root: true
},
http: {
path: `/:id/allocatePDA`,
verb: 'POST'
}
});
Self.allocatePDA = async(ctx, options) => {
const models = Self.app.models;
const args = ctx.args;
let tx;
const myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
}
try {
const pda = await models.DeviceProduction.findById(args.pda, myOptions);
if (pda.stateFk != 'idle') throw new UserError(`The PDA state is not idle`);
await pda.updateAttributes({stateFk: 'active'}, myOptions);
await models.DeviceProductionUser.create({
deviceProductionFk: args.pda,
userFk: args.id,
created: new Date()
}, myOptions);
if (tx) await tx.commit();
return {
deviceProductionFk: pda.id,
deviceProduction: {
modelFk: pda.modelFk,
serialNumber: pda.serialNumber
}
};
} catch (e) {
if (tx) await tx.rollback();
throw e;
}
};
};

53
modules/worker/back/methods/worker/deallocatePDA.js Normal file
View File

@ -0,0 +1,53 @@
module.exports = Self => {
Self.remoteMethodCtx('deallocatePDA', {
description: 'Deallocate the worker\'s PDA',
accepts: [{
arg: 'id',
type: 'number',
required: true,
description: 'The worker id',
http: {source: 'path'}
}, {
arg: 'pda',
type: 'number',
required: true,
description: 'The pda id'
}],
returns: {
type: ['object'],
root: true
},
http: {
path: `/:id/deallocatePDA`,
verb: 'POST'
}
});
Self.deallocatePDA = async(ctx, options) => {
const models = Self.app.models;
const args = ctx.args;
let tx;
const myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
}
try {
const pda = await models.DeviceProduction.findById(args.pda, myOptions);
await pda.updateAttributes({stateFk: 'idle'}, myOptions);
await models.DeviceProductionUser.destroyAll({userFk: args.id, deviceProductionFk: args.pda}, myOptions);
if (tx) await tx.commit();
return pda;
} catch (e) {
if (tx) await tx.rollback();
throw e;
}
};
};

46
modules/worker/back/methods/worker/specs/allocatePDA.spec.js Normal file
View File

@ -0,0 +1,46 @@
const models = require('vn-loopback/server/server').models;
describe('Worker allocatePDA()', () => {
it('should allocate a new worker\'s PDA', async() => {
const tx = await models.Worker.beginTransaction({});
try {
const workerWithoutPDA = 1101;
const PDAWithIdleState = 4;
const options = {transaction: tx};
const ctx = {args: {id: workerWithoutPDA, pda: PDAWithIdleState}};
await models.Worker.allocatePDA(ctx, options);
const deviceProduction = await models.DeviceProduction.findById(PDAWithIdleState, null, options);
const deviceProductionUser = await models.DeviceProductionUser
.findById(PDAWithIdleState, null, options);
expect(deviceProduction.stateFk).toEqual('active');
expect(deviceProductionUser).not.toBeNull();
await tx.rollback();
} catch (e) {
await tx.rollback();
throw e;
}
});
it('should throw error trying to allocate a non idle PDA', async() => {
const tx = await models.Worker.beginTransaction({});
let error;
try {
const workerWithoutPDA = 1101;
const PDAWithActiveState = 1;
const options = {transaction: tx};
const ctx = {args: {id: workerWithoutPDA, pda: PDAWithActiveState}};
await models.Worker.allocatePDA(ctx, options);
await tx.rollback();
} catch (e) {
error = e;
await tx.rollback();
}
expect(error).toBeDefined();
});
});

26
modules/worker/back/methods/worker/specs/deallocatePDA.spec.js Normal file
View File

@ -0,0 +1,26 @@
const models = require('vn-loopback/server/server').models;
describe('Worker deallocatePDA()', () => {
it('should deallocate a worker\'s PDA', async() => {
const tx = await models.Worker.beginTransaction({});
try {
const workerWithPDA = 1;
const PDAWithActiveState = 1;
const options = {transaction: tx};
const ctx = {args: {id: workerWithPDA, pda: PDAWithActiveState}};
await models.Worker.deallocatePDA(ctx, options);
const deviceProduction = await models.DeviceProduction.findById(PDAWithActiveState, null, options);
const deviceProductionUser = await models.DeviceProductionUser
.findById(PDAWithActiveState, null, options);
expect(deviceProduction.stateFk).toEqual('idle');
expect(deviceProductionUser).toBe(null);
await tx.rollback();
} catch (e) {
await tx.rollback();
throw e;
}
});
});

12
modules/worker/back/model-config.json
View File

@ -20,6 +20,18 @@
"Device": {
"dataSource": "vn"
},
"DeviceProduction": {
"dataSource": "vn"
},
"DeviceProductionModels": {
"dataSource": "vn"
},
"DeviceProductionState": {
"dataSource": "vn"
},
"DeviceProductionUser": {
"dataSource": "vn"
},
"EducationLevel": {
"dataSource": "vn"
},

15
modules/worker/back/models/device-production-models.json Normal file
View File

@ -0,0 +1,15 @@
{
"name": "DeviceProductionModels",
"base": "VnModel",
"options": {
"mysql": {
"table": "deviceProductionModels"
}
},
"properties": {
"code": {
"type": "string",
"id": true
}
}
}

18
modules/worker/back/models/device-production-state.json Normal file
View File

@ -0,0 +1,18 @@
{
"name": "DeviceProductionState",
"base": "VnModel",
"options": {
"mysql": {
"table": "deviceProductionState"
}
},
"properties": {
"code": {
"type": "string",
"id": true
},
"description": {
"type": "string"
}
}
}

33
modules/worker/back/models/device-production-user.json Normal file
View File

@ -0,0 +1,33 @@
{
"name": "DeviceProductionUser",
"base": "VnModel",
"options": {
"mysql": {
"table": "deviceProductionUser"
}
},
"properties": {
"deviceProductionFk": {
"type": "number",
"id": true
},
"userFk": {
"type": "number"
},
"created": {
"type": "date"
}
},
"relations": {
"deviceProduction": {
"type": "belongsTo",
"model": "DeviceProduction",
"foreignKey": "deviceProductionFk"
},
"user": {
"type": "belongsTo",
"model": "User",
"foreignKey": "userFk"
}
}
}

54
modules/worker/back/models/device-production.json Normal file
View File

@ -0,0 +1,54 @@
{
"name": "DeviceProduction",
"base": "VnModel",
"options": {
"mysql": {
"table": "deviceProduction"
}
},
"properties": {
"id": {
"type": "number",
"id": true
},
"imei": {
"type": "string"
},
"modelFk": {
"type": "number"
},
"macWifi": {
"type" : "string"
},
"serialNumber": {
"type" : "string"
},
"android_id": {
"type" : "string"
},
"purchased": {
"type" : "date"
},
"stateFk": {
"type" : "string"
},
"isInScaleFusion": {
"type" : "boolean"
},
"description": {
"type" : "string"
}
},
"relations": {
"model": {
"type": "belongsTo",
"model": "DeviceProductionModels",
"foreignKey": "modelFk"
},
"state": {
"type": "belongsTo",
"model": "DeviceProductionState",
"foreignKey": "stateFk"
}
}
}

6
modules/worker/back/models/worker.js
View File

@ -14,4 +14,10 @@ module.exports = Self => {
require('../methods/worker/holidays')(Self);
require('../methods/worker/activeContract')(Self);
require('../methods/worker/new')(Self);
require('../methods/worker/deallocatePDA')(Self);
require('../methods/worker/allocatePDA')(Self);
Self.validatesUniquenessOf('locker', {
message: 'This locker has already been assigned'
});
};

3
modules/worker/back/models/worker.json
View File

@ -55,6 +55,9 @@
},
"code": {
"type" : "string"
},
"locker": {
"type" : "number"
}
},
"relations": {

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

@ -11,7 +11,7 @@
<vn-horizontal>
<vn-textfield
vn-one
label="Name"
label="Name"
ng-model="$ctrl.worker.firstName"
rule>
</vn-textfield>
@ -24,14 +24,14 @@
</vn-horizontal>
<vn-horizontal>
<vn-textfield
vn-one
label="Business phone"
vn-one
label="Business phone"
ng-model="$ctrl.worker.phone"
rule>
</vn-textfield>
<vn-textfield
vn-one
label="Mobile extension"
vn-one
label="Mobile extension"
ng-model="$ctrl.worker.mobileExtension"
rule>
</vn-textfield>
@ -73,11 +73,16 @@
</vn-horizontal>
<vn-horizontal>
<vn-textfield
vn-one
label="SSN"
vn-one
label="SSN"
ng-model="$ctrl.worker.SSN"
rule>
</vn-textfield>
<vn-input-number
min="0"
label="Locker"
ng-model="$ctrl.worker.locker">
</vn-input-number>
</vn-horizontal>
</vn-vertical>
</vn-card>

3
modules/worker/front/basic-data/locale/es.yml
View File

@ -5,4 +5,5 @@ SSN: NSS
Married: Casado/a
Single: Soltero/a
Business phone: Teléfono de empresa
Mobile extension: Extensión móvil
Mobile extension: Extensión móvil
Locker: Taquilla

1
modules/worker/front/index.js
View File

@ -10,6 +10,7 @@ import './descriptor-popover';
import './search-panel';
import './basic-data';
import './pbx';
import './pda';
import './department';
import './calendar';
import './time-control';

9
modules/worker/front/locale/es.yml
View File

@ -23,4 +23,11 @@ worker: trabajador
Go to the worker: Ir al trabajador
Click to exclude the user from getting disabled: Marcar para no deshabilitar
Click to allow the user to be disabled: Marcar para deshabilitar
This user can't be disabled: Fijado para no deshabilitar
This user can't be disabled: Fijado para no deshabilitar
Model: Modelo
Serial Number: Número de serie
Current PDA: PDA Actual
Deallocate PDA: Desasignar PDA
PDA deallocated: PDA desasignada
PDA allocated: PDA asignada
New PDA: Nueva PDA

49
modules/worker/front/pda/index.html Normal file
View File

@ -0,0 +1,49 @@
<div class="vn-w-md" ng-show="$ctrl.currentPDA">
<vn-card class="vn-pa-lg">
<vn-horizontal>
<vn-textfield
label="Current PDA"
ng-model="$ctrl.currentPDA.description"
disabled="true">
<append>
<vn-icon-button
icon="delete"
vn-tooltip="Deallocate PDA"
ng-click="$ctrl.deallocatePDA()"
vn-acl="hr, productionAssi">
</vn-icon-button>
</append>
</vn-textfield>
</vn-horizontal>
</vn-card>
</div>
<form name="form" ng-show="!$ctrl.currentPDA" ng-submit="$ctrl.allocatePDA()" class="vn-w-md">
<vn-card class="vn-pa-lg">
<vn-horizontal>
<vn-autocomplete
vn-acl="hr, productionAssi"
ng-model="$ctrl.newPDA"
url="DeviceProductions"
fields="['id', 'modelFk', 'serialNumber']"
where="{'stateFk': 'idle'}"
label="New PDA"
order="id"
value-field="id"
show-field="serialNumber">
<tpl-item>
<span>ID: {{id}}</span>
<span class="separator"></span>
<span>{{'Model' | translate}}: {{modelFk}}</span>
<span class="separator"></span>
<span>{{'Serial Number' | translate}}: {{serialNumber}}</span>
</tpl-item>
</vn-autocomplete>
</vn-horizontal>
</vn-card>
<vn-button-bar>
<vn-submit
disabled="!$ctrl.newPDA"
label="Assign">
</vn-submit>
</vn-button-bar>
</form>

53
modules/worker/front/pda/index.js Normal file
View File

@ -0,0 +1,53 @@
import ngModule from '../module';
import Section from 'salix/components/section';
import './style.scss';
class Controller extends Section {
constructor($element, $) {
super($element, $);
const filter = {
where: {userFk: this.$params.id},
include: {relation: 'deviceProduction'}
};
this.$http.get('DeviceProductionUsers', {filter}).
then(res => {
if (res.data && res.data.length > 0)
this.setCurrentPDA(res.data[0]);
});
}
deallocatePDA() {
this.$http.post(`Workers/${this.$params.id}/deallocatePDA`, {pda: this.currentPDA.deviceProductionFk})
.then(() => {
this.vnApp.showSuccess(this.$t('PDA deallocated'));
delete this.currentPDA;
});
}
allocatePDA() {
this.$http.post(`Workers/${this.$params.id}/allocatePDA`, {pda: this.newPDA})
.then(res => {
if (res.data)
this.setCurrentPDA(res.data);
this.vnApp.showSuccess(this.$t('PDA allocated'));
delete this.newPDA;
});
}
setCurrentPDA(data) {
this.currentPDA = data;
this.currentPDA.description = [];
this.currentPDA.description.push(`ID: ${this.currentPDA.deviceProductionFk}`);
this.currentPDA.description.push(`${this.$t('Model')}: ${this.currentPDA.deviceProduction.modelFk}`);
this.currentPDA.description.push(`${this.$t('Serial Number')}: ${this.currentPDA.deviceProduction.serialNumber}`);
this.currentPDA.description = this.currentPDA.description.join(' ');
}
}
Controller.$inject = ['$element', '$scope'];
ngModule.vnComponent('vnWorkerPda', {
template: require('./index.html'),
controller: Controller,
});

72
modules/worker/front/pda/index.spec.js Normal file
View File

@ -0,0 +1,72 @@
import './index';
describe('Worker', () => {
describe('Component vnWorkerPda', () => {
let $httpBackend;
let $scope;
let $element;
let controller;
beforeEach(ngModule('worker'));
beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
$scope = $rootScope.$new();
$element = angular.element('<vn-worker-pda></vn-worker-pda>');
controller = $componentController('vnWorkerPda', {$element, $scope});
$httpBackend.expectGET(`DeviceProductionUsers`).respond();
}));
describe('deallocatePDA()', () => {
it('should make an HTTP Post query to deallocatePDA', () => {
jest.spyOn(controller.vnApp, 'showSuccess');
controller.currentPDA = {deviceProductionFk: 1};
controller.$params.id = 1;
$httpBackend
.expectPOST(`Workers/${controller.$params.id}/deallocatePDA`,
{pda: controller.currentPDA.deviceProductionFk})
.respond();
controller.deallocatePDA();
$httpBackend.flush();
expect(controller.vnApp.showSuccess).toHaveBeenCalled();
expect(controller.currentPDA).toBeUndefined();
});
});
describe('allocatePDA()', () => {
it('should make an HTTP Post query to allocatePDA', () => {
jest.spyOn(controller.vnApp, 'showSuccess');
controller.newPDA = 4;
controller.$params.id = 1;
$httpBackend
.expectPOST(`Workers/${controller.$params.id}/allocatePDA`,
{pda: controller.newPDA})
.respond();
controller.allocatePDA();
$httpBackend.flush();
expect(controller.vnApp.showSuccess).toHaveBeenCalled();
expect(controller.newPDA).toBeUndefined();
});
});
describe('setCurrentPDA()', () => {
it('should set CurrentPDA', () => {
const data = {
deviceProductionFk: 1,
deviceProduction: {
modelFk: 1,
serialNumber: 1
}
};
controller.setCurrentPDA(data);
expect(controller.currentPDA).toBeDefined();
expect(controller.currentPDA.description).toBeDefined();
});
});
});
});

6
modules/worker/front/pda/style.scss Normal file
View File

@ -0,0 +1,6 @@
span.separator{
border-left: 1px solid black;
height: 100%;
margin: 0 10px;
}

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

@ -11,9 +11,10 @@
],
"card": [
{"state": "worker.card.basicData", "icon": "settings"},
{"state": "worker.card.pbx", "icon": "icon-pbx"},
{"state": "worker.card.calendar", "icon": "icon-calendar"},
{"state": "worker.card.timeControl", "icon": "access_time"},
{"state": "worker.card.calendar", "icon": "icon-calendar"},
{"state": "worker.card.pda", "icon": "phone_android"},
{"state": "worker.card.pbx", "icon": "icon-pbx"},
{"state": "worker.card.dms.index", "icon": "cloud_upload"},
{
"icon": "icon-wiki",
@ -141,6 +142,13 @@
"component": "vn-worker-create",
"description": "New worker",
"acl": ["hr"]
},
{
"url": "/pda",
"state": "worker.card.pda",
"component": "vn-worker-pda",
"description": "PDA",
"acl": ["hr", "productionAssi"]
}
]
}

31
modules/worker/front/summary/index.html
View File

@ -11,23 +11,23 @@
<vn-horizontal class="vn-pa-md">
<vn-one>
<h4 ng-show="$ctrl.isHr">
<a
<a
ui-sref="worker.card.basicData({id:$ctrl.worker.id})">
<span translate vn-tooltip="Go to">Basic data</span>
</a>
</h4>
<h4
<h4
translates
ng-show="!$ctrl.isHr">
Basic data
</h4>
<vn-label-value label="Id"
<vn-label-value label="Id"
value="{{worker.id}}">
</vn-label-value>
<vn-label-value label="Email" no-ellipsize
value="{{worker.user.emailUser.email}}">
</vn-label-value>
<vn-label-value label="Department"
<vn-label-value label="Department"
value="{{worker.department.department.name}}">
</vn-label-value>
<vn-label-value
@ -38,33 +38,36 @@
{{::worker.boss.nickname}}
</span>
</vn-label-value>
<vn-label-value label="Mobile extension"
<vn-label-value label="Mobile extension"
value="{{worker.mobileExtension}}">
</vn-label-value>
<vn-label-value label="Business phone"
<vn-label-value label="Business phone"
value="{{worker.phone}}">
</vn-label-value>
<vn-label-value label="Personal phone"
<vn-label-value label="Personal phone"
value="{{worker.client.phone}}">
</vn-label-value>
</vn-label-value>
<vn-label-value label="Locker"
value="{{worker.locker}}">
</vn-label-value>
</vn-one>
<vn-one>
<h4 translate>User data</h4>
<vn-label-value label="User id"
<vn-label-value label="User id"
value="{{worker.userFk}}">
</vn-label-value>
<vn-label-value label="User"
<vn-label-value label="User"
value="{{worker.user.name}}">
</vn-label-value>
<vn-label-value label="Role"
<vn-label-value label="Role"
value="{{worker.user.role.name}}">
</vn-label-value>
<vn-label-value label="Extension"
<vn-label-value label="Extension"
value="{{worker.sip.extension}}">
</vn-label-value>
</vn-one>
</vn-horizontal>
</vn-card>
<vn-worker-descriptor-popover
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>
</vn-worker-descriptor-popover>

3
modules/worker/front/summary/locale/es.yml
View File

@ -1,3 +1,4 @@
Business phone: Teléfono de empresa
Personal phone: Teléfono personal
Mobile extension: Extensión móvil
Mobile extension: Extensión móvil
Locker: Taquilla

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "salix-back",
"version": "23.08.01",
"version": "23.10.01",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",

6
print/templates/reports/collection-label/collection-label.js
View File

@ -66,8 +66,10 @@ module.exports = {
else
value = '---';
if (labelData.routeFk)
value = `${value} [${labelData.routeFk.toString().substring(0, 3)}]`;
if (labelData.routeFk) {
let routeFk = labelData.routeFk.toString();
value = `${value} [${routeFk.substring(routeFk.length - 3)}]`;
}
return value;
},

4
print/templates/reports/collection-label/options.json
View File

@ -3,9 +3,9 @@
"height": "4.9cm",
"margin": {
"top": "0.3cm",
"right": "0.6cm",
"right": "0.3cm",
"bottom": "0cm",
"left": "0cm"
"left": "0.2cm"
},
"printBackground": true
}