X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=7e2b241aec468a8b6c29221b6f146a702b990883;hb=23012cd370777b60a25839788d131173d2abee91;hp=25be899044d652145f166ad1ebed5ff3528b0db0;hpb=56b8aa166d51d139edb41f0ef250b1854a5e93e8;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 25be899..7e2b241 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -1,5 +1,5 @@ """Web server stuff.""" -from typing import Any +from typing import Any, NamedTuple from http.server import BaseHTTPRequestHandler from http.server import HTTPServer from urllib.parse import urlparse, parse_qs @@ -118,26 +118,35 @@ class TaskHandler(BaseHTTPRequestHandler): def do_GET_day(self) -> dict[str, object]: """Show single Day of ?date=.""" + + class ConditionListing(NamedTuple): + """Listing of Condition augmented with its enablers, disablers.""" + condition: Condition + enablers: list[Todo] + disablers: list[Todo] + date = self.params.get_str('date', todays_date()) - conditions_listing = [] - for condition in Condition.all(self.conn): - enablers = Todo.enablers_for_at(self.conn, condition, date) - disablers = Todo.disablers_for_at(self.conn, condition, date) - conditions_listing += [{ - 'condition': condition, - 'enablers': enablers, - 'disablers': disablers}] - return {'day': Day.by_date(self.conn, date, create=True), - 'todos': Todo.by_date(self.conn, date), + top_todos = [t for t in Todo.by_date(self.conn, date) if not t.parents] + 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] + condition_listings: list[ConditionListing] = [] + for cond in Condition.all(self.conn): + enablers = Todo.enablers_for_at(self.conn, cond, date) + disablers = Todo.disablers_for_at(self.conn, cond, date) + condition_listings += [ConditionListing(cond, enablers, disablers)] + return {'day': Day.by_id(self.conn, date, create=True), + 'todo_trees': todo_trees, 'processes': Process.all(self.conn), - 'conditions_listing': conditions_listing} + 'condition_listings': condition_listings} def do_GET_todo(self) -> dict[str, object]: """Show single Todo of ?id=.""" - id_ = self.params.get_int_or_none('id') + id_ = self.params.get_int('id') todo = Todo.by_id(self.conn, id_) return {'todo': todo, - 'todo_candidates': Todo.by_date(self.conn, todo.day.date), + 'todo_candidates': Todo.by_date(self.conn, todo.date), 'condition_candidates': Condition.all(self.conn)} def do_GET_conditions(self) -> dict[str, object]: @@ -156,7 +165,7 @@ class TaskHandler(BaseHTTPRequestHandler): return {'process': process, 'steps': process.get_steps(self.conn), 'owners': process.used_as_step_by(self.conn), - 'process_candidates': Process.all(self.conn), + 'step_candidates': Process.all(self.conn), 'condition_candidates': Condition.all(self.conn)} def do_GET_processes(self) -> dict[str, object]: @@ -173,60 +182,75 @@ 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_date(self.conn, date, create=True) + day = Day.by_id(self.conn, date, create=True) day.comment = self.form_data.get_str('comment') day.save(self.conn) - process_id = self.form_data.get_int_or_none('new_todo') - if process_id is not None: + existing_todos = Todo.by_date(self.conn, date) + 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) + todo = Todo(None, process, False, day.date) todo.save(self.conn) + todo.adopt_from(existing_todos) + todo.make_missing_children(self.conn) + todo.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_or_none('id') + id_ = self.params.get_int('id') todo = Todo.by_id(self.conn, id_) - child_id = self.form_data.get_int_or_none('adopt') - if child_id is not None: + adopted_child_ids = self.form_data.get_all_int('adopt') + for child in todo.children: + 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) + 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) todo.set_conditions(self.conn, self.form_data.get_all_int('condition')) - todo.set_fulfills(self.conn, self.form_data.get_all_int('fulfills')) - todo.set_undoes(self.conn, self.form_data.get_all_int('undoes')) + 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.save(self.conn) - for condition in todo.fulfills: + for condition in todo.enables: condition.save(self.conn) - for condition in todo.undoes: + 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')) process.effort.set(self.form_data.get_float('effort')) process.set_conditions(self.conn, self.form_data.get_all_int('condition')) - process.set_fulfills(self.conn, self.form_data.get_all_int('fulfills')) - process.set_undoes(self.conn, self.form_data.get_all_int('undoes')) - process.save_id(self.conn) - assert process.id_ is not None # for mypy + 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) process.explicit_steps = [] steps: list[tuple[int | None, int, int | None]] = [] for step_id in self.form_data.get_all_int('steps'): @@ -244,14 +268,20 @@ 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.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