Merge branch 'develop'

adentes-org · Jun 18, 2016 · e8cf67b · e8cf67b
2 parents fe3e9ac + 82b0fe7
commit e8cf67b
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/www/assets/js/sofia.db.js b/www/assets/js/sofia.db.js
@@ -219,12 +219,24 @@ S.db.fiches = {
       }
     });
     $.each(n.events, function(id,val){
+      /*
       if ($.inArray(val,ret.events) === -1) { //Not found
         ret.events.push(val);
       }
+      */
+        var found = false;
+        var searching = JSON.stringify(val);
+        $.each(ret.events, function(i,v){
+          if(!found && JSON.stringify(v) === searching ){
+            found = true;
+          }
+        });
+        if(!found){
+          ret.events.push(val);
+        }
     });
     ret.events.sort(function(x, y){ //Order
-      return x.timestamp - y.timestamp; 
+      return x.timestamp - y.timestamp;
     });
     /* */
     ret._rev=o._rev;