Merge branch 'dev' of https://git.verdnatura.es/salix into dev

client/item/src/history/item-history.html

@@ -1,4 +1,4 @@
-<mg-ajax path="/item/api/Items/getLog" options="vnIndex"></mg-ajax>
+<mg-ajax path="/item/api/ItemLogs/getLog" options="vnIndex"></mg-ajax>
 <vn-card pad-medium>
     <vn-vertical pad-medium>
         <vn-title vn-one margin-large-bottom>Item history</vn-title>
@@ -14,8 +14,8 @@
                 class="list list-element text-center" 
                 pad-small-bottom 
                 ng-repeat="itemLog in index.model.instances track by itemLog.id">
-                <vn-one pad-medium-h>{{::itemLog.originFk}}</vn-one>
-                <vn-two pad-medium-h>{{::itemLog.userFk}}</vn-two>
+                <vn-one pad-medium-h>{{::itemLog.origin.name}}</vn-one>
+                <vn-two pad-medium-h>{{::itemLog.user.name}}</vn-two>
                 <vn-one pad-medium-h>{{::itemLog.action}}</vn-one>
                 <vn-one pad-medium-h>{{::itemLog.creationDate | date:'dd/MM/yyyy HH:mm'}}</vn-one>
                 <vn-one pad-medium-h>{{::itemLog.description}}</vn-one>

gulpfile.js

@@ -122,10 +122,10 @@ gulp.task('docker-compose', async () => {
     let services = await getServices();
 
     for (let service of services) {
-        let dockerFile = `${__dirname}/Dockerfile`;
+        let dockerFile = `${__dirname}/${service.name}/Dockerfile`;
 
-        if (await fs.exists(`./services/${service.name}/Dockerfile`))
-            dockerFile = 'Dockerfile';
+        // if (await fs.exists(`./services/${service.name}/Dockerfile`))
+        //    dockerFile = 'Dockerfile';
 
         composeYml.services[service.name] = {
             environment: ['NODE_ENV=${NODE_ENV}'],

services/item/common/methods/item/getLog.js

@@ -7,7 +7,13 @@ module.exports = Self => {
                 itemFk: params.itemFk
             },
             skip: (params.page - 1) * params.size,
-            limit: params.size
+            limit: params.size,
+            include: [{
+                relation: "origin"
+            },
+            {
+                relation: "user"
+            }]
         };
     }
 };

services/item/common/models/item.js

@@ -1,6 +1,5 @@
 module.exports = function(Self) {
     require('../methods/item/filter.js')(Self);
-    require('../methods/item/getLog.js')(Self);
 
     Self.validatesPresenceOf('name', {message: 'Cannot be blank'});
     Self.validatesPresenceOf('originFk', {message: 'Cannot be blank'});

services/item/common/models/itemLog.json

@@ -21,12 +21,12 @@
       }
     },
     "relations": {
-      "originFk": {
+      "origin": {
         "type": "belongsTo",
         "model": "Origin",
         "foreignKey": "originFk"
       },
-      "userFk": {
+      "user": {
         "type": "belongsTo",
         "model": "User",
         "foreignKey": "userFk"