feat: refs #7119 add new vehicle

db/dump/fixtures.before.sql

@@ -856,14 +856,15 @@ INSERT INTO `vn`.`deliveryPoint` (`id`, `name`, `ubication`)
     VALUES
         (1, 'Gotham','1007 Mountain Drive, Gotham');
 
-INSERT INTO `vn`.`vehicle`(`id`, `numberPlate`, `tradeMark`, `model`, `companyFk`, `warehouseFk`, `description`, `m3`, `isActive`, `deliveryPointFk`)
+INSERT INTO `vn`.`vehicle`(`id`, `numberPlate`, `tradeMark`, `model`, `companyFk`, `warehouseFk`, `description`, `m3`, `isActive`, `deliveryPointFk`, `chassis`, `leasing`, `supplierFk`, `fuelTypeFk`, `bankPolicyFk`)
     VALUES
-        (1, '3333-BAT', 'WAYNE INDUSTRIES', 'BATMOBILE', 442, 1, 'The ultimate war machine',       50, 1, 1),
-        (2, '1111-IMK', 'STARK INDUSTRIES', 'MARK-III',  442, 1, 'Iron-Man Heavy Armor MARK-III',  18, 1, 1),
-        (3, '2222-IMK', 'STARK INDUSTRIES', 'MARK-VI',   442, 1, 'Iron-Man Heavy Armor MARK-VI',   16, 1, 1),
-        (4, '3333-IMK', 'STARK INDUSTRIES', 'MARK-VII',  442, 1, 'Iron-Man Heavy Armor MARK-VII',  14, 1, 1),
-        (5, '4444-IMK', 'STARK INDUSTRIES', 'MARK-XLII', 442, 1, 'Iron-Man Heavy Armor MARK-XLII', 13, 1, 1),
-        (6, '5555-IMK', 'STARK INDUSTRIES', 'MARK-XLV',  442, 1, 'Iron-Man Heavy Armor MARK-XLV',  12, 0, 1);
+        (1, '3333-BAT', 'WAYNE INDUSTRIES', 'BATMOBILE', 442, 1, 'The ultimate war machine',       50, 1, 1, 'XCSC133C60', 'Wayne leasing', 1, 1, 1),
+        (2, '1111-IMK', 'STARK INDUSTRIES', 'MARK-III',  442, 1, 'Iron-Man Heavy Armor MARK-III',  18, 1, 1, '', '', 2, 2, 2),
+        (3, '2222-IMK', 'STARK INDUSTRIES', 'MARK-VI',   442, 1, 'Iron-Man Heavy Armor MARK-VI',   16, 1, 1, '', '', 442, 2, null),
+        (4, '3333-IMK', 'STARK INDUSTRIES', 'MARK-VII',  442, 1, 'Iron-Man Heavy Armor MARK-VII',  14, 1, 1, '', '', 442, 3, null),
+        (5, '4444-IMK', 'STARK INDUSTRIES', 'MARK-XLII', 442, 1, 'Iron-Man Heavy Armor MARK-XLII', 13, 1, 1, '', '', 442, 4, null),
+        (6, '5555-IMK', 'STARK INDUSTRIES', 'MARK-XLV',  442, 1, 'Iron-Man Heavy Armor MARK-XLV',  12, 0, 1, '', '', 442, 5, null),
+        (7, '5555-SHI', 'SHIELD',           'Quinjet',   442, 1, 'High-speed jet used by the Avengers', 30, 1, 1, 'QJ12345', 'SHIELD leasing', 1, 1, 1);
 
 INSERT INTO `vn`.`config`(`id`, `mdbServer`, `fakeEmail`, `defaultersMaxAmount`, `inventoried`)
     VALUES
@@ -3207,7 +3208,7 @@ UPDATE vn.department
     SET workerFk = null;
 
 INSERT INTO vn.packaging
-    VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0,0,1,0);
+    VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0,0,1);
 
 
 INSERT IGNORE INTO vn.intrastat
@@ -4071,3 +4072,43 @@ UPDATE vn.worker
 	SET isFreelance=1
 	WHERE firstName='deliveryFreelancer';
 
