X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/09657615b47a9634b20a1ab5abf2172d1575f56c..9f6be65ee10f3cfd4ad55b7326e8fb35fc78151a:/vopamoi.ts?ds=sidebyside

diff --git a/vopamoi.ts b/vopamoi.ts
index 56c4813..a98a29b 100644
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -14,17 +14,25 @@ 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): Element {
     const task = document.createElement("div");
     task.appendChild(document.createTextNode(description));
     task.setAttribute("class", "task");
     task.setAttribute("tabindex", "0");
     task.setAttribute("data-created", timestamp);
+    document.getElementById("tasks")!.appendChild(task);
     return task;
   },
 
-  addTask: function (timestamp: string, description: string) {
-    document.body.appendChild(this.createTask(timestamp, description)).focus();
+  getPriority: function (task: Element): number {
+    if (task.hasAttribute("data-priority")) {
+      return parseFloat(task.getAttribute("data-priority")!);
+    }
+    return parseFloat(task.getAttribute("data-created")!);
+  },
+
+  getState: function (task: Element): string {
+    return task.getAttribute("data-state") ?? "todo";
   },
 
   getTask: function (createTimestamp: string) {
@@ -35,37 +43,61 @@ const Model = {
     }
   },
 
-  destroyTask: function (createTimestamp: string) {
+  setPriority: function (createTimestamp: string, priority: number): Element | null {
+    const target = this.getTask(createTimestamp);
+    if (!target) return null;
+    target.setAttribute("data-priority", `${priority}`);
+    for (const task of document.getElementsByClassName("task")) {
+      if (task !== target && this.getPriority(task) > priority) {
+        task.parentElement!.insertBefore(target, task);
+        return target;
+      }
+    }
+    document.getElementById("tasks")!.appendChild(target);
+    return target;
+  },
+
+  setState: function (stateTimestamp: string, createTimestamp: string, state: string) {
     const task = this.getTask(createTimestamp);
-    task!.parentElement!.removeChild(task!);
+    if (task) {
+      task.setAttribute("data-state", state);
+      if (task instanceof HTMLElement) {
+        task.style.display = state == "todo" ? "block" : "none"; // Until view filtering
+      }
+    }
   },
 };
 
-const Log = (function () {
+function Log(prefix: string = "vp-") {
   var next_log_index = 0;
   return {
     apply: function (entry: string) {
       const [timestamp, command, data] = splitN(entry, " ", 2);
       if (command == "Create") {
-        Model.addTask(timestamp, data);
+        return Model.addTask(timestamp, data);
       }
-      if (command == "Destroy") {
-        Model.destroyTask(data.split(" ", 1)[0]);
+      if (command == "State") {
+        const [createTimestamp, state] = splitN(data, " ", 1);
+        return Model.setState(timestamp, createTimestamp, state);
+      }
+      if (command == "Priority") {
+        const [createTimestamp, newPriority] = splitN(data, " ", 1);
+        return Model.setPriority(createTimestamp, parseFloat(newPriority));
       }
     },
 
     record: function (entry: string) {
-      window.localStorage.setItem(`${next_log_index++}`, entry);
+      window.localStorage.setItem(`${prefix}${next_log_index++}`, entry);
     },
 
     recordAndApply: function (entry: string) {
       this.record(entry);
-      this.apply(entry);
+      return this.apply(entry);
     },
 
     replay: function () {
       while (true) {
-        const entry = window.localStorage.getItem(`${next_log_index}`);
+        const entry = window.localStorage.getItem(`${prefix}${next_log_index}`);
         if (entry === null) {
           break;
         }
@@ -74,62 +106,147 @@ const Log = (function () {
       }
     },
   };
-})();
+}
+const log = Log();
+
+const undoLog: string[] = [];
 
 const UI = {
-  addTask: function (description: string) {
-    Log.recordAndApply(`${Date.now()} Create ${description}`);
+  addTask: function (description: string): Element {
+    const now = Date.now();
+    undoLog.push(`State ${now} deleted`);
+    return <Element>log.recordAndApply(`${now} Create ${description}`);
   },
-  destroyTask: function (createTimestamp: string) {
-    Log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
+  setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) {
+    undoLog.push(`Priority ${createTimestamp} ${oldPriority}`);
+    return log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${newPriority}`);
+  },
+  setState: function (createTimestamp: string, newState: string, oldState: string) {
+    undoLog.push(`State ${createTimestamp} ${oldState}`);
+    return log.recordAndApply(`${Date.now()} State ${createTimestamp} ${newState}`);
+  },
+  undo: function () {
+    if (undoLog.length > 0) {
+      return log.recordAndApply(`${Date.now()} ${undoLog.pop()}`);
+    }
   },
 };
 
 const BrowserUI = {
-  addTask: function (form: any) {
-    if (form.taskName.value) {
-      UI.addTask(form.taskName.value);
-      form.taskName.value = "";
+  addTask: function (event: KeyboardEvent) {
+    const input = <HTMLInputElement>document.getElementById("taskName");
+    if (input.value) {
+      const task = UI.addTask(input.value);
+      if (task && task instanceof HTMLElement) task.focus();
+      input.value = "";
+      if (event.getModifierState("Control")) {
+        this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+      }
     }
-    return false;
   },
 
-  destroyTask: function () {
-    const createTimestamp = document.activeElement?.getAttribute("data-created");
-    return createTimestamp && UI.destroyTask(createTimestamp);
+  firstVisibleTask: function () {
+    for (const task of document.getElementsByClassName("task")) {
+      if (task instanceof HTMLElement && task.style.display !== "none") {
+        return task;
+      }
+    }
   },
 
-  focusTaskNameInput: function (event: any) {
+  focusTaskNameInput: function (event: Event) {
     document.getElementById("taskName")!.focus();
     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, Model.getPriority(task));
+    task instanceof HTMLElement && task.focus();
+  },
+
+  setState: function (state: string) {
+    const task = document.activeElement;
+    if (!task) return;
+    const createTimestamp = task.getAttribute("data-created")!;
+    this.moveCursor(1) || this.moveCursor(-1);
+    return UI.setState(createTimestamp, state, Model.getState(task));
+  },
+
+  undo: function () {
+    const ret = UI.undo();
+    if (ret && ret instanceof HTMLElement) ret.focus();
+  },
 };
 
 function handleKey(event: any) {
-  if (event.target.tagName !== "INPUT") {
+  if (event.target.tagName === "INPUT") {
+    if (event.key == "Enter") return BrowserUI.addTask(event);
+  } else {
     if (event.key == "j") return BrowserUI.moveCursor(1);
     if (event.key == "k") return BrowserUI.moveCursor(-1);
-    if (event.key == "c") return BrowserUI.focusTaskNameInput(event);
-    if (event.key == "X") return BrowserUI.destroyTask();
+    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");
+    if (event.key == "d") return BrowserUI.setState("done");
+    if (event.key == "c") return BrowserUI.setState("cancelled");
+    if (event.key == "X") return BrowserUI.setState("deleted");
+    if (event.key == "u") return BrowserUI.undo();
   }
 }
 
 function browserInit() {
   document.body.addEventListener("keydown", handleKey, { capture: false });
-  Log.replay();
+  log.replay();
+  BrowserUI.firstVisibleTask()?.focus();
 }