Eliminate createTask. It's part of addTask

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 59c287504c5ab604411bd1a757b98d37db38cea7..ab0615593b321d90b574a3d04539a99d45a3a700 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -14,17 +14,28 @@ function splitN(str: string, delimiter: string, limit: number = MAX_SAFE_INTEGER
 }
 
 const Model = {
-  createTask: function (timestamp: string, description: string) {
+  addTask: function (timestamp: string, description: string) {
     const task = document.createElement("div");
     task.appendChild(document.createTextNode(description));
     task.setAttribute("class", "task");
     task.setAttribute("tabindex", "0");
     task.setAttribute("data-created", timestamp);
-    return task;
+    document.getElementById("tasks")!.appendChild(task);
+    task.focus();
   },
 
-  addTask: function (timestamp: string, description: string) {
-    document.body.appendChild(this.createTask(timestamp, description)).focus();
+  destroyTask: function (createTimestamp: string) {
+    const task = this.getTask(createTimestamp);
+    if (task) {
+      task.parentElement!.removeChild(task);
+    }
+  },
+
+  getPriority: function (task: Element): number {
+    if (task.hasAttribute("data-priority")) {
+      return parseFloat(task.getAttribute("data-priority")!);
+    }
+    return parseFloat(task.getAttribute("data-created")!);
   },
 
   getTask: function (createTimestamp: string) {
@@ -35,11 +46,19 @@ const Model = {
     }
   },
 
-  destroyTask: function (createTimestamp: string) {
-    const task = this.getTask(createTimestamp);
-    if (task) {
-      task.parentElement!.removeChild(task);
+  setPriority: function (createTimestamp: string, priority: number) {
+    const target = this.getTask(createTimestamp);
+    if (!target) return;
+    target.setAttribute("data-priority", `${priority}`);
+    for (const task of document.getElementsByClassName("task")) {
+      if (task !== target && this.getPriority(task) > priority) {
+        task.parentElement!.insertBefore(target, task);
+        target instanceof HTMLElement && target.focus();
+        return;
+      }
     }
+    document.getElementById("tasks")!.appendChild(target);
+    target instanceof HTMLElement && target.focus();
   },
 
   setState: function (stateTimestamp: string, createTimestamp: string, state: string) {
@@ -68,6 +87,10 @@ function Log(prefix: string = "vp-") {
         const [createTimestamp, state] = splitN(data, " ", 1);
         Model.setState(timestamp, createTimestamp, state);
       }
+      if (command == "Priority") {
+        const [createTimestamp, newPriority] = splitN(data, " ", 1);
+        Model.setPriority(createTimestamp, parseFloat(newPriority));
+      }
     },
 
     record: function (entry: string) {
@@ -100,6 +123,9 @@ const UI = {
   destroyTask: function (createTimestamp: string) {
     log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
   },
+  setPriority: function (createTimestamp: string, priority: number) {
+    log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${priority}`);
+  },
   setState: function (createTimestamp: string, state: string) {
     log.recordAndApply(`${Date.now()} State ${createTimestamp} ${state}`);
   },
@@ -125,21 +151,60 @@ const BrowserUI = {
     event.preventDefault();
   },
 
-  moveCursor: function (offset: number): boolean {
-    var active = document.activeElement;
-    if (offset === 1 && active) {
-      active = active.nextElementSibling;
-    }
-    if (offset === -1 && active) {
-      active = active.previousElementSibling;
+  visibleTaskAtOffset(task: Element, offset: number): Element {
+    var cursor: Element | null = task;
+    var valid_cursor = cursor;
+    const increment = offset / Math.abs(offset);
+    while (true) {
+      cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling;
+      if (!cursor || !(cursor instanceof HTMLElement)) break;
+      if (cursor.style.display !== "none") {
+        offset -= increment;
+        valid_cursor = cursor;
+      }
+      if (Math.abs(offset) < 0.5) break;
     }
-    if (active && active instanceof HTMLElement) {
-      active.focus();
+    return valid_cursor;
+  },
+
+  moveCursor: function (offset: number): boolean {
+    const active = document.activeElement;
+    if (!active) return false;
+    const dest = this.visibleTaskAtOffset(active, offset);
+    if (dest !== active && dest instanceof HTMLElement) {
+      dest.focus();
       return true;
     }
     return false;
   },
 
+  moveTask: function (offset: number) {
+    const active = document.activeElement;
+    if (!active) return;
+    const dest = this.visibleTaskAtOffset(active, offset);
+    if (dest === active) return; // Already extremal
+    var onePastDest: Element | null = this.visibleTaskAtOffset(dest, offset / Math.abs(offset));
+    if (onePastDest == dest) onePastDest = null; // Will become extremal
+    if (offset > 0) {
+      this.setPriority(active, dest, onePastDest);
+    } else {
+      this.setPriority(active, onePastDest, dest);
+    }
+  },
+
+  // Change task's priority to be between other tasks a and b.
+  setPriority: function (task: Element, a: Element | null, b: Element | null) {
+    const aPriority = a === null ? 0 : Model.getPriority(a);
+    const bPriority = b === null ? Date.now() : Model.getPriority(b);
+    console.assert(aPriority < bPriority, aPriority, "<", bPriority);
+    const span = bPriority - aPriority;
+    const newPriority = aPriority + 0.1 * span + 0.8 * span * Math.random();
+    console.assert(aPriority < newPriority && newPriority < bPriority, aPriority, "<", newPriority, "<", bPriority);
+    const newPriorityRounded = Math.round(newPriority);
+    const okToRound = aPriority < newPriorityRounded && newPriorityRounded < bPriority;
+    UI.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority);
+  },
+
   setState: function (state: string) {
     const createTimestamp = document.activeElement?.getAttribute("data-created");
     this.moveCursor(1) || this.moveCursor(-1);
@@ -151,6 +216,8 @@ function handleKey(event: any) {
   if (event.target.tagName !== "INPUT") {
     if (event.key == "j") return BrowserUI.moveCursor(1);
     if (event.key == "k") return BrowserUI.moveCursor(-1);
+    if (event.key == "J") return BrowserUI.moveTask(1);
+    if (event.key == "K") return BrowserUI.moveTask(-1);
     if (event.key == "n") return BrowserUI.focusTaskNameInput(event);
     if (event.key == "s") return BrowserUI.setState("someday-maybe");
     if (event.key == "w") return BrowserUI.setState("waiting");