#1456 fixtores for dms and model
gitea/salix/dev This commit looks good Details

This commit is contained in:
Bernat 2019-05-23 09:30:29 +02:00
parent f73b42b0be
commit 443feef673
4 changed files with 50 additions and 3 deletions

View File

@ -1,6 +1,10 @@
ALTER TABLE `vn`.`itemTaxCountry` AUTO_INCREMENT = 1; ALTER TABLE `vn`.`itemTaxCountry` AUTO_INCREMENT = 1;
ALTER TABLE `vn2008`.`Consignatarios` AUTO_INCREMENT = 1; ALTER TABLE `vn2008`.`Consignatarios` AUTO_INCREMENT = 1;
INSERT INTO `vn`.`ticketConfig` (`id`, `scopeDays`)
VALUES
('1', '6');
INSERT INTO `account`.`mailConfig` (`id`, `domain`) INSERT INTO `account`.`mailConfig` (`id`, `domain`)
VALUES VALUES
('1', 'verdnatura.es'); ('1', 'verdnatura.es');
@ -1435,7 +1439,7 @@ INSERT INTO `vn`.`dmsType`(`id`, `name`, `path`, `readRoleFk`, `writeRoleFk`)
(2, 'Doc oficial', '\oficial', NULL, NULL), (2, 'Doc oficial', '\oficial', NULL, NULL),
(3, 'Laboral', '\laboral', NULL, NULL), (3, 'Laboral', '\laboral', NULL, NULL),
(4, 'Albaranes recibidos', '\entradas', NULL, NULL), (4, 'Albaranes recibidos', '\entradas', NULL, NULL),
(5, 'Otros', '\otros', NULL, NULL), (5, 'Otros', '\otros', 1, NULL),
(6, 'Pruebas', '\pruebas', NULL, NULL), (6, 'Pruebas', '\pruebas', NULL, NULL),
(7, 'IAE Clientes', '\IAE_Clientes', NULL, NULL), (7, 'IAE Clientes', '\IAE_Clientes', NULL, NULL),
(8, 'Fiscal', '\fiscal', NULL, NULL), (8, 'Fiscal', '\fiscal', NULL, NULL),
@ -1453,8 +1457,8 @@ INSERT INTO `vn`.`dmsType`(`id`, `name`, `path`, `readRoleFk`, `writeRoleFk`)
INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`) INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
VALUES VALUES
(1, 14, 'filename.pdf', 5, 1, 442, NULL, 1, 'Ticket:11', 'Ticket:11 dms for the ticket', CURDATE()), (1, 14, '1.pdf', 5, 1, 442, NULL, FALSE, 'Ticket:11', 'Ticket:11 dms for the ticket', CURDATE()),
(2, 5, 'filename2.pdf', 5, 1, 442, NULL, 1, 'Client:101', 'Client:101 dms for the client', CURDATE()); (2, 5, '2.pdf', 5, 1, 442, 1, TRUE, 'Client:101', 'Client:101 dms for the client', CURDATE());
INSERT INTO `vn`.`ticketDms`(`ticketFk`, `dmsFk`) INSERT INTO `vn`.`ticketDms`(`ticketFk`, `dmsFk`)
VALUES VALUES

View File

@ -149,6 +149,8 @@ function e2eOnly() {
if (argv.show || argv.s) if (argv.show || argv.s)
process.env.E2E_SHOW = true; process.env.E2E_SHOW = true;
process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true;
const specFiles = [ const specFiles = [
`${__dirname}/e2e/paths/**/*[sS]pec.js`, `${__dirname}/e2e/paths/**/*[sS]pec.js`,

View File

@ -91,5 +91,8 @@
}, },
"TpvTransaction": { "TpvTransaction": {
"dataSource": "vn" "dataSource": "vn"
},
"ClientDms": {
"dataSource": "vn"
} }
} }

View File

@ -0,0 +1,38 @@
{
"name": "ClientDms",
"base": "Loggable",
"log": {
"model": "ClientLog",
"relation": "ticket",
"showField": "dmsFk"
},
"options": {
"mysql": {
"table": "clientDms"
}
},
"properties": {
"clientFk": {
"type": "Number",
"id": true,
"required": true
},
"dmsFk": {
"type": "Number",
"id": true,
"required": true
}
},
"relations": {
"client": {
"type": "belongsTo",
"model": "Client",
"foreignKey": "clientFk"
},
"dms": {
"type": "belongsTo",
"model": "Dms",
"foreignKey": "dmsFk"
}
}
}