fixes to the positioning after creating notes and moving them around

Author: zadam

.pylintrc

@@ -0,0 +1,6 @@
+- drag and drop for notes (currently only keyboard)
+- authentication with credentials in the config file (password hashed and salted)
+- sync with sync server
+- remembering open and closed folders
+- link to individual notes (and changing the URL to current one, probably through # anchor)
+- when loading the app, open last viewed note

LICENSE

@@ -99,6 +99,17 @@ def put(self, note_id):
 
         return {}
 
+    def delete(self, note_id):
+        children = getResults("select note_id from notes_tree where note_pid = ?", [note_id])
+
+        for child in children:
+            self.delete(child['note_id'])
+
+        delete("notes_tree", note_id)
+        delete("notes", note_id)
+
+        conn.commit()
+
 api.add_resource(Notes, '/notes/<string:note_id>')
 
 class NotesChildren(Resource):
@@ -107,7 +118,29 @@ def post(self, parent_note_id):
 
         noteId = ''.join(random.SystemRandom().choice(string.ascii_uppercase + string.digits) for _ in range(22))
 
-        now = math.floor(time.time());
+        if parent_note_id == "root":
+            parent_note_id = ""
+
+        new_note_pos = 0
+
+        if note['target'] == 'into':
+            res = getSingleResult('select max(note_pos) as max_note_pos from notes_tree where note_pid = ?', [parent_note_id])
+            max_note_pos = res['max_note_pos']
+
+            if max_note_pos is None: # no children yet
+                new_note_pos = 0
+            else:
+                new_note_pos = max_note_pos + 1
+        elif note['target'] == 'after':
+            after_note = getSingleResult('select note_pos from notes_tree where note_id = ?', [note['target_note_id']])
+
+            new_note_pos = after_note['note_pos'] + 1
+
+            execute('update notes_tree set note_pos = note_pos + 1 where note_pid = ? and note_pos > ?', [parent_note_id, after_note['note_pos']])
+        else:
+            raise Exception('Unknown target: ' + note['target'])
+
+        now = math.floor(time.time())
 
         insert("notes", {
             'note_id': noteId,
@@ -120,13 +153,10 @@ def post(self, parent_note_id):
             'is_finished': 0
         })
 
-        if parent_note_id == "root":
-            parent_note_id = ""
-
         insert("notes_tree", {
             'note_id': noteId,
             'note_pid': parent_note_id,
-            'note_pos': 0,
+            'note_pos': new_note_pos,
             'is_expanded': 0
         })
 
@@ -143,15 +173,39 @@ def put(self, note_id, after_note_id):
         after_note = getSingleResult("select * from notes_tree where note_id = ?", [after_note_id])
 
         if after_note <> None:
+            execute("update notes_tree set note_pos = note_pos + 1 where note_pid = ? and note_pos > ?", [after_note['note_pid'], after_note['note_pos']])
+
             execute("update notes_tree set note_pid = ?, note_pos = ? where note_id = ?", [after_note['note_pid'], after_note['note_pos'] + 1, note_id])
 
             conn.commit()
 
 api.add_resource(MoveAfterNote, '/notes/<string:note_id>/moveAfter/<string:after_note_id>')
 
+class MoveBeforeNote(Resource):
+    def put(self, note_id, before_note_id):
+        before_note = getSingleResult("select * from notes_tree where note_id = ?", [before_note_id])
+
+        if before_note <> None:
+            execute("update notes_tree set note_pos = note_pos + 1 where note_id = ?", [before_note_id])
+
+            execute("update notes_tree set note_pid = ?, note_pos = ? where note_id = ?", [before_note['note_pid'], before_note['note_pos'], note_id])
+
+            conn.commit()
+
+api.add_resource(MoveBeforeNote, '/notes/<string:note_id>/moveBefore/<string:before_note_id>')
+
 class MoveToNote(Resource):
     def put(self, note_id, parent_id):
-        execute("update notes_tree set note_pid = ? where note_id = ?", [parent_id, note_id])
+        res = getSingleResult('select max(note_pos) as max_note_pos from notes_tree where note_pid = ?', [parent_id])
+        max_note_pos = res['max_note_pos']
+        new_note_pos = 0
+
+        if max_note_pos is None: # no children yet
+            new_note_pos = 0
+        else:
+            new_note_pos = max_note_pos + 1
+
+        execute("update notes_tree set note_pid = ?, note_pos = ? where note_id = ?", [parent_id, new_note_pos, note_id])
 
         conn.commit()
 

TODO

@@ -258,22 +258,44 @@
               "insert": function(node) {
                 let parentKey = (node.getParent() == null || node.getParent().key == "root_1") ? "root" : node.getParent().key;
 
-                createNote(parentKey);
+                createNote(node, parentKey, 'after');
               },
               "shift+insert": function(node) {
-                createNote(node.key);
+                createNote(node, node.key, 'into');
               },
               "del": function(node) {
-                node.remove();
+                if (confirm('Are you sure you want to delete note "' + node.title + '"?')) {
+                  $.ajax({
+                      url: baseUrl + 'notes/' + node.key,
+                      type: 'DELETE',
+                      success: function(result) {
+                        node.remove();
+                      }
+                  });
+                }
               },
               "shift+up": function(node) {
                 if (node.getPrevSibling() != null) {
-                  node.moveTo(node.getPrevSibling(), 'before');
+                  $.ajax({
+                      url: baseUrl + 'notes/' + node.key + '/moveBefore/' + node.getPrevSibling().key,
+                      type: 'PUT',
+                      contentType: "application/json",
+                      success: function(result) {
+                        node.moveTo(node.getPrevSibling(), 'before');
+                      }
+                  });
                 }
               },
               "shift+down": function(node) {
                 if (node.getNextSibling() != null) {
-                  node.moveTo(node.getNextSibling(), 'after');
+                  $.ajax({
+                      url: baseUrl + 'notes/' + node.key + '/moveAfter/' + node.getNextSibling().key,
+                      type: 'PUT',
+                      contentType: "application/json",
+                      success: function(result) {
+                        node.moveTo(node.getNextSibling(), 'after');
+                      }
+                  });
                 }
               },
               "shift+left": function(node) {
@@ -325,22 +347,31 @@
     });
   }
 
-  function createNote(parentKey) {
+  function createNote(node, parentKey, target) {
       let newNoteName = "new note";
 
       $.ajax({
         url: baseUrl + 'notes/' + parentKey + '/children' ,
         type: 'POST',
         data: JSON.stringify({
-          note_title: newNoteName
+          note_title: newNoteName,
+          target: target,
+          target_note_id: node.key
         }),
         contentType: "application/json",
         success: function(result) {
-          node.appendSibling({
+          let newNode = {
             "title": newNoteName,
             "key": result.note_id,
             "note_id": result.note_id
-          }).setActive(true);
+          };
+
+          if (target == 'after') {
+            node.appendSibling(newNode).setActive(true);
+          }
+          else {
+            node.addChildren(newNode).setActive(true);
+          }
 
           message("Created!");
         }