+INSERT INTO vn.vehicleState (state, hasToNotify)
+    VALUES
+        ('Operativo', NULL),
+        ('Prestado', NULL),
+        ('Robado', NULL),
+        ('Taller', NULL),
+        ('Targeta SOLRED', NULL),
+        ('Via T SOLRED', NULL),
+        ('ITV', NULL);
+
+INSERT INTO vn.vehicleEvent (started, finished, vehicleStateFk, description, vehicleFk, userFk, notified)
+    VALUES
+        ('2000-12-01', '2000-12-02', 4, 'cambio de aceite', 5, 103, NULL),
+        ('2000-12-15', '2000-12-18', 2, 'viaje fin de curso', 5, 103, NULL),
+        ('2000-12-20', '2001-01-01', 3, 'llaves puestas', 2, 103, NULL);
+
+INSERT INTO vn.fuelType (id, name, code)
+    VALUES
+        (1, 'gasoil', 'gasoil'),
+        (2, 'gas', 'gas'),
+        (3, 'adblue', 'adblue'),
+        (4, 'gasolina', 'gasolina'),
+        (5, 'gasoil-frigo', 'gasoil-frigo'),
+        (6, 'electrico', 'electric');
+
+INSERT INTO vn.bankPolicy (id, `ref`, amount, committedFee, nonCommittedFee, annualFee, started, ended, accountingFk, companyFk, supplierFk, description, hasGuarantee, dmsFk, notaryFk, currencyFk, amortizationTypeFk, periodicityTypeFk, insuranceExpired)
+    VALUES
+        (1, '11112222', 500000.0, 0.028, 0.0, 0.001, '2001-01-01', '2001-02-01', 1, 442, NULL, NULL, 0, NULL, NULL, 1, NULL, NULL, NULL),
+        (2, '33334444', 100000.0, 0.017, 0.0, 0.0, '2001-01-01', '2001-02-01', 1, 2, NULL, NULL, 0, NULL, NULL, 2, NULL, NULL, NULL);
+
+INSERT INTO vn.ppe (id, amortization, firstAmortizated, lastAmortizated, finished, value, planFk, groupFk, account, endowment, elementAccount, nature, location, discharged, cause, isInvestmentAsset, workerFk, companyFk, description, isDone)
+    VALUES
+        (1, 0.00, '2001-01-01', NULL, NULL, 700.95, 16, 4, '3456000000', '4320000000', '12345', 'INMOVILIZADO', 'V02', NULL, NULL, 0, NULL, 442, 'UTILLAJE LASER ROTATIVO AUTONIVELANTE 500M', NULL),
+        (2, 0.00, '2001-01-01', NULL, NULL, 400.00, 16, 4, '5678000000', '1230000000', '67891', 'INMOVILIZADO', 'V02', NULL, NULL, 0, NULL, 442, 'UTILLAJE BALANZA Z100 150KILOS', NULL);
+
+INSERT IGNORE INTO vn.vehicleType (id, name)
+    VALUES (1,'vehículo empresa'),
+        (2, 'furgoneta'),
+        (3, 'cabeza tractora'),
+        (4, 'remolque');

db/routines/vn2008/views/Cubos.sql

@@ -18,6 +18,5 @@ AS SELECT `p`.`id` AS `Id_Cubo`,
 	`p`.`base` AS `Base`,
 	`p`.`isBox` AS `box`,
 	`p`.`returnCost` AS `costeRetorno`,
-	`p`.`isActive` AS `isActive`,
-	`p`.`flippingCost` AS `flippingCost`
+	`p`.`isActive` AS `isActive`
 FROM `vn`.`packaging` `p`

db/routines/vn2008/views/awb.sql

@@ -29,6 +29,5 @@ AS SELECT `a`.`id` AS `id`,
 	`a`.`invoiceInPaletizedFk` AS `invoiceInPaletizedFk`,
 	`a`.`observation` AS `observation`,
 	`a`.`hasFreightPrepaid` AS `hasFreightPrepaid`,
-	`a`.`propertyNumber` AS `propertyNumber`,
-	`a`.`costPerKg` AS `costPerKg`
+	`a`.`propertyNumber` AS `propertyNumber`
 FROM `vn`.`awb` `a`

db/versions/11076-blueChico/00-firstScript.sql

