Merge branch '1980-models_Thermograph' of verdnatura/salix into dev

db/changes/10130-christmas/00-catalog_componentCalculate.sql

@@ -125,13 +125,13 @@ proc: BEGIN
 	INSERT INTO tmp.ticketComponent
 		SELECT tcb.warehouseFk, 
                 tcb.itemFk, 
-                cr.id, 
+                c.id, 
-                GREATEST(IFNULL(ROUND(tcb.base * cr.tax, 4), 0), tcc.minPrice - tcc.rate3)
+                GREATEST(IFNULL(ROUND(tcb.base * c.tax, 4), 0), tcc.minPrice - tcc.rate3)
 			FROM tmp.ticketComponentBase tcb
-				JOIN componentRate cr
+				JOIN component c
 				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tcb.itemFk AND tcc.warehouseFk = tcb.warehouseFk 
 				LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
-			WHERE cr.id = vDiscountLastItemComponent AND cr.tax <> 0 AND tcc.minPrice < tcc.rate3 AND sp.value IS NULL;
+			WHERE c.id = vDiscountLastItemComponent AND c.tax <> 0 AND tcc.minPrice < tcc.rate3 AND sp.value IS NULL;
 	
 	INSERT INTO tmp.ticketComponent
 		SELECT tcc.warehouseFk, tcc.itemFk, vSellByPacketComponent, tcc.rate2 - tcc.rate3 
@@ -178,9 +178,9 @@ proc: BEGIN
 				vSpecialPriceComponent, 
 				sp.value - SUM(tcc.cost) sumCost
 			FROM tmp.ticketComponentCopy tcc
-				JOIN componentRate cr ON cr.id = tcc.componentFk
+				JOIN component c ON c.id = tcc.componentFk
 				JOIN specialPrice sp ON sp.clientFk = vClientFK AND sp.itemFk = tcc.itemFk
-			WHERE cr.classRate IS NULL
+			WHERE c.classRate IS NULL
 			GROUP BY tcc.itemFk, tcc.warehouseFk
 			HAVING ABS(sumCost) > 0.001;
 	
@@ -188,10 +188,10 @@ proc: BEGIN
 	CREATE TEMPORARY TABLE tmp.ticketComponentSum
 		(INDEX (itemFk, warehouseFk))
 		ENGINE = MEMORY
-		SELECT SUM(cost) sumCost, tc.itemFk, tc.warehouseFk, cr.classRate
+		SELECT SUM(cost) sumCost, tc.itemFk, tc.warehouseFk, c.classRate
 			FROM tmp.ticketComponent tc
-				JOIN componentRate cr ON cr.id = tc.componentFk
+				JOIN component c ON c.id = tc.componentFk
-			GROUP BY tc.itemFk, tc.warehouseFk, cr.classRate;
+			GROUP BY tc.itemFk, tc.warehouseFk, c.classRate;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentRate;
 	CREATE TEMPORARY TABLE tmp.ticketComponentRate ENGINE = MEMORY

db/changes/10140-kings/00-ACL.sql

@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Thermograph', '*', '*', 'ALLOW', 'ROLE', 'buyer');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('TravelThermograph', '*', '*', 'ALLOW', 'ROLE', 'buyer');
+ 

db/dump/fixtures.sql

@@ -1901,7 +1901,8 @@ INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `wa
         (1, 14, '1.txt',    'text/plain',   5, 1, 442, NULL,    FALSE, 'Ticket:11',      'Ticket:11 dms for the ticket',     CURDATE()),
         (2, 5,  '2.txt',    'text/plain',   5, 1, 442, 1,       TRUE, 'Client:104',      'Client:104 dms for the client',    CURDATE()),
         (3, 5,  '3.txt',    'text/plain',   5, 1, 442, NULL,    TRUE, 'Client: 104',     'Client:104 readme',                CURDATE()),
-        (4, 3,  '3.txt',    'text/plain',   5, 1, 442, NULL,    TRUE, 'Worker: 106',     'Worker:106 readme',                CURDATE());
+        (4, 3,  '4.txt',    'text/plain',   5, 1, 442, NULL,    TRUE, 'Worker: 106',     'Worker:106 readme',                CURDATE()),
+        (5, 5,  '5.txt',    'text/plain',   5, 1, 442, NULL,    TRUE, 'travel: 1',       'dmsForThermograph',                CURDATE());
 
 INSERT INTO `vn`.`ticketDms`(`ticketFk`, `dmsFk`)
     VALUES
@@ -1998,3 +1999,16 @@ INSERT INTO `vn`.`workerTimeControlParams` (`id`, `dayBreak`, `weekBreak`, `week
         (1, 43200, 129600, 734400, 43200, 50400);
 
 INSERT IGNORE INTO `vn`.`greugeConfig` (`id`, `freightPickUpPrice`) VALUES ('1', '11');
