X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=080af8ce1a127880368c8c4bedb3cf4e0aebaffc;hb=e150bee233a648950061b716dc1780581105ede6;hp=8f247cd68cbfff0980fba2c97c64b1a3f77776dd;hpb=696aed8a590fa9c67a6b9c723e2134b2663bd769;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 8f247cd..080af8c 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 @@ -95,8 +94,7 @@ class TaskHandler(BaseHTTPRequestHandler): """Handle any GET request.""" try: self._init_handling() - if self.site in {'calendar', 'day', 'process', 'processes', 'todo', - 'condition', 'conditions'}: + if hasattr(self, f'do_GET_{self.site}'): template = f'{self.site}.html' ctx = getattr(self, f'do_GET_{self.site}')() html = self.server.jinja.get_template(template).render(**ctx) @@ -115,27 +113,31 @@ class TaskHandler(BaseHTTPRequestHandler): start = self.params.get_str('start') end = self.params.get_str('end') days = Day.all(self.conn, date_range=(start, end), fill_gaps=True) + for day in days: + day.collect_calendarized_todos(self.conn) return {'start': start, 'end': end, 'days': days} 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=.""" @@ -147,15 +149,37 @@ class TaskHandler(BaseHTTPRequestHandler): def do_GET_conditions(self) -> dict[str, object]: """Show all Conditions.""" - return {'conditions': Condition.all(self.conn)} + conditions = Condition.all(self.conn) + sort_by = self.params.get_str('sort_by') + if sort_by == 'is_active': + conditions.sort(key=lambda c: c.is_active) + elif sort_by == '-is_active': + conditions.sort(key=lambda c: c.is_active, reverse=True) + elif sort_by == '-title': + conditions.sort(key=lambda c: c.title.newest, reverse=True) + else: + conditions.sort(key=lambda c: c.title.newest) + return {'conditions': conditions, 'sort_by': sort_by} def do_GET_condition(self) -> dict[str, object]: """Show Condition of ?id=.""" id_ = self.params.get_int_or_none('id') return {'condition': Condition.by_id(self.conn, id_, create=True)} + def do_GET_condition_titles(self) -> dict[str, object]: + """Show title history of Condition of ?id=.""" + id_ = self.params.get_int_or_none('id') + condition = Condition.by_id(self.conn, id_) + return {'condition': condition} + + def do_GET_condition_descriptions(self) -> dict[str, object]: + """Show description historys of Condition of ?id=.""" + id_ = self.params.get_int_or_none('id') + condition = Condition.by_id(self.conn, id_) + return {'condition': condition} + def do_GET_process(self) -> dict[str, object]: - """Show process of ?id=.""" + """Show Process of ?id=.""" id_ = self.params.get_int_or_none('id') process = Process.by_id(self.conn, id_, create=True) return {'process': process, @@ -164,9 +188,37 @@ class TaskHandler(BaseHTTPRequestHandler): 'step_candidates': Process.all(self.conn), 'condition_candidates': Condition.all(self.conn)} + def do_GET_process_titles(self) -> dict[str, object]: + """Show title history of Process of ?id=.""" + id_ = self.params.get_int_or_none('id') + process = Process.by_id(self.conn, id_) + return {'process': process} + + def do_GET_process_descriptions(self) -> dict[str, object]: + """Show description historys of Process of ?id=.""" + id_ = self.params.get_int_or_none('id') + process = Process.by_id(self.conn, id_) + return {'process': process} + + def do_GET_process_efforts(self) -> dict[str, object]: + """Show default effort history of Process of ?id=.""" + id_ = self.params.get_int_or_none('id') + process = Process.by_id(self.conn, id_) + return {'process': process} + def do_GET_processes(self) -> dict[str, object]: """Show all Processes.""" - return {'processes': Process.all(self.conn)} + processes = Process.all(self.conn) + sort_by = self.params.get_str('sort_by') + if sort_by == 'steps': + processes.sort(key=lambda c: len(c.explicit_steps)) + elif sort_by == '-steps': + processes.sort(key=lambda c: len(c.explicit_steps), reverse=True) + elif sort_by == '-title': + processes.sort(key=lambda c: c.title.newest, reverse=True) + else: + processes.sort(key=lambda c: c.title.newest) + return {'processes': processes, 'sort_by': sort_by} def do_POST(self) -> None: """Handle any POST request.""" @@ -177,36 +229,63 @@ class TaskHandler(BaseHTTPRequestHandler): postvars = parse_qs(self.rfile.read(length).decode(), 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}')() + if hasattr(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') + efforts = self.form_data.get_all_str('effort') + 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] + if len(efforts) > 0: + todo.effort = float(efforts[i]) if efforts[i] else None 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: @@ -219,19 +298,28 @@ class TaskHandler(BaseHTTPRequestHandler): continue child = Todo.by_id(self.conn, child_id) todo.add_child(child) + effort = self.form_data.get_str('effort', ignore_strict=True) + todo.effort = float(effort) if effort else None todo.set_conditions(self.conn, self.form_data.get_all_int('condition')) 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.calendarize = len(self.form_data.get_all_str('calendarize')) > 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 +328,8 @@ 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.calendarize = self.form_data.get_all_str('calendarize') != [] + 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 +347,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