Show dates on non-todo-state tasks

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 6519cbfc4367a1f2290a5598b07f9f001d9a87c4..64799cfbdfa1cb06785d03164f5389d0df7acb4d 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -119,6 +119,15 @@ const Model = {
     }
   },
 
+  removeTag: function (createTimestamp: string, tagName: string) {
+    const task = this.getTask(createTimestamp);
+    if (!task) return null;
+    const tag = this.hasTag(task, tagName);
+    if (!tag) return;
+    task.removeChild(tag);
+    if (task instanceof HTMLElement) task.focus();
+  },
+
   setPriority: function (createTimestamp: string, priority: number): Element | null {
     const target = this.getTask(createTimestamp);
     if (!target) return null;
@@ -135,9 +144,20 @@ const Model = {
 
   setState: function (stateTimestamp: string, createTimestamp: string, state: string) {
     const task = this.getTask(createTimestamp);
-    if (task) {
-      task.setAttribute("data-state", state);
+    if (!task) return;
+    task.setAttribute("data-state", state);
+    var date = task.getElementsByClassName("statedate")[0];
+    if (state === "todo") {
+      task.removeChild(date);
+      return;
     }
+    if (!date) {
+      date = document.createElement("span");
+      date.classList.add("statedate");
+      task.insertBefore(date, task.firstChild);
+    }
+    const d = new Date(parseInt(stateTimestamp));
+    date.textContent = `${d.getFullYear()}-${`${d.getMonth() + 1}`.padStart(2, "0")}-${`${d.getDate()}`.padStart(2, "0")}`;
   },
 };
 
@@ -165,6 +185,10 @@ function Log(prefix: string = "vp-") {
         const [createTimestamp, tag] = splitN(data, " ", 1);
         return Model.addTag(createTimestamp, tag);
       }
+      if (command == "Untag") {
+        const [createTimestamp, tag] = splitN(data, " ", 1);
+        return Model.removeTag(createTimestamp, tag);
+      }
     },
 
     record: function (entry: string) {
@@ -199,13 +223,17 @@ function UI() {
       return <Element>log.recordAndApply(`${now} Create ${description}`);
     },
     addTag: function (createTimestamp: string, tag: string) {
-      // TODO: undo
+      undoLog.push(`Untag ${createTimestamp} ${tag}`);
       return log.recordAndApply(`${clock.now()} Tag ${createTimestamp} ${tag}`);
     },
     edit: function (createTimestamp: string, newDescription: string, oldDescription: string) {
       undoLog.push(`Edit ${createTimestamp} ${oldDescription}`);
       return log.recordAndApply(`${clock.now()} Edit ${createTimestamp} ${newDescription}`);
     },
+    removeTag: function (createTimestamp: string, tag: string) {
+      undoLog.push(`Tag ${createTimestamp} ${tag}`);
+      return log.recordAndApply(`${clock.now()} Untag ${createTimestamp} ${tag}`);
+    },
     setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) {
       undoLog.push(`Priority ${createTimestamp} ${oldPriority}`);
       return log.recordAndApply(`${clock.now()} Priority ${createTimestamp} ${newPriority}`);
@@ -245,7 +273,7 @@ function BrowserUI() {
       }
       input.value = "";
       if (event.getModifierState("Control")) {
-        this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+        this.makeTopPriority(task);
       }
     },
 
@@ -339,6 +367,12 @@ function BrowserUI() {
       return valid_cursor;
     },
 
+    makeTopPriority: function (task: Element | null = null) {
+      if (!task) task = document.activeElement;
+      if (!task) return;
+      this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+    },
+
     moveCursor: function (offset: number): boolean {
       const active = document.activeElement;
       if (!active) return false;
@@ -364,6 +398,17 @@ function BrowserUI() {
       }
     },
 
+    removeTag: function () {
+      var target = document.activeElement;
+      if (!target) return;
+      if (target.classList.contains("task")) {
+        const tags = target.getElementsByClassName("tag");
+        target = tags[tags.length - 1];
+      }
+      if (!target || !target.classList.contains("tag")) return;
+      ui.removeTag(target.parentElement!.getAttribute("data-created")!, target.textContent!);
+    },
+
     returnFocusAfterInput: function (): boolean {
       if (taskFocusedBeforeJumpingToInput) {
         taskFocusedBeforeJumpingToInput.focus();
@@ -417,10 +462,12 @@ function BrowserUI() {
 const browserUI = BrowserUI();
 
 enum InputState {
-  Command,
-  View,
+  Root,
+  S,
+  V,
+  VS,
 }
-var inputState = InputState.Command;
+var inputState = InputState.Root;
 
 function handleKey(event: any) {
   if (event.target.tagName === "INPUT") {
@@ -435,30 +482,39 @@ function handleKey(event: any) {
       if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort);
     }
   } else {
-    if (inputState === InputState.Command) {
+    if (inputState === InputState.Root) {
       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 == "T") return browserUI.makeTopPriority();
       if (event.key == "n") return browserUI.focusTaskNameInput(event);
       if (event.key == "c") return browserUI.setState("cancelled");
       if (event.key == "d") return browserUI.setState("done");
       if (event.key == "q") return browserUI.setState("todo");
-      if (event.key == "s") return browserUI.setState("someday-maybe");
+      if (event.key == "s") return (inputState = InputState.S);
       if (event.key == "w") return browserUI.setState("waiting");
       if (event.key == "X") return browserUI.setState("deleted");
+      if (event.key == "x") return browserUI.removeTag();
       if (event.key == "u") return browserUI.undo();
       if (event.key == "e") return browserUI.beginEdit(event);
       if (event.key == "t") return browserUI.beginTagEdit(event);
-      if (event.key == "v") return (inputState = InputState.View);
-    } else if (inputState === InputState.View) {
-      inputState = InputState.Command;
+      if (event.key == "v") return (inputState = InputState.V);
+    } else if (inputState === InputState.S) {
+      inputState = InputState.Root;
+      if (event.key == "m") return browserUI.setState("someday-maybe");
+    } else if (inputState === InputState.V) {
+      inputState = InputState.Root;
       if (event.key == "c") return browserUI.setView("cancelled", "Red");
       if (event.key == "d") return browserUI.setView("done", "LawnGreen");
       if (event.key == "q") return browserUI.setView("todo", "White");
-      if (event.key == "s") return browserUI.setView("someday-maybe", "DeepSkyBlue");
+      if (event.key == "s") return (inputState = InputState.VS);
+      if (event.key == "v") return browserUI.setView("todo", "White");
       if (event.key == "w") return browserUI.setView("waiting", "MediumOrchid");
       if (event.key == "x") return browserUI.setView("deleted", "Black");
+    } else if (inputState === InputState.VS) {
+      inputState = InputState.Root;
+      if (event.key == "m") return browserUI.setView("someday-maybe", "DeepSkyBlue");
     }
   }
 }