@@ -1,27 +0,0 @@
-ALTER TABLE vn.business
-ADD CONSTRAINT `business_companyCodeFk` FOREIGN KEY (`companyCodeFk`) REFERENCES `company` (`code`) ON DELETE CASCADE ON UPDATE CASCADE;
-
---  Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values.
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('BusinessReasonEnd','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('CalendarType','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('OccupationCode','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('BusinessReasonEnd','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('WorkerBusinessProfessionalCategory','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('WorkerBusinessAgreement','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('WorkerBusinessType','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('PayrollCategory','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Worker','__get__business','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Worker','__create__business','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Business','crud','*','ALLOW','ROLE','hr');
-

db/versions/11394-brownAsparagus/00-firstScript.sql

@@ -0,0 +1,41 @@
+USE vn;
+
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+	VALUES ('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Vehicle', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Vehicle', 'findById', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'findById', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Vehicle', '__get__active', 'READ', 'ALLOW', 'ROLE', 'employee'),
+			('Vehicle', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Vehicle', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Vehicle', 'create', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', 'create', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('BankPolicy', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+			('BankPolicy', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('VehicleState', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+			('VehicleState', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('Ppe', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative' ),
+			('Ppe', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant' ),
+			('VehicleType', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+			('DeliveryPoint', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+			('DeliveryPoint', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative');
+			
+CREATE TABLE IF NOT EXISTS vehicleType (
+	id INT(11) PRIMARY KEY AUTO_INCREMENT,
+	name VARCHAR(45) NOT NULL
+);
+
+INSERT IGNORE INTO vehicleType (id, name)
+	VALUES (1,'vehículo empresa'),
+		(2, 'furgoneta'),
+		(3, 'cabeza tractora'),
+		(4, 'remolque');
+
+ALTER TABLE vehicle ADD COLUMN importCooler  decimal(10,2) DEFAULT NULL;
+ALTER TABLE vehicle ADD COLUMN vehicleTypeFk INT(11) DEFAULT 1;
+ALTER TABLE vehicle ADD CONSTRAINT fk_vehicle_vehicleType FOREIGN KEY (vehicleTypeFk) REFERENCES vehicleType(id);
+

db/versions/11427-azureChico/00-firstScript.sql

@@ -1,2 +0,0 @@
-ALTER TABLE vn.packaging
-    ADD COLUMN flippingCost decimal(10, 2) NOT NULL DEFAULT 0.00

db/versions/11428-blackArborvitae/00-firstScript.sql

@@ -1 +0,0 @@
-ALTER TABLE vn.travel CHANGE appointment appointment__ datetime DEFAULT NULL COMMENT '@deprecated 2025-01-28';

db/versions/11429-brownBamboo/00-firstScript.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `vn`.`awb`
-    ADD COLUMN `costPerKg` DECIMAL(10, 2) UNSIGNED DEFAULT NULL COMMENT 'Tarifa que indica a cuanto cuesta el kilo en ese vuelo';

modules/client/back/methods/client/filter.js

@@ -158,12 +158,10 @@ module.exports = Self => {
                     a.provinceFk AS provinceAddressFk,
                     p.name AS province,
                     u.id AS salesPersonFk,
-                    u.name AS salesPerson,
-                    co.name AS country
+                    u.name AS salesPerson
                 FROM client c
                     LEFT JOIN account.user u ON u.id = c.salesPersonFk
                     LEFT JOIN province p ON p.id = c.provinceFk
-                    LEFT JOIN country co ON co.id = c.countryFk
                     JOIN address a ON a.clientFk = c.id
             `
         );

modules/client/back/model-config.json

@@ -139,23 +139,5 @@
     },
     "Xdiario": {
         "dataSource": "vn"
-    },
-    "BusinessReasonEnd": {
-        "dataSource": "vn"
-    },
-    "OccupationCode": {
-        "dataSource": "vn"
-    },
-    "WorkerBusinessProfessionalCategory": {
-        "dataSource": "vn"
-    },
-    "CalendarType": {
-        "dataSource": "vn"
-    },
-    "WorkerBusinessType": {
-        "dataSource": "vn"
-    },
-    "PayrollCategory": {
-        "dataSource": "vn"
     }
 }

modules/client/back/models/business-reason-end.json

@@ -1,17 +0,0 @@
-{
-    "name": "BusinessReasonEnd",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "businessReasonEnd"
-        }
-    },
-    "properties": {
-        "id": {
-            "type": "number"
-        },
-        "reason": {
-            "type": "string"
-        }
-    }
-}

modules/client/back/models/business.json

@@ -13,63 +13,6 @@
         },
         "workcenterFk" : {
             "type": "number"
-        },
-        "companyCodeFk" : {
-            "type": "string"
-        },
-        "started" : {
-            "type": "date"
-        },
-        "ended" : {
-            "type": "date"
-        },
-        "workerBusiness" : {
-            "type": "string"
-        },
-        "reasonEndFk" : {
-            "type": "number"
-        },
-        "payedHolidays" : {
-            "type": "number"
-        },
-        "occupationCodeFk" : {
-            "type": "string"
-        },
-        "workerFk" : {
-            "type": "number"
-        },
-        "notes" : {
-            "type": "string"
-        },
-        "departmentFk": {
-            "type": "string"
-        },
-        "workerBusinessProfessionalCategoryFk": {
-            "type": "number"
-        },
-        "calendarTypeFk": {
-            "type": "string"
-        },
-        "isHourlyLabor": {
-            "type": "boolean"
-        },
-        "rate": {
-            "type": "number"
-        },
-        "workerBusinessCategoryFk": {
-            "type": "number"
-        },
-        "workerBusinessTypeFk": {
-            "type": "number"
-        },
-        "amount": {
-            "type": "number"
-        },
-        "workerBusinessAgreementFk": {
-            "type": "number"
-        },
-        "basicSalary": {
-            "type": "number"
         }
     },
     "relations": {
@@ -82,59 +25,6 @@
             "type": "belongsTo",
             "model": "Department",
             "foreignKey": "departmentFk"
-        },
-        "workCenter": {
-            "type": "belongsTo",
-            "model": "WorkCenter",
-            "foreignKey": "workcenterFk"
-        },
-        "companyCode": {
-            "type": "belongsTo",
-            "model": "Company",
-            "foreignKey": "companyCodeFk",
-            "primaryKey": "code"
-        },
-        "reasonEnd": {
-            "type": "belongsTo",
-            "model": "BusinessReasonEnd",
-            "foreignKey": "reasonEndFk"
-        },
-        "occupationCode": {
-            "type": "belongsTo",
-            "model": "OccupationCode",
-            "foreignKey":"occupationCodeFk",
-            "primaryKey": "code"
-        },
-        "payrollCategory": {
-            "type": "belongsTo",
-            "model": "PayrollCategory",
-            "foreignKey":"workerBusinessCategoryFk"
-        },
-        "workerBusinessProfessionalCategory": {
-            "type": "belongsTo",
-            "model": "WorkerBusinessProfessionalCategory",
-            "foreignKey": "workerBusinessProfessionalCategoryFk"
-        },
-        "calendarType": {
-            "type": "belongsTo",
-            "model": "CalendarType",
-            "foreignKey": "calendarTypeFk"
-        },
-        "workerBusinessCategory": {
-            "type": "belongsTo",
-            "model": "WorkerBusinessCategory",
-            "foreignKey": "workerBusinessCategoryFk"
-        },
-        "workerBusinessType": {
-            "type": "belongsTo",
-            "model": "WorkerBusinessType",
-            "foreignKey": "workerBusinessTypeFk"
-        },
-        "workerBusinessAgreement": {
-            "type": "belongsTo",
-            "model": "WorkerBusinessAgreement",
-            "foreignKey": "workerBusinessAgreementFk"
-        }
-
+        }
     }
 }

modules/client/back/models/calendar-type.json

@@ -1,21 +0,0 @@
-{
-    "name": "CalendarType",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "calendarType"
-        }
-    },
-    "properties": {
-        "id": {
-            "type": "number"
-        },
-        "description": {
-            "type": "string"
-        },
-        "hoursWeek": {
-            "type": "number"
-        },
-        "isPartial": "number"
-    }
-}

modules/client/back/models/occupation-code.json

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

modules/client/back/models/worker-business-agreement.json

@@ -1,29 +0,0 @@
-{
-    "name": "WorkerBusinessAgreement",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "workerBusinessAgreement"
-        }
-    },
-    "properties": {
-        "id": {
-            "type": "number"
-        },
-        "name": {
-            "type": "string"
-        },
-        "monthHolidays": {
-            "type": "number"
-        },
-        "yearsHours": {
-            "type": "number"
-        },
-        "started": {
-            "type": "date"
-        },
-        "ended": {
-            "type": "date"
-        }
-    }
-}

modules/client/back/models/worker-business-type.json

@@ -1,27 +0,0 @@
-{
-    "name": "WorkerBusinessType",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "workerBusinessType"
-        }
-    },
-    "properties": {
-        "id": {
-            "type": "number",
-            "id": true
-        },
-        "name": {
-            "type": "string"
-        },
-        "isFullTime": {
-            "type": "number"
-        },
-        "isPermanent": {
-            "type": "number"
-        },
-        "hasHolidayEntitlement": {
-            "type": "number"
-        }
-    }
-}

modules/route/back/methods/vehicle/filter.js

@@ -0,0 +1,128 @@
+const {ParameterizedSQL} = require('loopback-connector');
+const {buildFilter, mergeFilters} = require('vn-loopback/util/filter');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('filter', {
+        description: 'Find all instances of the model matched by filter from the data source.',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'filter',
+            type: 'object',
+            description: 'Filter defining where, order, skip and limit - must be a JSON-encoded string',
+            http: {source: 'query'}
+        }, {
+            arg: 'search',
+            type: 'string',
+            description: 'Searchs the vehicle by id or numberPlate',
+            http: {source: 'query'}
+        }, {
+            arg: 'id',
+            type: 'number'
+        }, {
+            arg: 'description',
+            type: 'string'
+        }, {
+            arg: 'companyFk',
+            type: 'number'
+        }, {
+            arg: 'tradeMark',
+            type: 'string'
+        }, {
+            arg: 'numberPlate',
+            type: 'string'
+        }, {
+            arg: 'warehouseFk',
+            type: 'number'
+        }, {
+            arg: 'chassis',
+            type: 'string'
+        }, {
+            arg: 'leasing',
+            type: 'string'
+        }, {
+            arg: 'countryCodeFk',
+            type: 'string'
+        }, {
+            arg: 'vehicleTypeFk',
+            type: 'number'
+        }, {
+            arg: 'vehicleStateFk',
+            type: 'number'
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/filter`,
+            verb: `GET`
+        }
+    });
+
+    Self.filter = async(ctx, filter, options) => {
+        const conn = Self.dataSource.connector;
+        const myOptions = {};
+
+        if (typeof options == 'object') Object.assign(myOptions, options);
+
+        const where = buildFilter(ctx.args, (param, value) => {
+            switch (param) {
+            case 'search':
+                return {or: [{'v.id': value}, {numberPlate: {like: `%${value}%`}}]};
+            case 'id':
+                return {'v.id': value};
+            case 'description':
+            case 'tradeMark':
+            case 'numberPlate':
+            case 'chassis':
+            case 'leasing':
+                return {[param]: {like: `%${value}%`}};
+            case 'companyFk':
+            case 'warehouseFk':
+            case 'countryCodeFk':
+            case 'vehicleStateFk':
+            case 'vehicleTypeFk':
+                return {[param]: value};
+            }
+        });
+
+        filter = mergeFilters(filter, {where});
+
+        const stmt = new ParameterizedSQL(`
+            SELECT v.id,
+                    v.numberPlate,
+                    v.tradeMark,
+                    v.model,
+                    v.m3,
+                    v.description,
+                    v.isActive,
+                    v.countryCodeFk,
+                    v.chassis,
+                    v.leasing,
+                    vt.name type,
+                    w.name warehouse,
+                    c.code company,
+                    sub.state
+                FROM vehicle v
+                    JOIN vehicleType vt ON vt.id = v.vehicleTypeFk
+                    LEFT JOIN warehouse w ON w.id = v.warehouseFk
+                    LEFT JOIN company c ON c.id = v.companyFk
+                    LEFT JOIN (
+                        SELECT e.vehicleFk,
+                                e.vehicleStateFk,
+                                s.state,
+                                ROW_NUMBER() OVER (PARTITION BY e.vehicleFk ORDER BY e.started DESC) rn
+                        FROM vehicleEvent e
+                            LEFT JOIN vehicleState s ON e.vehicleStateFk = s.id
+                    ) sub ON sub.vehicleFk = v.id AND sub.rn = 1
+        `);
+
+        const sqlWhere = conn.makeWhere(filter.where);
+        stmt.merge(sqlWhere);
+        stmt.merge(conn.makePagination(filter));
+
+        const sql = ParameterizedSQL.join([stmt], ';');
+
+        return conn.executeStmt(sql, myOptions);
+    };
+};

modules/route/back/methods/vehicle/specs/filter.spec.js

@@ -0,0 +1,127 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('Vehicle filter()', () => {
+    const deliveryAssiId = 123;
+    const ctx = beforeAll.getCtx(deliveryAssiId);
+    let options;
+    let tx;
+
+    beforeEach(async() => {
+        ctx.args = {};
+        options = {};
+        tx = await models.Sale.beginTransaction({});
+        options.transaction = tx;
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
+
+    it('should return the vehicles matching "search"', async() => {
+        const {id} = await models.Vehicle.findById(1, null, options);
+        const {numberPlate} = await models.Vehicle.findById(2, null, options);
+
+        ctx.args = {search: id};
+        const [searchResult] = await models.Vehicle.filter(ctx);
+        ctx.args = {search: numberPlate};
+        const [searchResult2] = await models.Vehicle.filter(ctx);
+
+        expect(searchResult.id).toEqual(id);
+        expect(searchResult2.numberPlate).toEqual(numberPlate);
+    });
+
+    it('should return the vehicles matching "companyFk"', async() => {
+        const company = await models.Company.findOne({where: {code: 'VNL'}}, options);
+        ctx.args = {companyFk: company.id};
+        const searchResult = await models.Vehicle.filter(ctx, null, options);
+        searchResult.forEach(record => {
+            expect(record.company).toEqual(company.code);
+        });
+    });
+
+    it('should return the vehicles matching "tradeMark"', async() => {
+        const tradeMark = 'WAYNE INDUSTRIES';
+        ctx.args = {tradeMark};
+        const searchResult = await models.Vehicle.filter(ctx);
+        searchResult.forEach(record => {
+            expect(record.tradeMark).toEqual(tradeMark);
+        });
+    });
+
+    it('should return the vehicles matching "numberPlate"', async() => {
+        const {numberPlate} = await models.Vehicle.findById(1, null, options);
+        ctx.args = {numberPlate};
+
+        const searchResult = await models.Vehicle.filter(ctx);
+
+        searchResult.forEach(record => {
+            expect(record.numberPlate).toEqual(numberPlate);
+        });
+    });
+
+    it('should return the vehicles matching "warehouseFk"', async() => {
+        const warehouse = await models.Warehouse.findById(1, null, options);
+        ctx.args = {warehouseFk: warehouse.id};
+        const searchResult = await models.Vehicle.filter(ctx);
+        searchResult.forEach(record => {
+            expect(record.warehouse).toEqual(warehouse.name);
+        });
+    });
+
+    it('should return the vehicles matching "chassis"', async() => {
+        const {chassis} = await models.Vehicle.findById(1, null, options);
+        ctx.args = {chassis};
+        const [searchResult] = await models.Vehicle.filter(ctx);
+
+        expect(searchResult.chassis).toEqual(chassis);
+    });
+
+    it('should return the vehicles matching "leasing"', async() => {
+        const leasing = 'Wayne leasing';
+        ctx.args = {leasing};
+        const searchResult = await models.Vehicle.filter(ctx);
+        searchResult.forEach(record => {
+            expect(record.leasing).toEqual(leasing);
+        });
+    });
+
+    it('should return the vehicles matching "countryCodeFk"', async() => {
+        const countryCodeFk = 'ES';
+        ctx.args = {countryCodeFk};
+
+        const searchResult = await models.Vehicle.filter(ctx);
+        searchResult.forEach(record => {
+            expect(record.countryCodeFk).toEqual(countryCodeFk);
+        });
+    });
+
+    it('should return the vehicles matching "vehicleTypeFk"', async() => {
+        const {name, id} = await models.VehicleType.findById(1, null, options);
+        ctx.args = {vehicleTypeFk: id};
+
+        const searchResult = await models.Vehicle.filter(ctx);
+        searchResult.forEach(record => {
+            expect(record.type).toEqual(name);
+        });
+    });
+
+    it('should return the vehicles matching "vehicleStateFk"', async() => {
+        const {state, id} = await models.VehicleState.findById(3);
+        ctx.args = {vehicleStateFk: id};
+
+        const searchResult = await models.Vehicle.filter(ctx);
+        searchResult.forEach(record => {
+            expect(record.state).toEqual(state);
+        });
+    });
+
+    it('should return the vehicles matching "description"', async() => {
+        const {description} = await models.Vehicle.findById(2);
+        ctx.args = {description};
+
+        const searchResult = await models.Vehicle.filter(ctx);
+        searchResult.forEach(record => {
+            expect(record.description).toEqual(description);
+        });
+    });
+});

modules/route/back/model-config.json

@@ -5,12 +5,21 @@
     "AgencyTermConfig": {
         "dataSource": "vn"
     },
+    "BankPolicy": {
+        "dataSource": "vn"
+    },
     "Cmr": {
         "dataSource": "vn"
     },
     "DeliveryPoint": {
         "dataSource": "vn"
     },
+    "FuelType": {
+        "dataSource": "vn"
+    },
+    "Ppe": {
+        "dataSource": "vn"
+    },
     "RoadmapAddress": {
         "dataSource": "vn"
     },
@@ -35,6 +44,12 @@
     "Vehicle": {
         "dataSource": "vn"
     },
+    "VehicleState": {
+        "dataSource": "vn"
+    },
+    "VehicleType": {
+        "dataSource": "vn"
+    },
     "RoutesMonitor": {
         "dataSource": "vn"
     }

modules/route/back/models/bank-policy.json

@@ -1,19 +1,20 @@
 {
-    "name": "PayrollCategory",
+    "name": "BankPolicy",
     "base": "VnModel",
     "options": {
         "mysql": {
-            "table": "payrollCategories"
+            "table": "bankPolicy"
         }
     },
     "properties": {
         "id": {
-            "type": "number"
+            "type": "number",
+            "id": true
         },
-        "description": {
+        "ref": {
             "type": "string"
         },
-        "rate": {
+        "dmsFk": {
             "type": "number"
         }
     }

modules/route/back/models/fuel-type.json

@@ -0,0 +1,30 @@
+{
+    "name": "FuelType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "fuelType"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "name": {
+            "type": "string"
+        },
+        "code": {
+            "type": "string"
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        }
+    ]
+}

modules/route/back/models/ppe.json

@@ -0,0 +1,15 @@
+{
+    "name": "Ppe",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "ppe"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        }
+    }
+}

modules/route/back/models/vehicle-state.json

@@ -1,20 +1,21 @@
 {
-    "name": "WorkerBusinessProfessionalCategory",
+    "name": "VehicleState",
     "base": "VnModel",
     "options": {
         "mysql": {
-            "table": "professionalCategory"
+            "table": "vehicleState"
         }
     },
     "properties": {
         "id": {
+            "type": "number",
+            "id": true
+        },
+        "state": {
+            "type": "string"
+        },
+        "hasToNotify": {
             "type": "number"
-        },
-        "description": {
-            "type": "string"
-        },
-        "code": {
-            "type": "string"
         }
     }
 }

modules/route/back/models/vehicle-type.json

@@ -0,0 +1,19 @@
+{
+    "name": "VehicleType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "vehicleType"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "name": {
+            "type": "string"
+        }
+    }
+}

modules/route/back/models/vehicle.js

@@ -1,3 +1,4 @@
 module.exports = Self => {
     require('../methods/vehicle/sorted')(Self);
+    require('../methods/vehicle/filter')(Self);
 };

modules/route/back/models/vehicle.json

@@ -29,6 +29,39 @@
         },
         "isActive": {
             "type": "number"
+        },
+        "countryCodeFk": {
+            "type": "string"
+        },
+        "chassis": {
+            "type": "string"
+        },
+        "leasing": {
+            "type": "string"
+        },
+        "isKmTruckRate": {
+            "type": "number"
+        },
+        "fuelTypeFk": {
+            "type": "number"
+        },
+        "import": {
+            "type": "number"
+        },
+        "importCooler": {
+            "type": "number"
+        },
+        "vin": {
+            "type": "string"
+        },
+        "ppeFk": {
+            "type": "number"
+        },
+        "vehicleTypeFk": {
+            "type": "number"
+        },
+        "deliveryPointFk": {
+            "type": "number"
         }
     },
     "relations": {
@@ -46,21 +79,57 @@
             "type": "belongsTo",
             "model": "DeliveryPoint",
             "foreignKey": "deliveryPointFk"
+        },
+        "event": {
+            "type": "hasMany",
+            "model": "VehicleEvent",
+            "foreignKey": "vehicleFk",
+            "property": "id"
+        },
+        "supplier": {
+            "type": "belongsTo",
+            "model": "Supplier",
+            "foreignKey": "supplierFk"
+        },
+        "supplierCooler": {
+            "type": "belongsTo",
+            "model": "Supplier",
+            "foreignKey": "supplierCoolerFk"
+        },
+        "bankPolicy": {
+            "type": "belongsTo",
+            "model": "BankPolicy",
+            "foreignKey": "bankPolicyFk"
+        },
+        "fuelType": {
+            "type": "belongsTo",
+            "model": "FuelType",
+            "foreignKey": "fuelTypeFk"
+        },
+        "ppe": {
+            "type": "hasOne",
+            "model": "Ppe",
+            "foreignKey": "id",
+            "property": "ppeFk"
+        },
+        "type": {
+            "type": "hasOne",
+            "model": "VehicleType",
+            "foreignKey": "id",
+            "property": "vehicleTypeFk"
         }
     },
-    "scope": {
+    "scopes": {
+        "active": {
+            "fields": [
+                "id",
+                "numberPlate"
+            ],
             "where": {
                 "isActive": {
                     "neq": false
                 }
             }
-    },
-    "acls": [
-        {
-            "accessType": "READ",
-            "principalType": "ROLE",
-            "principalId": "$everyone",
-            "permission": "ALLOW"
         }
-    ]
+    }
 }

modules/worker/back/models/worker.js

@@ -1,4 +1,5 @@
 module.exports = Self => {
+    const validateTin = require('vn-loopback/util/validateTin');
     require('../methods/worker/filter')(Self);
     require('../methods/worker/mySubordinates')(Self);
     require('../methods/worker/isSubordinate')(Self);
@@ -22,10 +23,26 @@ module.exports = Self => {
     require('../methods/worker/getAvailablePda')(Self);
     require('../methods/worker/myTeam')(Self);
 
+    Self.validateAsync('fi', tinIsValid, {
+        message: 'Invalid TIN'
+    });
+
     Self.canModifyAbsenceInPast = async(ctx, time) => {
         const hasPrivs = await Self.app.models.ACL.checkAccessAcl(ctx, 'Worker', 'canModifyAbsenceInPast', 'WRITE');
         const today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
         return hasPrivs || today.getTime() < time;
     };
+
+    async function tinIsValid(err, done) {
+        const country = await Self.app.models.Country.findOne({
+            fields: ['code'],
+            where: {id: this.originCountryFk}
+        });
+        const code = country ? country.code.toLowerCase() : null;
+
+        if (!this.fi || !validateTin(this.fi, code))
+            err();
+        done();
+    }
 };

modules/worker/back/models/worker.json

@@ -75,9 +75,6 @@
         },
         "isSsDiscounted": {
             "type": "boolean"
-        },
-        "businessFk": {
-            "type": "number"
         }
     },
     "relations": {
@@ -106,11 +103,6 @@
             "model": "WorkerDepartment",
             "foreignKey": "id"
         },
