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

#1233 new models and fixtures
gitea/salix/dev This commit looks good Details

This commit is contained in:
Bernat 2019-03-20 10:10:36 +01:00
parent 981800a0e2
commit 41e1505b1a
6 changed files with 179 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
db/install/changes/0-ACL.sql
View File

@ -1,4 +1,4 @@
-- INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (149, 'Sip', '*', 'WRITE', 'ALLOW', 'ROLE', 'hr');
-- INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (150, 'Sip', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
-- INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (151, 'Department','*','READ','ALLOW','ROLE','employee');
-- INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (152, 'Department','*','WRITE','ALLOW','ROLE','hr');
INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (151, 'Department','*','READ','ALLOW','ROLE','employee');
INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (152, 'Department','*','WRITE','ALLOW','ROLE','hr');
INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (153, 'Route','*','READ','ALLOW','ROLE','employee');
INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (154, 'Route','*','WRITE','ALLOW','ROLE','delivery');

18
db/install/dump/fixtures.sql
View File

@ -353,15 +353,15 @@ INSERT INTO `vn`.`creditInsurance`(`id`, `creditClassification`, `credit`, `crea
(2, 2 , 6000, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), NULL),
(3, 3, 10000 , DATE_ADD(CURDATE(), INTERVAL -3 MONTH), NULL);
INSERT INTO `vn`.`route`(`id`, `created`)
INSERT INTO `vn`.`route`(`id`, `created`, `workerFk`, `vehicleFk`, `isOk`, `description`)
VALUES
(1, CURDATE()),
(2, CURDATE()),
(3, CURDATE()),
(4, CURDATE()),
(5, CURDATE()),
(6, CURDATE()),
(7, CURDATE());
(1, CURDATE(), 56, 1, 0, 'first route' ),
(2, CURDATE(), 56, 1, 0, 'second route' ),
(3, CURDATE(), 56, 2, 0, 'third route' ),
(4, CURDATE(), 56, 3, 0, 'fourth route' ),
(5, CURDATE(), 56, 4, 0, 'fifth route' ),
(6, CURDATE(), 57, 5, 0, 'sixth route' ),
(7, CURDATE(), 57, 6, 0, 'seventh route');
INSERT INTO `vn2008`.`empresa_grupo`(`empresa_grupo_id`, `grupo`)
VALUES
@ -459,7 +459,7 @@ INSERT INTO `vn`.`vehicle`(`id`, `numberPlate`, `tradeMark`, `model`, `companyFk
(3, '2222-IMK', 'STARK INDUSTRIES', 'MARK-VI', 442, 1, 'Iron-Man Heavy Armor MARK-VI', 16, 1),
(4, '3333-IMK', 'STARK INDUSTRIES', 'MARK-VII', 442, 1, 'Iron-Man Heavy Armor MARK-VII', 14, 1),
(5, '4444-IMK', 'STARK INDUSTRIES', 'MARK-XLII', 442, 1, 'Iron-Man Heavy Armor MARK-XLII', 13, 1),
(6, '5555-IMK', 'STARK INDUSTRIES', 'MARK-XLV', 442, 1, 'Iron-Man Heavy Armor MARK-XLV', 12, 1);
(6, '5555-IMK', 'STARK INDUSTRIES', 'MARK-XLV', 442, 1, 'Iron-Man Heavy Armor MARK-XLV', 12, 0);
INSERT INTO `vn`.`config`(`id`, `mdbServer`, `fakeEmail`, `defaultersMaxAmount`)
VALUES

8
modules/route/back/model-config.json Normal file
View File

@ -0,0 +1,8 @@
{
"Route": {
"dataSource": "vn"
},
"Vehicle": {
"dataSource": "vn"
}
}

69
modules/route/back/models/route.json Normal file
View File

@ -0,0 +1,69 @@
{
"name": "Route",
"base": "VnModel",
"options": {
"mysql": {
"table": "route"
}
},
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
},
"created": {
"type": "date"
},
"time": {
"type": "date"
},
"isOk": {
"type": "Number"
},
"kmStart": {
"type": "Number"
},
"kmEnd": {
"type": "Number"
},
"started": {
"type": "date"
},
"finished": {
"type": "date"
},
"gestdoc": {
"type": "date",
"mysql": {
"columnName": "gestdocFk"
}
},
"cost": {
"type": "Number"
},
"m3": {
"type": "Number"
},
"description": {
"type": "String"
}
},
"relations": {
"worker": {
"type": "belongsTo",
"model": "Worker",
"foreignKey": "workerFk"
},
"vehicle": {
"type": "belongsTo",
"model": "Vehicle",
"foreignKey": "vehicleFk"
},
"agencyMode": {
"type": "belongsTo",
"model": "AgencyMode",
"foreignKey": "agencyModeFk"
}
}
}

54
modules/route/back/models/vehicle.json Normal file
View File

@ -0,0 +1,54 @@
{
"name": "Vehicle",
"base": "VnModel",
"options": {
"mysql": {
"table": "vehicle"
}
},
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
},
"numberPlate": {
"type": "String"
},
"tradeMark": {
"type": "String"
},
"model": {
"type": "String"
},
"m3": {
"type": "Number"
},
"description": {
"type": "String"
},
"isActive": {
"type": "Number"
}
},
"relations": {
"company": {
"type": "belongsTo",
"model": "Company",
"foreignKey": "companyFk"
},
"warehouse": {
"type": "belongsTo",
"model": "Warehouse",
"foreignKey": "warehouseFk"
}
},
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
}