X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=a2e8fa69fd05d4423751a4fa3ad3623ed4dffe8c;hb=f92de64d072009c8c4bf96b9eeb9fa245045662b;hp=080af8ce1a127880368c8c4bedb3cf4e0aebaffc;hpb=e150bee233a648950061b716dc1780581105ede6;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 080af8c..a2e8fa6 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -5,7 +5,8 @@ from http.server import HTTPServer from urllib.parse import urlparse, parse_qs from os.path import split as path_split from jinja2 import Environment as JinjaEnv, FileSystemLoader as JinjaFSLoader -from plomtask.days import Day, todays_date +from plomtask.dating import todays_date +from plomtask.days import Day from plomtask.exceptions import HandledException, BadFormatException, \ NotFoundException from plomtask.db import DatabaseConnection, DatabaseFile @@ -123,19 +124,24 @@ class TaskHandler(BaseHTTPRequestHandler): todays_todos = Todo.by_date(self.conn, date) conditions_present = [] enablers_for = {} + disablers_for = {} for todo in todays_todos: - for condition in todo.conditions: + for condition in todo.conditions + todo.blockers: 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] + disablers_for[condition.id_] = [p for p in + Process.all(self.conn) + if condition in p.disables] seen_todos: set[int] = set() 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), 'top_nodes': top_nodes, 'enablers_for': enablers_for, + 'disablers_for': disablers_for, 'conditions_present': conditions_present, 'processes': Process.all(self.conn)} @@ -147,9 +153,43 @@ class TaskHandler(BaseHTTPRequestHandler): 'todo_candidates': Todo.by_date(self.conn, todo.date), 'condition_candidates': Condition.all(self.conn)} + def do_GET_todos(self) -> dict[str, object]: + """Show Todos from ?start= to ?end=, of ?process=, ?comment= pattern""" + sort_by = self.params.get_str('sort_by') + start = self.params.get_str('start') + end = self.params.get_str('end') + process_id = self.params.get_int_or_none('process_id') + comment_pattern = self.params.get_str('comment_pattern') + todos = [] + for t in Todo.by_date_range(self.conn, (start, end)): + if (process_id and t.process.id_ != process_id)\ + or (comment_pattern not in t.comment): + continue + todos += [t] + if sort_by == 'doneness': + todos.sort(key=lambda t: t.is_done) + elif sort_by == '-doneness': + todos.sort(key=lambda t: t.is_done, reverse=True) + elif sort_by == 'process': + todos.sort(key=lambda t: t.title_then) + elif sort_by == '-process': + todos.sort(key=lambda t: t.title_then, reverse=True) + elif sort_by == 'comment': + todos.sort(key=lambda t: t.comment) + elif sort_by == '-comment': + todos.sort(key=lambda t: t.comment, reverse=True) + elif sort_by == '-date': + todos.sort(key=lambda t: t.date, reverse=True) + else: + todos.sort(key=lambda t: t.date) + return {'start': start, 'end': end, 'process_id': process_id, + 'comment_pattern': comment_pattern, 'todos': todos, + 'all_processes': Process.all(self.conn), 'sort_by': sort_by} + def do_GET_conditions(self) -> dict[str, object]: """Show all Conditions.""" - conditions = Condition.all(self.conn) + pattern = self.params.get_str('pattern') + conditions = Condition.matching(self.conn, pattern) sort_by = self.params.get_str('sort_by') if sort_by == 'is_active': conditions.sort(key=lambda c: c.is_active) @@ -159,12 +199,20 @@ class TaskHandler(BaseHTTPRequestHandler): 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} + return {'conditions': conditions, + 'sort_by': sort_by, + 'pattern': pattern} 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)} + c = Condition.by_id(self.conn, id_, create=True) + ps = Process.all(self.conn) + return {'condition': c, + 'enabled_processes': [p for p in ps if c in p.conditions], + 'disabled_processes': [p for p in ps if c in p.blockers], + 'enabling_processes': [p for p in ps if c in p.enables], + 'disabling_processes': [p for p in ps if c in p.disables]} def do_GET_condition_titles(self) -> dict[str, object]: """Show title history of Condition of ?id=.""" @@ -185,6 +233,7 @@ class TaskHandler(BaseHTTPRequestHandler): return {'process': process, 'steps': process.get_steps(self.conn), 'owners': process.used_as_step_by(self.conn), + 'n_todos': len(Todo.by_process_id(self.conn, process.id_)), 'step_candidates': Process.all(self.conn), 'condition_candidates': Condition.all(self.conn)} @@ -208,17 +257,18 @@ class TaskHandler(BaseHTTPRequestHandler): def do_GET_processes(self) -> dict[str, object]: """Show all Processes.""" - processes = Process.all(self.conn) + pattern = self.params.get_str('pattern') + processes = Process.matching(self.conn, pattern) sort_by = self.params.get_str('sort_by') if sort_by == 'steps': - processes.sort(key=lambda c: len(c.explicit_steps)) + processes.sort(key=lambda p: len(p.explicit_steps)) elif sort_by == '-steps': - processes.sort(key=lambda c: len(c.explicit_steps), reverse=True) + processes.sort(key=lambda p: len(p.explicit_steps), reverse=True) elif sort_by == '-title': - processes.sort(key=lambda c: c.title.newest, reverse=True) + processes.sort(key=lambda p: p.title.newest, reverse=True) else: - processes.sort(key=lambda c: c.title.newest) - return {'processes': processes, 'sort_by': sort_by} + processes.sort(key=lambda p: p.title.newest) + return {'processes': processes, 'sort_by': sort_by, 'pattern': pattern} def do_POST(self) -> None: """Handle any POST request.""" @@ -247,21 +297,8 @@ 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) - 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) - 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) + Todo.create_with_children(self.conn, date, + self.form_data.get_all_int('new_todo')) 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') @@ -301,6 +338,7 @@ class TaskHandler(BaseHTTPRequestHandler): 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_blockers(self.conn, self.form_data.get_all_int('blocker')) 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 @@ -326,12 +364,15 @@ class TaskHandler(BaseHTTPRequestHandler): process.effort.set(self.form_data.get_float('effort')) process.set_conditions(self.conn, self.form_data.get_all_int('condition')) + process.set_blockers(self.conn, self.form_data.get_all_int('blocker')) 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.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('keep_step'): + if step_id not in self.form_data.get_all_int('steps'): + raise BadFormatException('trying to keep unknown step') for step_id in self.form_data.get_all_int('steps'): for step_process_id in self.form_data.get_all_int( f'new_step_to_{step_id}'):