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

Errores solucionados

This commit is contained in:
Juan Ferrer Toribio 2017-05-12 13:58:08 +02:00
parent 34e0537b64
commit 88992438e2
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client/src/new-note/index.js
View File

@ -6,7 +6,7 @@ class Controller {
this.element = $element[0]; this.element = $element[0];
this.$state = $state; this.$state = $state;
this.note = { this.note = {
client: $state.params.id, clientFk: $state.params.id,
text: null text: null
}; };
} }

2
client/client/src/notes/index.html
View File

@ -4,7 +4,7 @@
<vn-horizontal ng-repeat="n in observation.observations" margin-small-bottom style="align-items: center;"> <vn-horizontal ng-repeat="n in observation.observations" margin-small-bottom style="align-items: center;">
<vn-auto style="border-radius: .3em;" class="pad-small border-solid"> <vn-auto style="border-radius: .3em;" class="pad-small border-solid">
<div class="notes-date">{{n.creationTime | date:'dd/MM/yyyy HH:mm'}}</div> <div class="notes-date">{{n.creationTime | date:'dd/MM/yyyy HH:mm'}}</div>
<div class="notes-date">{{n.employeeFk.name}}</div> <div class="notes-date">{{n.employee.name}}</div>
<div>{{n.text}}</div> <div>{{n.text}}</div>
</vn-auto> </vn-auto>
</vn-horizontal> </vn-horizontal>

1
services/client/common/models/ClientObservation.js
View File

@ -6,6 +6,7 @@ module.exports = function(ClientObservation) {
ClientObservation.observe('before save', function(ctx, next) { ClientObservation.observe('before save', function(ctx, next) {
ctx.instance.creationDate = Date(); ctx.instance.creationDate = Date();
ctx.instance.employeeFk = 20;
next(); next();
}); });
}; };

2
services/client/common/models/ClientObservation.json
View File

@ -42,6 +42,6 @@
} }
], ],
"scope": { "scope": {
"include": "employeeFk" "include": "employee"
} }
} }