From 68a72fde2851bd9c176b8862708b71707c1d3ea1 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 26 Jan 2022 12:55:28 -0800 Subject: [PATCH 1/1] Re-order tasks --- vopamoi.ts | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/vopamoi.ts b/vopamoi.ts index 725f3a0..b899c71 100644 --- a/vopamoi.ts +++ b/vopamoi.ts @@ -34,6 +34,13 @@ const Model = { } }, + 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) { for (const task of document.getElementsByClassName("task")) { if (task.getAttribute("data-created") === createTimestamp) { @@ -42,6 +49,21 @@ const Model = { } }, + 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) { const task = this.getTask(createTimestamp); if (task) { @@ -68,6 +90,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 +126,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}`); }, @@ -152,6 +181,33 @@ const BrowserUI = { 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); @@ -163,6 +219,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"); -- 2.44.1