X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomtask%2Ftodos.py;h=de6438c1e248777f388a1e8217b7fc059c851c2c;hb=8b606f7c555c250f0d5ab8314aa95ce7efda07c7;hp=9fac63b3d962aacd867a2ab9f6e1be86074c149a;hpb=20ee4c41027582f761a63d947ed4c46e5b02bdab;p=plomtask

diff --git a/plomtask/todos.py b/plomtask/todos.py
index 9fac63b..de6438c 100644
--- a/plomtask/todos.py
+++ b/plomtask/todos.py
@@ -26,12 +26,12 @@ class Todo(BaseModel[int], ConditionsRelations):
     table_name = 'todos'
     to_save = ['process_id', 'is_done', 'date', 'comment', 'effort',
                'calendarize']
-    to_save_relations = [('todo_conditions', 'todo', 'conditions'),
-                         ('todo_blockers', 'todo', 'blockers'),
-                         ('todo_enables', 'todo', 'enables'),
-                         ('todo_disables', 'todo', 'disables'),
-                         ('todo_children', 'parent', 'children'),
-                         ('todo_children', 'child', 'parents')]
+    to_save_relations = [('todo_conditions', 'todo', 'conditions', 0),
+                         ('todo_blockers', 'todo', 'blockers', 0),
+                         ('todo_enables', 'todo', 'enables', 0),
+                         ('todo_disables', 'todo', 'disables', 0),
+                         ('todo_children', 'parent', 'children', 0),
+                         ('todo_children', 'child', 'parents', 1)]
     to_search = ['comment']
 
     # pylint: disable=too-many-arguments
@@ -91,6 +91,8 @@ class Todo(BaseModel[int], ConditionsRelations):
             sub_step_nodes = list(step_node.steps.values())
             sub_step_nodes.sort(key=key_order_func)
             for sub_node in sub_step_nodes:
+                if sub_node.is_suppressed:
+                    continue
                 n_slots = len([n for n in sub_step_nodes
                                if n.process == sub_node.process])
                 filled_slots = len([t for t in satisfier.children
@@ -107,6 +109,8 @@ class Todo(BaseModel[int], ConditionsRelations):
         todo.save(db_conn)
         steps_tree = process.get_steps(db_conn)
         for step_node in steps_tree.values():
+            if step_node.is_suppressed:
+                continue
             todo.add_child(walk_steps(todo, step_node))
         todo.save(db_conn)
         return todo
@@ -214,6 +218,18 @@ class Todo(BaseModel[int], ConditionsRelations):
         assert isinstance(effort_then, float)
         return effort_then
 
+    @property
+    def has_doneness_in_path(self) -> bool:
+        """Check whether self is done or has any children that are."""
+        if self.is_done:
+            return True
+        for child in self.children:
+            if child.is_done:
+                return True
+            if child.has_doneness_in_path:
+                return True
+        return False
+
     def get_step_tree(self, seen_todos: set[int]) -> TodoNode:
         """Return tree of depended-on Todos."""