verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 66 Releases Wiki Activity

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

This commit is contained in:
Joan Sanchez 2018-02-07 15:33:46 +01:00
parent 433a0d1af4 3eed1e2124
commit b0842fa086
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/item/src/history/item-history.html
View File

@ -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-card pad-medium>
<vn-vertical pad-medium> <vn-vertical pad-medium>
<vn-title vn-one margin-large-bottom>Item history</vn-title> <vn-title vn-one margin-large-bottom>Item history</vn-title>
@ -14,8 +14,8 @@
class="list list-element text-center" class="list list-element text-center"
pad-small-bottom pad-small-bottom
ng-repeat="itemLog in index.model.instances track by itemLog.id"> ng-repeat="itemLog in index.model.instances track by itemLog.id">
<vn-one pad-medium-h>{{::itemLog.originFk}}</vn-one> <vn-one pad-medium-h>{{::itemLog.origin.name}}</vn-one>
<vn-two pad-medium-h>{{::itemLog.userFk}}</vn-two> <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.action}}</vn-one>
<vn-one pad-medium-h>{{::itemLog.creationDate | date:'dd/MM/yyyy HH:mm'}}</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> <vn-one pad-medium-h>{{::itemLog.description}}</vn-one>

6
gulpfile.js
View File

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

8
services/item/common/methods/item/getLog.js
View File

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

1
services/item/common/models/item.js
View File

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

4
services/item/common/models/itemLog.json
View File

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