X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/static/git-logo.png?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=e9e23633a92ddd5b02d9402dfaefae357476b125;hb=3b15110c22c17d938d182a3d1a37b81b875c397f;hp=87f600a73c03f55bb3bb51cfbb3d79444d3b687e;hpb=19f308751a3e651296d8ef9f87059279fad6267b;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 87f600a..e9e2363 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -1,4 +1,6 @@ """Web server stuff.""" +from __future__ import annotations +from dataclasses import dataclass from typing import Any from base64 import b64encode, b64decode from http.server import BaseHTTPRequestHandler @@ -11,13 +13,23 @@ from plomtask.days import Day from plomtask.exceptions import HandledException, BadFormatException, \ NotFoundException from plomtask.db import DatabaseConnection, DatabaseFile -from plomtask.processes import Process, ProcessStep +from plomtask.processes import Process, ProcessStep, ProcessStepsNode from plomtask.conditions import Condition from plomtask.todos import Todo TEMPLATES_DIR = 'templates' +@dataclass +class TodoStepsNode: + """Collect what's useful for Todo steps tree display.""" + id_: int + todo: Todo | None + process: Process | None + children: list[TodoStepsNode] + fillable: bool = False + + class TaskServer(HTTPServer): """Variant of HTTPServer that knows .jinja as Jinja Environment.""" @@ -46,7 +58,7 @@ class InputsParser: return self.inputs[key][0] def get_first_strings_starting(self, prefix: str) -> dict[str, str]: - """Retrieve list of (first) strings at key starting with prefix.""" + """Retrieve dict of (first) strings at key starting with prefix.""" ret = {} for key in [k for k in self.inputs.keys() if k.startswith(prefix)]: ret[key] = self.inputs[key][0] @@ -143,7 +155,11 @@ class TaskHandler(BaseHTTPRequestHandler): def do_GET_day(self) -> dict[str, object]: """Show single Day of ?date=.""" date = self.params.get_str('date', date_in_n_days(0)) + make_type = self.params.get_str('make_type') todays_todos = Todo.by_date(self.conn, date) + total_effort = 0.0 + for todo in todays_todos: + total_effort += todo.performed_effort conditions_present = [] enablers_for = {} disablers_for = {} @@ -161,7 +177,9 @@ class TaskHandler(BaseHTTPRequestHandler): top_nodes = [t.get_step_tree(seen_todos) for t in todays_todos if not t.parents] return {'day': Day.by_id(self.conn, date, create=True), + 'total_effort': total_effort, 'top_nodes': top_nodes, + 'make_type': make_type, 'enablers_for': enablers_for, 'disablers_for': disablers_for, 'conditions_present': conditions_present, @@ -169,11 +187,68 @@ class TaskHandler(BaseHTTPRequestHandler): def do_GET_todo(self) -> dict[str, object]: """Show single Todo of ?id=.""" + + def walk_process_steps(id_: int, + process_step_nodes: list[ProcessStepsNode], + steps_nodes: list[TodoStepsNode]) -> None: + for process_step_node in process_step_nodes: + id_ += 1 + node = TodoStepsNode(id_, None, process_step_node.process, []) + steps_nodes += [node] + walk_process_steps(id_, list(process_step_node.steps.values()), + node.children) + + def walk_todo_steps(id_: int, todos: list[Todo], + steps_nodes: list[TodoStepsNode]) -> None: + for todo in todos: + matched = False + for match in [item for item in steps_nodes + if item.process + and item.process == todo.process]: + match.todo = todo + matched = True + for child in match.children: + child.fillable = True + walk_todo_steps(id_, todo.children, match.children) + if not matched: + id_ += 1 + node = TodoStepsNode(id_, todo, None, []) + steps_nodes += [node] + walk_todo_steps(id_, todo.children, node.children) + + def collect_adoptables_keys(steps_nodes: list[TodoStepsNode] + ) -> set[int]: + ids = set() + for node in steps_nodes: + if not node.todo: + assert isinstance(node.process, Process) + assert isinstance(node.process.id_, int) + ids.add(node.process.id_) + ids = ids | collect_adoptables_keys(node.children) + return ids + id_ = self.params.get_int('id') todo = Todo.by_id(self.conn, id_) - return {'todo': todo, + todo_steps = [step.todo for step in todo.get_step_tree(set()).children] + process_tree = todo.process.get_steps(self.conn, None) + steps_todo_to_process: list[TodoStepsNode] = [] + walk_process_steps(0, list(process_tree.values()), + steps_todo_to_process) + for steps_node in steps_todo_to_process: + steps_node.fillable = True + walk_todo_steps(len(steps_todo_to_process), todo_steps, + steps_todo_to_process) + adoptables: dict[int, list[Todo]] = {} + any_adoptables = [Todo.by_id(self.conn, t.id_) + for t in Todo.by_date(self.conn, todo.date) + if t != todo] + for id_ in collect_adoptables_keys(steps_todo_to_process): + adoptables[id_] = [t for t in any_adoptables + if t.process.id_ == id_] + return {'todo': todo, 'steps_todo_to_process': steps_todo_to_process, + 'adoption_candidates_for': adoptables, 'process_candidates': Process.all(self.conn), - 'todo_candidates': Todo.by_date(self.conn, todo.date), + 'todo_candidates': any_adoptables, 'condition_candidates': Condition.all(self.conn)} def do_GET_todos(self) -> dict[str, object]: @@ -338,8 +413,14 @@ class TaskHandler(BaseHTTPRequestHandler): day = Day.by_id(self.conn, date, create=True) day.comment = self.form_data.get_str('day_comment') day.save(self.conn) + make_type = self.form_data.get_str('make_type') for process_id in sorted(self.form_data.get_all_int('new_todo')): - Todo.create_with_children(self.conn, process_id, date) + if 'empty' == make_type: + process = Process.by_id(self.conn, process_id) + todo = Todo(None, process, False, date) + todo.save(self.conn) + else: + Todo.create_with_children(self.conn, process_id, date) done_ids = self.form_data.get_all_int('done') comments = self.form_data.get_all_str('comment') efforts = self.form_data.get_all_str('effort') @@ -355,10 +436,12 @@ class TaskHandler(BaseHTTPRequestHandler): condition.save(self.conn) for condition in todo.disables: condition.save(self.conn) - return f'/day?date={date}' + return f'/day?date={date}&make_type={make_type}' def do_POST_todo(self) -> str: """Update Todo and its children.""" + # pylint: disable=too-many-locals + # pylint: disable=too-many-branches id_ = self.params.get_int('id') for _ in self.form_data.get_all_str('delete'): todo = Todo .by_id(self.conn, id_) @@ -366,17 +449,35 @@ class TaskHandler(BaseHTTPRequestHandler): return '/' todo = Todo.by_id(self.conn, id_) adopted_child_ids = self.form_data.get_all_int('adopt') + processes_to_make_full = self.form_data.get_all_int('make_full') + processes_to_make_empty = self.form_data.get_all_int('make_empty') + fill_fors = self.form_data.get_first_strings_starting('fill_for_') + for v in fill_fors.values(): + if v.startswith('make_empty_'): + processes_to_make_empty += [int(v[11:])] + elif v.startswith('make_full_'): + processes_to_make_full += [int(v[10:])] + elif v != 'ignore': + adopted_child_ids += [int(v)] + to_remove = [] for child in todo.children: + assert isinstance(child.id_, int) if child.id_ not in adopted_child_ids: - assert isinstance(child.id_, int) - child = Todo.by_id(self.conn, child.id_) - todo.remove_child(child) + to_remove += [child.id_] + for id_ in to_remove: + child = Todo.by_id(self.conn, id_) + todo.remove_child(child) for child_id in adopted_child_ids: if child_id in [c.id_ for c in todo.children]: continue child = Todo.by_id(self.conn, child_id) todo.add_child(child) - for process_id in self.form_data.get_all_int('make'): + for process_id in processes_to_make_empty: + process = Process.by_id(self.conn, process_id) + made = Todo(None, process, False, todo.date) + made.save(self.conn) + todo.add_child(made) + for process_id in processes_to_make_full: made = Todo.create_with_children(self.conn, process_id, todo.date) todo.add_child(made) effort = self.form_data.get_str('effort', ignore_strict=True)