-        "currentBusiness": {
-            "type": "belongsTo",
-            "model": "Business",
-            "foreignKey": "businessFk"
-        },
         "collegues": {
             "type": "hasMany",
             "model": "WorkerTeamCollegues",
@@ -121,11 +113,6 @@
             "model": "Locker",
             "foreignKey": "workerFk"
         },
-        "business": {
-            "type": "hasMany",
-            "model": "Business",
-            "foreignKey": "workerFk"
-        },
         "medicalReview": {
             "type": "hasMany",
             "model": "MedicalReview",
@@ -272,36 +259,12 @@
                             "relation": "department",
                             "scope": {
                                 "fields": [
-                                    "id"
+                                    "name"
                                 ]
                             }
                         }
                     }
                 },
-                {
-                    "relation": "business",
-                    "scope": {
-                        "fields": [
-                            "id",
-                            "started",
-                            "ended",
-                            "reasonEndFk",
-                            "departmentFk",
-                            "workerBusinessProfessionalCategoryFk"
-                        ],
-                        "include": [
-                            {
-                                "relation": "reasonEnd",
-                                "scope": {
-                                    "fields": [
-                                        "id",
-                                        "reason"
-                                    ]
-                                }
-                            }
-                        ]
-                    }
-                },
                 {
                     "relation": "boss",
                     "scope": {
@@ -349,8 +312,7 @@
                 "educationLevelFk",
                 "originCountryFk",
                 "maritalStatus",
-                "SSN",
-                "businessFk"
+                "SSN"
             ],
             "include": [
                 {
@@ -361,48 +323,6 @@
                             "phone"
                         ]
                     }
-                },
-                {
-                    "relation": "currentBusiness",
-                    "scope": {
-                        "fields": [
-                            "id",
-                            "started",
-                            "ended",
-                            "reasonEndFk",
-                            "departmentFk",
-                            "workerBusinessProfessionalCategoryFk"
-                        ],
-                        "include": [
-                            {
-                                "relation": "reasonEnd",
-                                "scope": {
-                                    "fields": [
-                                        "id",
-                                        "reason"
-                                    ]
-                                }
-                            },
-                            {
-                                "relation": "department",
-                                "scope": {
-                                    "fields": [
-                                        "id",
-                                        "name"
-                                    ]
-                                }
-                            },
-                            {
-                                "relation": "workerBusinessProfessionalCategory",
-                                "scope": {
-                                    "fields": [
-                                        "id",
-                                        "description"
-                                    ]
-                                }
-                            }
-                        ]
-                    }
                 }
             ]
         }