X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=fd206032bd302de252c05747e3457199c03770fb;hb=d7b039106e74a250d343ab036fdf90ad1a27eb3f;hp=280b0f5cef64c904e5e64dede0f91b2a7cf800f7;hpb=f1795f22a6ea2409fc1c7c0ea921dc530e7625c2;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 280b0f5..fd20603 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -120,7 +120,8 @@ class TaskHandler(BaseHTTPRequestHandler): 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=.""" @@ -174,9 +175,9 @@ class TaskHandler(BaseHTTPRequestHandler): 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) @@ -378,9 +379,6 @@ class TaskHandler(BaseHTTPRequestHandler): 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( @@ -388,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_}'