Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix

@salix/crud/src/client/new-note/index.js

@@ -12,21 +12,22 @@ export const COMPONENT = {
         var self = this;
         
         var deregister = $transitions.onStart({ }, callback);
-
+        copyNote();
+    
         this.submit = function() {
             if (this.note) {
                 let observation = this.createNote();
                 $http.post('/client/api/ClientObservations', observation).then(
                     json => {
                         this.note = json.data;
-                        this.copyNote();
+                        copyNote();
                         $state.go('clientCard.notes');                        
                     }
                 );
             }
         };
 
-        this.$onDestroy = function() {
+        this.$onDestroy = () => {
             deregister();
         };
 
@@ -44,9 +45,9 @@ export const COMPONENT = {
             }
         }
 
-        this.copyNote = () => {
+        function copyNote() {
-            this.noteOld = {}
+            self.noteOld = {};
-            copyObject(this.note, this.noteOld);
+            copyObject(self.note, self.noteOld);
         }
     }
 };

@salix/crud/src/client/notes/index.html

@@ -1,10 +1,13 @@
 <vn-card ng-show="observation.observations.length" pad-medium>
     <vn-vertical pad-large>
         <vn-title>Notas</vn-title>
-        <div ng-repeat="n in observation.observations">
+        <vn-horizontal ng-repeat="n in observation.observations" margin-small-bottom style="align-items: center;">
-            <div class="notes-date">{{n.creationDate | date:'medium'}} {{n.salesPerson}}</div>
+                <vn-auto style="border-radius: .3em;" class="pad-small border-solid">
-            {{n.text}}
+                    <div class="notes-date">{{n.creationDate | date:'dd/MM/yyyy HH:mm'}}</div>
-        </div>
+                    <div class="notes-date">{{n.salesPerson}}</div>
+                    <div>{{n.text}}</div>
+                </vn-auto>
+            </vn-horizontal>
     </vn-vertical>
 </vn-card>
 <vn-float-button

@salix/crud/src/client/routes.js

@@ -57,9 +57,7 @@
         }, {
             url: "/new-note",
             state: "clientCard.newNote",
-            component: "vn-new-note",
+            component: "vn-new-note"
-            description: "Nueva nota",
-            icon: "insert_drive_file"
         },{
             url: "/create",
             state: "create",

services/client/common/models/Address.js

@@ -7,8 +7,8 @@ module.exports = function(Address) {
 
     Address.observe('before save', function (ctx, next) {
         var data = getData(ctx);
-        if (isEnabled(data) && isDefault(data)) {
+        if (data.isEnabled && data.default) {
-            updateData(ctx);    
+            ctx.Model.update({client: data.client}, {default: false}); 
         }
         next();
     });
@@ -20,15 +20,4 @@ module.exports = function(Address) {
             return ctx.instance;
     }
 
-    function isEnabled(data){
-        return data.isEnabled;
-    }
-
-    function isDefault(data){
-        return data.default;
-    }
-
-    function updateData(ctx){
-        ctx.Model.update({client: ctx.data.client}, {default: false}); 
-    }
 };

services/client/common/models/ClientObservation.js

@@ -6,16 +6,8 @@ module.exports = function(ClientObservation) {
     }
 
     ClientObservation.observe('before save', function (ctx, next) {
+        var loopback = require('loopback');
         ctx.instance.creationDate = Date();
         next();
     });
-
-    ClientObservation.on('attached', function() {
-        var override = ClientObservation.find;
-        ClientObservation.find = function(filter, callback) {
-            var elements =  override.apply(this, arguments);
-            //return elements;
-            elements = null;
-        }
-    });
 };