refresh button

app/assets/javascripts/app/frontend/controllers/header.js

@@ -69,6 +69,16 @@ angular.module('app.frontend')
       }
     }
 
+    this.getLastRefreshDate = function() {
+      return apiController.lastRefreshDate;
+    }
+
+    this.refreshData = function() {
+      apiController.refreshItems(function(items){
+
+      })
+    }
+
     this.loginSubmitPressed = function() {
       this.loginData.status = "Generating Login Keys...";
       $timeout(function(){

app/assets/javascripts/app/frontend/controllers/home.js

@@ -7,6 +7,11 @@ angular.module('app.frontend')
       $scope.allTag = new Tag({all: true});
       $scope.allTag.content.title = "All";
       $scope.tags = modelManager.tags;
+      $scope.allTag.notes = modelManager.notes;
+
+      // setInterval(function () {
+      //   apiController.refreshItems(null);
+      // }, 1000);
 
       // apiController.verifyEncryptionStatusOfAllItems($scope.defaultUser, function(success){});
     }
@@ -28,7 +33,7 @@ angular.module('app.frontend')
     */
 
     $scope.updateAllTag = function() {
-      $scope.allTag.notes = modelManager.filteredNotes;
+      // $scope.allTag.notes = modelManager.notes;
     }
 
     $scope.tagsWillMakeSelection = function(tag) {
@@ -94,10 +99,7 @@ angular.module('app.frontend')
       if(!$scope.selectedTag.all) {
         modelManager.addTagToNote($scope.selectedTag, note);
         $scope.updateAllTag();
-      } else {
-        $scope.selectedTag.notes.unshift(note);
       }
-
     }
 
     /*
@@ -108,7 +110,6 @@ angular.module('app.frontend')
       modelManager.addDirtyItems(note);
 
       apiController.saveDirtyItems(function(){
-        modelManager.addNote(note);
         note.hasChanges = false;
 
         if(callback) {

app/assets/javascripts/app/services/apiController.js

@@ -236,10 +236,11 @@ angular.module('app.frontend')
         })
       }
 
-      this.refreshItems = function(updatedAfter, callback) {
+      this.refreshItems = function(callback) {
         var request = Restangular.one("users", this.user.uuid).one("items");
-        request.get(updatedAfter ? {"updated_after" : updatedAfter.toString()} : {})
+        request.get(this.lastRefreshDate ? {"updated_after" : this.lastRefreshDate.toString()} : {})
         .then(function(response){
+          this.lastRefreshDate = new Date();
           var items = this.handleItemsResponse(response.items, null);
           callback(items);
         }.bind(this))

app/assets/javascripts/app/services/itemManager.js

@@ -21,6 +21,7 @@ class ItemManager {
   }
 
   mapResponseItemsToLocalModelsOmittingFields(items, omitFields) {
+    console.log("map response items", items);
     var models = []
     for (var json_obj of items) {
       json_obj = _.omit(json_obj, omitFields || [])
@@ -75,7 +76,9 @@ class ItemManager {
   }
 
   addItem(item) {
-    this.items.push(item);
+    if(!this.findItem(item.uuid)) {
+      this.items.push(item);
+    }
   }
 
   // returns dirty item references that need saving

app/assets/javascripts/app/services/modelManager.js

@@ -11,6 +11,7 @@ class ModelManager extends ItemManager {
     super.resolveReferences()
 
     this.notes.push.apply(this.notes, _.difference(this.itemsForContentType("Note"), this.notes));
+    Item.sortItemsByDate(this.notes);
     this.notes.forEach(function(note){
       note.updateReferencesLocalMapping();
     })
@@ -48,7 +49,6 @@ class ModelManager extends ItemManager {
   addTag(tag) {
     this.tags.unshift(tag);
     this.addItem(tag);
-    console.log("adding tag", tag, "tags", this.tags);
   }
 
   addTagToNote(tag, note) {
@@ -84,9 +84,6 @@ class ModelManager extends ItemManager {
     this.addDirtyItems(dirty);
   }
 
-  filteredNotes() {
-    return Note.filterDummyNotes(this.notes);
-  }
 }
 
 angular.module('app.frontend').service('modelManager', ModelManager);