Undo for task creation and reordering

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 7497e54afbda526bbe2fa47fdd2bfa8d9d93cf2e..a88408f639f3c8663ff16d92f38c4476741d93a3 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -25,13 +25,6 @@ const Model = {
     return task;
   },
 
     return task;
   },
 

-  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")!);
   getPriority: function (task: Element): number {
     if (task.hasAttribute("data-priority")) {
       return parseFloat(task.getAttribute("data-priority")!);


@@ -47,19 +40,20 @@ const Model = {
     }
   },
 
     }
   },
 

-  setPriority: function (createTimestamp: string, priority: number) {
+  setPriority: function (createTimestamp: string, priority: number): Element | null {

     const target = this.getTask(createTimestamp);
     const target = this.getTask(createTimestamp);

-    if (!target) return;
+    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);
         target instanceof HTMLElement && target.focus();
     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;
+        return target;

       }
     }
     document.getElementById("tasks")!.appendChild(target);
     target instanceof HTMLElement && target.focus();
       }
     }
     document.getElementById("tasks")!.appendChild(target);
     target instanceof HTMLElement && target.focus();

+    return target;

   },
 
   setState: function (stateTimestamp: string, createTimestamp: string, state: string) {
   },
 
   setState: function (stateTimestamp: string, createTimestamp: string, state: string) {


@@ -81,9 +75,6 @@ function Log(prefix: string = "vp-") {
       if (command == "Create") {
         return Model.addTask(timestamp, data);
       }
       if (command == "Create") {
         return Model.addTask(timestamp, data);
       }

-      if (command == "Destroy") {
-        return Model.destroyTask(data.split(" ", 1)[0]);
-      }

       if (command == "State") {
         const [createTimestamp, state] = splitN(data, " ", 1);
         return Model.setState(timestamp, createTimestamp, state);
       if (command == "State") {
         const [createTimestamp, state] = splitN(data, " ", 1);
         return Model.setState(timestamp, createTimestamp, state);


@@ -117,19 +108,26 @@ function Log(prefix: string = "vp-") {
 }
 const log = Log();
 
 }
 const log = Log();
 

+const undoLog: string[] = [];
+

 const UI = {
   addTask: function (description: string): Element {
 const UI = {
   addTask: function (description: string): Element {

-    return <Element>log.recordAndApply(`${Date.now()} Create ${description}`);
-  },
-  destroyTask: function (createTimestamp: string) {
-    return log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
+    const now = Date.now();
+    undoLog.push(`State ${now} deleted`);
+    return <Element>log.recordAndApply(`${now} Create ${description}`);

   },
   },

-  setPriority: function (createTimestamp: string, priority: number) {
-    return log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${priority}`);
+  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, state: string) {
     return log.recordAndApply(`${Date.now()} State ${createTimestamp} ${state}`);
   },
   },
   setState: function (createTimestamp: string, state: string) {
     return log.recordAndApply(`${Date.now()} State ${createTimestamp} ${state}`);
   },

+  undo: function () {
+    if (undoLog.length > 0) {
+      return log.recordAndApply(`${Date.now()} ${undoLog.pop()}`);
+    }
+  },

 };
 
 const BrowserUI = {
 };
 
 const BrowserUI = {


@@ -208,7 +206,7 @@ const BrowserUI = {
     console.assert(aPriority < newPriority && newPriority < bPriority, aPriority, "<", newPriority, "<", bPriority);
     const newPriorityRounded = Math.round(newPriority);
     const okToRound = aPriority < newPriorityRounded && newPriorityRounded < bPriority;
     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);
+    UI.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task));

   },
 
   setState: function (state: string) {
   },
 
   setState: function (state: string) {


@@ -216,6 +214,11 @@ const BrowserUI = {
     this.moveCursor(1) || this.moveCursor(-1);
     return UI.setState(createTimestamp!, state);
   },
     this.moveCursor(1) || this.moveCursor(-1);
     return UI.setState(createTimestamp!, state);
   },

+
+  undo: function () {
+    const ret = UI.undo();
+    if (ret && ret instanceof HTMLElement) ret.focus();
+  },

 };
 
 function handleKey(event: any) {
 };
 
 function handleKey(event: any) {


@@ -231,7 +234,8 @@ function handleKey(event: any) {
     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 == "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.destroyTask();
+    if (event.key == "X") return BrowserUI.setState("deleted");
+    if (event.key == "u") return BrowserUI.undo();

   }
 }
 
   }
 }