Add Todo/Process.blockers for Conditions that block rather than enable.

[plomtask] / plomtask / todos.py

diff --git a/plomtask/todos.py b/plomtask/todos.py
index b3d50e9d4942c57cb5b4ef16892401df4eb7f6f7..a7af99faa3a298e27548e7a7234699c1cf8038fc 100644 (file)
--- a/plomtask/todos.py
+++ b/plomtask/todos.py
@@ -26,6 +26,7 @@ class Todo(BaseModel[int], ConditionsRelations):
     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'),
@@ -38,7 +39,8 @@ class Todo(BaseModel[int], ConditionsRelations):
                  date: str, comment: str = '',
                  effort: None | float = None,
                  calendarize: bool = False) -> None:
-        super().__init__(id_)
+        BaseModel.__init__(self, id_)
+        ConditionsRelations.__init__(self)
         if process.id_ is None:
             raise NotFoundException('Process of Todo without ID (not saved?)')
         self.process = process
@@ -49,12 +51,10 @@ class Todo(BaseModel[int], ConditionsRelations):
         self.children: list[Todo] = []
         self.parents: list[Todo] = []
         self.calendarize = calendarize
-        self.conditions: list[Condition] = []
-        self.enables: list[Condition] = []
-        self.disables: list[Condition] = []
         if not self.id_:
             self.calendarize = self.process.calendarize
             self.conditions = self.process.conditions[:]
+            self.blockers = self.process.blockers[:]
             self.enables = self.process.enables[:]
             self.disables = self.process.disables[:]
 
@@ -77,7 +77,7 @@ class Todo(BaseModel[int], ConditionsRelations):
                                          'child', todo.id_):
             # pylint: disable=no-member
             todo.parents += [cls.by_id(db_conn, t_id)]
-        for name in ('conditions', 'enables', 'disables'):
+        for name in ('conditions', 'blockers', 'enables', 'disables'):
             table = f'todo_{name}'
             assert isinstance(todo.id_, int)
             for cond_id in db_conn.column_where(table, 'condition',
@@ -103,6 +103,9 @@ class Todo(BaseModel[int], ConditionsRelations):
         for condition in self.conditions:
             if not condition.is_active:
                 return False
+        for condition in self.blockers:
+            if condition.is_active:
+                return False
         return True
 
     @property