merge

client/client/src/notes/index.html

@@ -3,7 +3,7 @@
         <vn-title>Notas</vn-title>
         <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">
-                    <div class="notes-date">{{n.creationTime | date:'dd/MM/yyyy HH:mm'}}</div>
+                    <div class="notes-date">{{n.created | date:'dd/MM/yyyy HH:mm'}}</div>
                     <div class="notes-date">{{n.employee.name}}</div>
                     <div>{{n.text}}</div>
                 </vn-auto>

client/client/src/notes/index.js

@@ -17,7 +17,7 @@ export const COMPONENT = {
         };
 
         this.getObservation = function(clientId) {
-            let json = JSON.stringify({where: {clientFk: this.client.id}, order: 'creationTime DESC'});
+            let json = JSON.stringify({where: {clientFk: this.client.id}, order: 'created DESC'});
             $http.get(`/client/api/clientObservations?filter=${json}`).then(
                 json => {
                     this.observations = json.data;

services/client/common/models/Client.json

@@ -19,9 +19,6 @@
     "socialName": {
       "type": "string"
     },
-    "creationTime": {
-      "type": "string"
-    },
     "contact": {
       "type": "string"
     },
@@ -96,6 +93,9 @@
     },
     "accountingAccount": {
       "type": "string"
+    },
+    "created": {
+      "type": "date"
     }
   },
   "validations": [],

services/client/common/models/ClientObservation.js

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

services/client/common/models/ClientObservation.json

@@ -16,7 +16,7 @@
       "type": "string",
       "description": "Text"
     },
-    "creationTime": {
+    "created": {
       "type": "date",
       "description": "Creation date and time"
     }