Merge pull request '7195_roadmap2' (!2554) from 7195_roadmap2 into dev

Reviewed-on: #2554
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

back/models/warehouse.json

@@ -22,7 +22,7 @@
     "isInventory": {
       "type": "number"
     },
-    "isManaged":{
+    "isManaged": {
       "type": "boolean"
     },
     "countryFk": {
@@ -36,6 +36,13 @@
       "foreignKey": "countryFk"
     }
   },
+  "relations": {
+    "address": {
+      "type": "belongsTo",
+      "model": "Address",
+      "foreignKey": "addressFk"
+    }
+  },
   "acls": [
     {
       "accessType": "READ",
@@ -44,5 +51,11 @@
       "permission": "ALLOW"
     }
   ],
-  "scope" : {"where": {"isForTicket": {"neq": 0}}}
+  "scope": {
+    "where": {
+      "isForTicket": {
+        "neq": 0
+      }
+    }
+  }
 }

db/versions/11081-wheatRaphis/00-firstScript.sql

@@ -0,0 +1,8 @@
+-- Place your SQL code here
+
+USE vn;
+
+ALTER TABLE vn.roadmap ADD kmStart mediumint(9) DEFAULT NULL NULL;
+ALTER TABLE vn.roadmap ADD kmEnd mediumint(9) DEFAULT NULL NULL;
+ALTER TABLE vn.roadmap ADD started DATETIME NULL;
+ALTER TABLE vn.roadmap ADD finished DATETIME NULL;

modules/route/back/methods/roadmapStop/getPalletMatchState.js

@@ -0,0 +1,62 @@
+module.exports = Self => {
+    Self.remoteMethod('getPalletMatchState', {
+        description: 'Get list of pallet from truckFk with true or false if state is matched',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'truckFk',
+            type: 'number',
+            required: true,
+            description: 'The truckFk id'
+        },
+        {
+            arg: 'state',
+            type: 'string',
+            required: true,
+            description: 'State code'
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/getPalletMatchState`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getPalletMatchState = async(truckFk, state, options) => {
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const result = await Self.rawSql(`
+                        WITH tPallet AS(
+                            SELECT ep.id pallet, e.id expedition, e.stateTypeFk
+                                FROM vn.expeditionPallet ep 
+                                    JOIN vn.expeditionScan es ON es.palletFk = ep.id
+                                    JOIN expedition e ON e.id = es.expeditionFk 
+                                WHERE ep.truckFk = ?
+                        ),totalPalletExpedition AS(
+                                SELECT t.*, COUNT(expedition) totalPalletExpedition
+                                    FROM tPallet t
+                                    GROUP BY expedition
+                        ),totalPalletExpeditionCode AS(
+                                SELECT t.*, COUNT(expedition) totalPalletExpeditionCode
+                                    FROM tPallet t
+                                        JOIN vn.expeditionStateType est ON est.id = t.stateTypeFk 
+                                    WHERE code = ?
+                                    GROUP BY expedition
+                            )
+                        SELECT  t.pallet, 
+                                tpe.totalPalletExpedition = tpec.totalPalletExpeditionCode hasMatchStateCode
+                            FROM tPallet t
+                                LEFT JOIN totalPalletExpedition tpe ON tpe.expedition = t.expedition
+                                LEFT JOIN totalPalletExpeditionCode tpec ON tpec.expedition = t.expedition
+                            GROUP BY t.pallet;`,
+        [truckFk, state],
+        myOptions);
+
+        return result;
+    };
+};

modules/route/back/methods/roadmapStop/specs/getPalletMatchState.spec.js

@@ -0,0 +1,12 @@
+
+const {models} = require('vn-loopback/server/server');
+
+describe('roadMapStop getPalletMatchState()', () => {
+    it('should return list of pallet with true or false if state is matched', async() => {
+        const truckFk = 1;
+        const state = 'ON DELIVERY';
+        const result = await models.RoadmapStop.getPalletMatchState(truckFk, state);
+
+        expect(result[0].hasMatchStateCode).toBe(1);
+    });
+});

modules/route/back/models/roadmap.json

@@ -41,6 +41,18 @@
         },
         "driverName": {
             "type": "string"
+        },
+        "kmStart": {
+            "type": "number"
+        },
+        "kmEnd": {
+            "type": "number"
+        },
+        "started": {
+            "type": "date"
+        },
+        "finished": {
+            "type": "date"
         }
     },
     "relations": {
@@ -57,7 +69,7 @@
         "roadmapStop": {
             "type": "hasMany",
             "model": "RoadmapStop",
-            "foreignKey": "roadmapFk"
+            "foreignKey": "roadMapFk"
         }
     }
 }

modules/route/back/models/roadmapStop.js

@@ -0,0 +1,3 @@
+module.exports = Self => {
+    require('../methods/roadmapStop/getPalletMatchState')(Self);
+};

modules/route/back/models/roadmapStop.json

@@ -36,7 +36,7 @@
         },
         "address": {
             "type": "belongsTo",
-            "model": "Address",
+            "model": "RoadmapAddress",
             "foreignKey": "addressFk"
         }
     }