db/dump/fixtures.before.sql

@@ -849,14 +849,14 @@ 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`, `chassis`, `leasing`)
+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, 'XCSC133C60', 'Wayne leasing'),
+        (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, '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, '', ''),
+        (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, '', ''),
+        (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, '', ''),
+        (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, '', '');
+        (6, '5555-IMK', 'STARK INDUSTRIES', 'MARK-XLV',  442, 1, 'Iron-Man Heavy Armor MARK-XLV',  12, 0, 1, '', '', 442, 5, null);
 
 INSERT INTO `vn`.`config`(`id`, `mdbServer`, `fakeEmail`, `defaultersMaxAmount`, `inventoried`)
     VALUES
@@ -4064,4 +4064,18 @@ INSERT INTO vn.vehicleEvent (started, finished, vehicleStateFk, description, veh
 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);
+    ('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);

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

@@ -1,4 +1,5 @@
 INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
-	VALUES('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'delivery'),
+	VALUES ('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'delivery'),
 			('Vehicle', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'delivery'),
+			('BankPolicy', 'find', 'READ', 'ALLOW', 'ROLE', 'delivery'),
 			('Vehicle', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');

modules/route/back/model-config.json

@@ -5,12 +5,18 @@
     "AgencyTermConfig": {
         "dataSource": "vn"
     },
+    "BankPolicy": {
+        "dataSource": "vn"
+    },
     "Cmr": {
         "dataSource": "vn"
     },
     "DeliveryPoint": {
         "dataSource": "vn"
     },
+    "FuelType": {
+        "dataSource": "vn"
+    },
     "RoadmapAddress": {
         "dataSource": "vn"
     },

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

@@ -0,0 +1,18 @@
+{
+    "name": "BankPolicy",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "bankPolicy"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "ref": {
+            "type": "string"
+        }
+    }
+}

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": "employee",
+            "permission": "ALLOW"
+        }
+    ]
+}

modules/route/back/models/vehicle.json

@@ -41,6 +41,15 @@
         },
         "isKmTruckRate": {
             "type": "number"
+        },
+        "fuelTypeFk": {
+            "type": "number"
+        },
+        "import": {
+            "type": "number"
+        },
+        "vin": {
+            "type": "string"
         }
     },
     "relations": {
@@ -64,6 +73,26 @@
             "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"
         }
     },
     "scope": {