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/form?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=8ddef656be0c8ab23c8e3fe8fa82b66005912cd5;hb=20ee4c41027582f761a63d947ed4c46e5b02bdab;hp=2ecfcaa3734325951bad368d91e7aaeaafb836fe;hpb=e60bbd142b5026748ee2181ca6758afef6202fb4;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 2ecfcaa..8ddef65 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 date_in_n_days +from plomtask.days import Day from plomtask.exceptions import HandledException, BadFormatException, \ NotFoundException from plomtask.db import DatabaseConnection, DatabaseFile @@ -94,8 +95,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) @@ -113,28 +113,40 @@ class TaskHandler(BaseHTTPRequestHandler): """Show Days from ?start= to ?end=.""" start = self.params.get_str('start') end = self.params.get_str('end') - days = Day.all(self.conn, date_range=(start, end), fill_gaps=True) - return {'start': start, 'end': end, 'days': days} + if not end: + end = date_in_n_days(60) + ret = Day.by_date_range_with_limits(self.conn, (start, end), 'id') + days, start, end = ret + days = Day.with_filled_gaps(days, start, end) + for day in days: + day.collect_calendarized_todos(self.conn) + today = date_in_n_days(0) + return {'start': start, 'end': end, 'days': days, 'today': today} def do_GET_day(self) -> dict[str, object]: """Show single Day of ?date=.""" - date = self.params.get_str('date', todays_date()) + date = self.params.get_str('date', date_in_n_days(0)) 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)} @@ -146,28 +158,122 @@ 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 = [] + ret = Todo.by_date_range_with_limits(self.conn, (start, end)) + todos_by_date_range, start, end = ret + todos = [t for t in todos_by_date_range + if comment_pattern in t.comment + and ((not process_id) or t.process.id_ == process_id)] + 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 == 'title': + todos.sort(key=lambda t: t.title_then) + elif sort_by == '-title': + 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.""" - return {'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) + 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, + '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=.""" + 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, '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)} + 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)} + 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 p: len(p.explicit_steps)) + elif sort_by == '-steps': + processes.sort(key=lambda p: len(p.explicit_steps), reverse=True) + elif sort_by == '-title': + processes.sort(key=lambda p: p.title.newest, reverse=True) + else: + 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.""" @@ -178,7 +284,7 @@ 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'): + if hasattr(self, f'do_POST_{self.site}'): redir_target = getattr(self, f'do_POST_{self.site}')() self.conn.commit() else: @@ -196,28 +302,18 @@ 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) + for process_id in sorted(self.form_data.get_all_int('new_todo')): + 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') 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) @@ -244,11 +340,15 @@ 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_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 - todo.comment = self.form_data.get_str('comment') + 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) @@ -269,15 +369,16 @@ 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}'): - steps += [(None, step_process_id, step_id)] if step_id not in self.form_data.get_all_int('keep_step'): continue step_process_id = self.form_data.get_int( @@ -285,8 +386,13 @@ class TaskHandler(BaseHTTPRequestHandler): parent_id = self.form_data.get_int_or_none( f'step_{step_id}_parent_id') steps += [(step_id, step_process_id, parent_id)] + 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}'): + steps += [(None, step_process_id, step_id)] for step_process_id in self.form_data.get_all_int('new_top_step'): steps += [(None, step_process_id, None)] + process.uncache() process.set_steps(self.conn, steps) process.save(self.conn) return f'/process?id={process.id_}'