+
+INSERT INTO `vn`.`thermograph`(`id`, `model`)
+    VALUES
+        ('TMM190901395',    'TEMPMATE'),
+        ('TL.BBA85422',     'TL30'),
+        ('TZ1905012010',    'DISPOSABLE');
+
+INSERT INTO `vn`.`travelThermograph`(`thermographFk`, `created`, `warehouseFk`, `travelFk`, `temperature`, `result`, `dmsFk`)
+    VALUES
+        ('TMM190901395',    CURDATE(),                              1, 1, 'WARM', 'Ok', NULL),
+        ('TL.BBA85422',     DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 2, 2, 'COOL', 'Ok', NULL),
+        ('TL.BBA85422',     CURDATE(),                              2, 1, 'COOL', 'can not read the temperature', NULL),
+        ('TZ1905012010',    CURDATE(),                              1, 1, 'WARM', 'Temperature in range', 5);

modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js

@@ -7,7 +7,7 @@ describe('Client activeWorkersWithRole', () => {
 
         let isSalesPerson = await app.models.Account.hasRole(result[0].id, 'salesPerson');
 
-        expect(result.length).toEqual(13);
+        expect(result.length).toEqual(14);
         expect(isSalesPerson).toBeTruthy();
     });
 

modules/client/back/methods/client/specs/listWorkers.spec.js

@@ -6,7 +6,7 @@ describe('Client listWorkers', () => {
             .then(result => {
                 let amountOfEmployees = Object.keys(result).length;
 
-                expect(amountOfEmployees).toEqual(48);
+                expect(amountOfEmployees).toEqual(49);
                 done();
             })
             .catch(done.fail);

modules/client/front/web-access/index.spec.js

@@ -29,7 +29,7 @@ describe('Component VnClientWebAccess', () => {
     });
 
     describe('isCustomer()', () => {
-        it('should return a true if the password can be modified', () => {
+        it('should return true if the password can be modified', () => {
             controller.client = {id: '1234'};
 
             $httpBackend.expectGET(`Clients/${controller.client.id}/hasCustomerRole`).respond({isCustomer: true});

modules/travel/back/model-config.json

@@ -7,5 +7,9 @@
         "dataSource": "vn"
     },"Currency": {
         "dataSource": "vn"
+    },"Thermograph": {
+        "dataSource": "vn"
+    },"TravelThermograph": {
+        "dataSource": "vn"
     }
 }

modules/travel/back/models/thermograph.json

@@ -0,0 +1,19 @@
+{
+    "name": "Thermograph",
+	"base": "VnModel",
+    "options": {
+        "mysql": {
+        "table": "thermograph"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "String",
+            "id": true,
+            "description": "Identifier"
+        },
+        "model": {
+            "type": "String"
+        }
+    }
+}

modules/travel/back/models/travel-thermograph.json

@@ -0,0 +1,49 @@
+{
+    "name": "TravelThermograph",
+	"base": "VnModel",
+    "options": {
+        "mysql": {
+        "table": "travelThermograph"
+        }
+    },
+    "properties": {
+        "thermographFk": {
+            "type": "String",
+            "id": 1,
+            "description": "Identifier"
+        },
+        "created": {
+            "type": "Date",
+            "id": 2,
+            "description": "Identifier"
+        },
+        "temperature": {
+            "type": "String"
+        },
+        "result": {
+            "type": "String"
+        }
+    },
+    "relations": {
+        "travel": {
+            "type": "belongsTo",
+            "model": "Travel",
+            "foreignKey": "travelFk"
+        },
+        "warehouse": {
+            "type": "belongsTo",
+            "model": "Warehouse",
+            "foreignKey": "warehouseFk"
+        },
+        "dms": {
+            "type": "belongsTo",
+            "model": "Dms",
+            "foreignKey": "dmsFk"
+        },
+        "thermograph": {
+            "type": "belongsTo",
+            "model": "Thermograph",
+            "foreignKey": "thermographFk"
+        }
+    }
+}