X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=98bb49f2d18c4789521c488195d9471375d77963;hb=f8118b1ed8615870b490566cf649d191f5877932;hp=8f247cd68cbfff0980fba2c97c64b1a3f77776dd;hpb=696aed8a590fa9c67a6b9c723e2134b2663bd769;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 8f247cd..98bb49f 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -1,6 +1,5 @@ """Web server stuff.""" from typing import Any -from collections import namedtuple from http.server import BaseHTTPRequestHandler from http.server import HTTPServer from urllib.parse import urlparse, parse_qs @@ -120,22 +119,24 @@ class TaskHandler(BaseHTTPRequestHandler): def do_GET_day(self) -> dict[str, object]: """Show single Day of ?date=.""" date = self.params.get_str('date', todays_date()) - top_todos = [t for t in Todo.by_date(self.conn, date) if not t.parents] + todays_todos = Todo.by_date(self.conn, date) + conditions_present = [] + enablers_for = {} + for todo in todays_todos: + for condition in todo.conditions: + if condition not in conditions_present: + conditions_present += [condition] + enablers_for[condition.id_] = [p for p in + Process.all(self.conn) + if condition in p.enables] seen_todos: set[int] = set() - seen_conditions: set[int] = set() - todo_trees = [t.get_step_tree(seen_todos, seen_conditions) - for t in top_todos] - ConditionsNode = namedtuple('ConditionsNode', - ('condition', 'enablers', 'disablers')) - conditions_nodes: list[ConditionsNode] = [] - for condi in Condition.all(self.conn): - enablers = Todo.enablers_for_at(self.conn, condi, date) - disablers = Todo.disablers_for_at(self.conn, condi, date) - conditions_nodes += [ConditionsNode(condi, enablers, disablers)] + 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), - 'todo_trees': todo_trees, - 'processes': Process.all(self.conn), - 'conditions_nodes': conditions_nodes} + 'top_nodes': top_nodes, + 'enablers_for': enablers_for, + 'conditions_present': conditions_present, + 'processes': Process.all(self.conn)} def do_GET_todo(self) -> dict[str, object]: """Show single Todo of ?id=.""" @@ -178,35 +179,59 @@ class TaskHandler(BaseHTTPRequestHandler): keep_blank_values=True, strict_parsing=True) self.form_data = InputsParser(postvars) if self.site in ('day', 'process', 'todo', 'condition'): - getattr(self, f'do_POST_{self.site}')() + redir_target = getattr(self, f'do_POST_{self.site}')() self.conn.commit() else: msg = f'Page not known as POST target: /{self.site}' raise NotFoundException(msg) - self._redirect('/') + self._redirect(redir_target) except HandledException as error: self._send_msg(error, code=error.http_code) finally: self.conn.close() - def do_POST_day(self) -> None: + def do_POST_day(self) -> str: """Update or insert Day of date and Todos mapped to it.""" date = self.params.get_str('date') day = Day.by_id(self.conn, date, create=True) - day.comment = self.form_data.get_str('comment') + day.comment = self.form_data.get_str('day_comment') day.save(self.conn) - existing_todos = Todo.by_date(self.conn, date) + new_todos = [] for process_id in self.form_data.get_all_int('new_todo'): process = Process.by_id(self.conn, process_id) todo = Todo(None, process, False, day.date) todo.save(self.conn) - todo.adopt_from(existing_todos) - todo.make_missing_children(self.conn) + new_todos += [todo] + adopted = True + while adopted: + adopted = False + existing_todos = Todo.by_date(self.conn, date) + for todo in new_todos: + if todo.adopt_from(existing_todos): + adopted = True + todo.make_missing_children(self.conn) + todo.save(self.conn) + done_ids = self.form_data.get_all_int('done') + comments = self.form_data.get_all_str('comment') + for i, todo_id in enumerate(self.form_data.get_all_int('todo_id')): + todo = Todo.by_id(self.conn, todo_id) + todo.is_done = todo_id in done_ids + if len(comments) > 0: + todo.comment = comments[i] todo.save(self.conn) + for condition in todo.enables: + condition.save(self.conn) + for condition in todo.disables: + condition.save(self.conn) + return f'/day?date={date}' - def do_POST_todo(self) -> None: + def do_POST_todo(self) -> str: """Update Todo and its children.""" id_ = self.params.get_int('id') + for _ in self.form_data.get_all_str('delete'): + todo = Todo .by_id(self.conn, id_) + todo.remove(self.conn) + return '/' todo = Todo.by_id(self.conn, id_) adopted_child_ids = self.form_data.get_all_int('adopt') for child in todo.children: @@ -223,15 +248,21 @@ class TaskHandler(BaseHTTPRequestHandler): todo.set_enables(self.conn, self.form_data.get_all_int('enables')) todo.set_disables(self.conn, self.form_data.get_all_int('disables')) todo.is_done = len(self.form_data.get_all_str('done')) > 0 + todo.comment = self.form_data.get_str('comment', ignore_strict=True) todo.save(self.conn) for condition in todo.enables: condition.save(self.conn) for condition in todo.disables: condition.save(self.conn) + return f'/todo?id={todo.id_}' - def do_POST_process(self) -> None: + def do_POST_process(self) -> str: """Update or insert Process of ?id= and fields defined in postvars.""" id_ = self.params.get_int_or_none('id') + for _ in self.form_data.get_all_str('delete'): + process = Process.by_id(self.conn, id_) + process.remove(self.conn) + return '/processes' process = Process.by_id(self.conn, id_, create=True) process.title.set(self.form_data.get_str('title')) process.description.set(self.form_data.get_str('description')) @@ -240,8 +271,7 @@ class TaskHandler(BaseHTTPRequestHandler): self.form_data.get_all_int('condition')) process.set_enables(self.conn, self.form_data.get_all_int('enables')) process.set_disables(self.conn, self.form_data.get_all_int('disables')) - process.save_core(self.conn) - assert process.id_ is not None # for mypy + process.save(self.conn) process.explicit_steps = [] steps: list[tuple[int | None, int, int | None]] = [] for step_id in self.form_data.get_all_int('steps'): @@ -259,14 +289,21 @@ class TaskHandler(BaseHTTPRequestHandler): steps += [(None, step_process_id, None)] process.set_steps(self.conn, steps) process.save(self.conn) + return f'/process?id={process.id_}' - def do_POST_condition(self) -> None: + def do_POST_condition(self) -> str: """Update/insert Condition of ?id= and fields defined in postvars.""" id_ = self.params.get_int_or_none('id') + for _ in self.form_data.get_all_str('delete'): + condition = Condition.by_id(self.conn, id_) + condition.remove(self.conn) + return '/conditions' condition = Condition.by_id(self.conn, id_, create=True) + condition.is_active = self.form_data.get_all_str('is_active') != [] condition.title.set(self.form_data.get_str('title')) condition.description.set(self.form_data.get_str('description')) condition.save(self.conn) + return f'/condition?id={condition.id_}' def _init_handling(self) -> None: # pylint: disable=attribute-defined-outside-init