Sort completed tasks by modification date

gaborbata · Mar 22, 2021 · 45cf789 · 45cf789
1 parent df1d2a1
commit 45cf789
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 91 deletions.
diff --git a/bin/todo.rb b/bin/todo.rb
@@ -306,7 +306,12 @@ def list(tasks = nil, patterns = nil)
     patterns ||= []
     patterns += [':active'] if (patterns & [':active', ':done', ':blocked', ':started', ':new', ':all']).empty?
     items = filter_tasks(tasks, patterns).sort_by do |num, task|
-      [task[:priority] && task[:state] != 'done' ? 0 : 1, ORDER[task[:state] || 'default'], task[:due] || 'n/a', num]
+      [
+        task[:priority] && task[:state] != 'done' ? 0 : 1,
+        ORDER[task[:state] || 'default'],
+        task[:state] != 'done' ? task[:due] || 'n/a' : task[:modified],
+        num
+      ]
     end
     items.each do |num, task|
       state = task[:state] || 'default'

diff --git a/node/package.json b/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "todo-jsonl",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "todo list manager on the command-line inspired by todo.txt using the jsonl format",
   "main": "todo.js",
   "bin": {

diff --git a/node/todo.js b/node/todo.js
diff --git a/node/todo.js.rb b/node/todo.js.rb
@@ -301,7 +301,12 @@ def list(tasks = nil, patterns = nil)
     patterns ||= []
     patterns += [':active'] if (patterns & [':active', ':done', ':blocked', ':started', ':new', ':all']).empty?
     items = filter_tasks(tasks, patterns).sort_by do |num, task|
-      [task[:priority] && task[:state] != 'done' ? 0 : 1, ORDER[task[:state] || 'default'], task[:due] || 'n/a', num]
+      [
+        task[:priority] && task[:state] != 'done' ? 0 : 1,
+        ORDER[task[:state] || 'default'],
+        task[:state] != 'done' ? task[:due] || 'n/a' : task[:modified],
+        num
+      ]
     end
     items.each do |num, task|
       state = task[:state] || 'default'

diff --git a/todo.gemspec b/todo.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'todo-jsonl'
-  s.version     = '1.0.2'
+  s.version     = '1.0.3'
   s.date        = '2021-03-22'
   s.summary     = 'todo list manager on the command-line inspired by todo.txt using the jsonl format'
   s.authors     = ['Gabor Bata']

diff --git a/web/app.js b/web/app.js
diff --git a/web/app.js.rb b/web/app.js.rb
@@ -8,7 +8,7 @@
 
 `
 var term = new VanillaTerminal({
-  'welcome': '<u>todo list manager</u> REPL v1.0.2<br>Type "help" or "copyright" for more information.<br><br>',
+  'welcome': '<u>todo list manager</u> REPL v1.0.3<br>Type "help" or "copyright" for more information.<br><br>',
   'defaultCallback': default_callback,
   'prompt': 'todo',
   'commands': {

diff --git a/web/todo.js.rb b/web/todo.js.rb
@@ -315,7 +315,12 @@ def list(tasks = nil, patterns = nil)
     patterns ||= []
     patterns += [':active'] if (patterns & [':active', ':done', ':blocked', ':started', ':new', ':all']).empty?
     items = filter_tasks(tasks, patterns).sort_by do |num, task|
-      [task[:priority] && task[:state] != 'done' ? 0 : 1, ORDER[task[:state] || 'default'], task[:due] || 'n/a', num]
+      [
+        task[:priority] && task[:state] != 'done' ? 0 : 1,
+        ORDER[task[:state] || 'default'],
+        task[:state] != 'done' ? task[:due] || 'n/a' : task[:modified],
+        num
+      ]
     end
     items.each do |num, task|
       state = task[:state] || 'default'