diff --git a/README.md b/README.md index 4a3a590..fcb8a41 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ If no command is specified, it is assumed to be the add command. - use a real database instead of json files - multiple todo lists - default filters -- `Task` object generates new string on `__str__` method instead of relying on - accurate updating from functions +- ~~`Task` object generates new string on `__str__` method instead of relying on + accurate updating from functions~~ - ~~exporting all tasks~~ + diff --git a/Task.py b/Task.py index 177e39f..2b6213b 100644 --- a/Task.py +++ b/Task.py @@ -5,7 +5,6 @@ from datetime import datetime as d class Task: def __init__(self, text): # defaults - self.text = text self.completion_date = None self.creation_date = None # for sorting, lower than all alphabet letters @@ -53,8 +52,9 @@ class Task: if self.completion_date is not None: self.done = True - # the rest of the arguments may have projects, contexts, specials + self.body = " ".join(arguments[counter:]) + # the rest of the arguments may have projects, contexts, specials for i in arguments[counter:]: if len(i) < 1: continue @@ -73,14 +73,28 @@ class Task: if self.done: return self.done = True - self.text = "x " + self.text def undo(self): if not self.done: return self.done = False - self.text = " ".join(self.text.split("x ")[1:]) def __str__(self): - return self.text + text = "" + + if self.done: + text += "x " + + if self.priority != '{': + text += '(' + self.priority + ') ' + + if self.completion_date: + text += str(self.completion_date).split(' ')[0] + ' ' + + if self.creation_date: + text += str(self.creation_date).split(' ')[0] + ' ' + + text += self.body + + return text diff --git a/Task_tests.py b/Task_tests.py index 61dc81a..3b18e9e 100755 --- a/Task_tests.py +++ b/Task_tests.py @@ -7,7 +7,9 @@ from Task import Task as T class TaskTestCase(unittest.TestCase): def test_basic(self): - task = T("task") + text = "task" + task = T(text) + self.assertEqual(str(task), text) self.assertEqual(task.done, False) self.assertEqual(task.priority, '{') self.assertEqual(task.completion_date, None) @@ -17,7 +19,9 @@ class TaskTestCase(unittest.TestCase): self.assertEqual(task.specials, []) def test_basic_done(self): - task = T("x basic test task") + text = "x basic test task" + task = T(text) + self.assertEqual(str(task), text) self.assertEqual(task.done, True) self.assertEqual(task.priority, '{') self.assertEqual(task.completion_date, None) @@ -27,7 +31,9 @@ class TaskTestCase(unittest.TestCase): self.assertEqual(task.specials, []) def test_prioritized(self): - task = T("(A) prioritized test task") + text = "(A) prioritized test task" + task = T(text) + self.assertEqual(str(task), text) self.assertEqual(task.done, False) self.assertEqual(task.priority, 'A') self.assertEqual(task.completion_date, None) @@ -37,7 +43,9 @@ class TaskTestCase(unittest.TestCase): self.assertEqual(task.specials, []) def test_prioritized_ignore_incorrect(self): - task = T("(AA) prioritized test task") + text = "(AA) prioritized test task" + task = T(text) + self.assertEqual(str(task), text) self.assertEqual(task.done, False) self.assertEqual(task.priority, '{') self.assertEqual(task.completion_date, None) @@ -47,7 +55,9 @@ class TaskTestCase(unittest.TestCase): self.assertEqual(task.specials, []) def test_prioritized_done(self): - task = T("x (A) prioritized test task") + text = "x (A) prioritized test task" + task = T(text) + self.assertEqual(str(task), text) self.assertEqual(task.done, True) self.assertEqual(task.priority, 'A') self.assertEqual(task.completion_date, None) @@ -57,7 +67,9 @@ class TaskTestCase(unittest.TestCase): self.assertEqual(task.specials, []) def test_with_creation_date(self): - task = T("2018-06-24 test task") + text = "2018-06-24 test task" + task = T(text) + self.assertEqual(str(task), text) self.assertEqual(task.done, False) self.assertEqual(task.priority, '{') self.assertEqual(task.completion_date, None) @@ -68,7 +80,9 @@ class TaskTestCase(unittest.TestCase): self.assertEqual(task.specials, []) def test_with_creation_and_completion_date(self): - task = T("x 2018-06-24 2018-05-24 test task") + text = "x 2018-06-24 2018-05-24 test task" + task = T(text) + self.assertEqual(str(task), text) self.assertEqual(task.done, True) self.assertEqual(task.priority, '{') self.assertEqual(task.completion_date, @@ -80,7 +94,9 @@ class TaskTestCase(unittest.TestCase): self.assertEqual(task.specials, []) def test_with_creation_and_completion_and_priority_date(self): - task = T("x (B) 2018-06-24 2018-05-24 test task") + text = "x (B) 2018-06-24 2018-05-24 test task" + task = T(text) + self.assertEqual(str(task), text) self.assertEqual(task.done, True) self.assertEqual(task.priority, 'B') self.assertEqual(task.completion_date, @@ -92,7 +108,9 @@ class TaskTestCase(unittest.TestCase): self.assertEqual(task.specials, []) def test_special(self): - task = T("special task special:value") + text = "special task special:value" + task = T(text) + self.assertEqual(str(task), text) self.assertEqual(task.done, False) self.assertEqual(task.priority, '{') self.assertEqual(task.completion_date, None) @@ -102,7 +120,9 @@ class TaskTestCase(unittest.TestCase): self.assertEqual(task.specials, [{"special": "value"}]) def test_specials_with_colons(self): - task = T("give muffin her pen back due:2028-07-10T14:28:15Z+0100") + text = "give muffin her pen back due:2028-07-10T14:28:15Z+0100" + task = T(text) + self.assertEqual(str(task), text) self.assertEqual(task.done, False) self.assertEqual(task.priority, '{') self.assertEqual(task.completion_date, None)