X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Ftodos.py;h=4d7e393bc49191db242235c1f11092bafce450ed;hb=0274be2e09f4b9c9cffa9e6737a8b128e0fab76d;hp=69a19c94f1e5b172dd14be0fa72fc4a4e7752fe1;hpb=80025e0b2d278a44852b6a397184d1f71c2075fe;p=plomtask
diff --git a/plomtask/todos.py b/plomtask/todos.py
index 69a19c9..4d7e393 100644
--- a/plomtask/todos.py
+++ b/plomtask/todos.py
@@ -1,7 +1,6 @@
"""Actionables."""
from __future__ import annotations
-from dataclasses import dataclass
-from typing import Any
+from typing import Any, Set
from sqlite3 import Row
from plomtask.db import DatabaseConnection, BaseModel
from plomtask.processes import Process, ProcessStepsNode
@@ -12,17 +11,33 @@ from plomtask.exceptions import (NotFoundException, BadFormatException,
from plomtask.dating import valid_date
-@dataclass
class TodoNode:
"""Collects what's useful to know for Todo/Condition tree display."""
+ # pylint: disable=too-few-public-methods
todo: Todo
seen: bool
children: list[TodoNode]
+ def __init__(self,
+ todo: Todo,
+ seen: bool,
+ children: list[TodoNode]) -> None:
+ self.todo = todo
+ self.seen = seen
+ self.children = children
+
+ @property
+ def as_dict(self) -> dict[str, object]:
+ """Return self as (json.dumps-coompatible) dict."""
+ return {'todo': self.todo.id_,
+ 'seen': self.seen,
+ 'children': [c.as_dict for c in self.children]}
+
class Todo(BaseModel[int], ConditionsRelations):
"""Individual actionable."""
# pylint: disable=too-many-instance-attributes
+ # pylint: disable=too-many-public-methods
table_name = 'todos'
to_save = ['process_id', 'is_done', 'date', 'comment', 'effort',
'calendarize']
@@ -33,6 +48,9 @@ class Todo(BaseModel[int], ConditionsRelations):
('todo_children', 'parent', 'children', 0),
('todo_children', 'child', 'parents', 1)]
to_search = ['comment']
+ days_to_update: Set[str] = set()
+ children: list[Todo]
+ parents: list[Todo]
# pylint: disable=too-many-arguments
def __init__(self, id_: int | None,
@@ -50,8 +68,8 @@ class Todo(BaseModel[int], ConditionsRelations):
self.date = valid_date(date)
self.comment = comment
self.effort = effort
- self.children: list[Todo] = []
- self.parents: list[Todo] = []
+ self.children = []
+ self.parents = []
self.calendarize = calendarize
if not self.id_:
self.calendarize = self.process.calendarize
@@ -91,6 +109,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 +127,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
@@ -124,11 +146,9 @@ class Todo(BaseModel[int], ConditionsRelations):
assert isinstance(todo.id_, int)
for t_id in db_conn.column_where('todo_children', 'child',
'parent', todo.id_):
- # pylint: disable=no-member
todo.children += [cls.by_id(db_conn, t_id)]
for t_id in db_conn.column_where('todo_children', 'parent',
'child', todo.id_):
- # pylint: disable=no-member
todo.parents += [cls.by_id(db_conn, t_id)]
for name in ('conditions', 'blockers', 'enables', 'disables'):
table = f'todo_{name}'
@@ -173,6 +193,15 @@ class Todo(BaseModel[int], ConditionsRelations):
return False
return True
+ @property
+ def performed_effort(self) -> float:
+ """Return performed effort, i.e. self.effort or default if done.."""
+ if self.effort is not None:
+ return self.effort
+ if self.is_done:
+ return self.effort_then
+ return 0
+
@property
def process_id(self) -> int | str | None:
"""Needed for super().save to save Processes as attributes."""
@@ -240,6 +269,18 @@ class Todo(BaseModel[int], ConditionsRelations):
return make_node(self)
+ @property
+ def tree_effort(self) -> float:
+ """Return sum of performed efforts of self and all descendants."""
+
+ def walk_tree(node: Todo) -> float:
+ local_effort = 0.0
+ for child in node.children:
+ local_effort += walk_tree(child)
+ return node.performed_effort + local_effort
+
+ return walk_tree(self)
+
def add_child(self, child: Todo) -> None:
"""Add child to self.children, avoid recursion, update parenthoods."""
@@ -271,12 +312,17 @@ class Todo(BaseModel[int], ConditionsRelations):
if self.effort and self.effort < 0 and self.is_deletable:
self.remove(db_conn)
return
+ if self.id_ is None:
+ self.__class__.days_to_update.add(self.date)
super().save(db_conn)
+ for condition in self.enables + self.disables + self.conditions:
+ condition.save(db_conn)
def remove(self, db_conn: DatabaseConnection) -> None:
"""Remove from DB, including relations."""
if not self.is_deletable:
raise HandledException('Cannot remove non-deletable Todo.')
+ self.__class__.days_to_update.add(self.date)
children_to_remove = self.children[:]
parents_to_remove = self.parents[:]
for child in children_to_remove: