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=f28b09715cd734248d0dce6240a1aa6dada73014;hb=48ed70167c50303f46309c5808f93f2ba169b34f;hp=a2e8fa69fd05d4423751a4fa3ad3623ed4dffe8c;hpb=f92de64d072009c8c4bf96b9eeb9fa245045662b;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index a2e8fa6..f28b097 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -5,12 +5,12 @@ 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.dating import 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 -from plomtask.processes import Process +from plomtask.processes import Process, ProcessStep from plomtask.conditions import Condition from plomtask.todos import Todo @@ -113,14 +113,19 @@ 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) + 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) - return {'start': start, 'end': end, 'days': days} + 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 = {} @@ -161,18 +166,18 @@ class TaskHandler(BaseHTTPRequestHandler): 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] + 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 == 'process': + elif sort_by == 'title': todos.sort(key=lambda t: t.title_then) - elif sort_by == '-process': + 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) @@ -264,6 +269,10 @@ class TaskHandler(BaseHTTPRequestHandler): 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 == 'effort': + processes.sort(key=lambda p: p.effort.newest) + elif sort_by == '-effort': + processes.sort(key=lambda p: p.effort.newest, reverse=True) elif sort_by == '-title': processes.sort(key=lambda p: p.title.newest, reverse=True) else: @@ -297,8 +306,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) - Todo.create_with_children(self.conn, date, - self.form_data.get_all_int('new_todo')) + 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') @@ -367,25 +376,32 @@ class TaskHandler(BaseHTTPRequestHandler): 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.set_step_suppressions(self.conn, + self.form_data.get_all_int('suppresses')) process.calendarize = self.form_data.get_all_str('calendarize') != [] process.save(self.conn) - steps: list[tuple[int | None, int, int | None]] = [] + assert isinstance(process.id_, int) + steps: list[ProcessStep] = [] 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( f'step_{step_id}_process_id') parent_id = self.form_data.get_int_or_none( f'step_{step_id}_parent_id') - steps += [(step_id, step_process_id, parent_id)] + steps += [ProcessStep(step_id, process.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 += [ProcessStep(None, process.id_, 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)] + steps += [ProcessStep(None, process.id_, step_process_id, None)] + process.uncache() process.set_steps(self.conn, steps) process.save(self.conn) return f'/process?id={process.id_}'