X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=773548f8a9201e3e48ab8093b6431ab826842110;hb=8b606f7c555c250f0d5ab8314aa95ce7efda07c7;hp=537f21fff50f5dea2a75daf66edc368107ab0902;hpb=d916781d66c1aaf4e3a04580153dce61744d5729;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 537f21f..773548f 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -1,5 +1,6 @@ """Web server stuff.""" from typing import Any +from base64 import b64encode, b64decode from http.server import BaseHTTPRequestHandler from http.server import HTTPServer from urllib.parse import urlparse, parse_qs @@ -10,7 +11,7 @@ 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 @@ -175,9 +176,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) @@ -213,7 +214,7 @@ class TaskHandler(BaseHTTPRequestHandler): id_ = self.params.get_int_or_none('id') c = Condition.by_id(self.conn, id_, create=True) ps = Process.all(self.conn) - return {'condition': c, + return {'condition': c, 'is_new': c.id_ is None, '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], @@ -235,11 +236,21 @@ class TaskHandler(BaseHTTPRequestHandler): """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), + title_64 = self.params.get_str('title_b64') + if title_64: + title = b64decode(title_64.encode()).decode() + process.title.set(title) + owners = process.used_as_step_by(self.conn) + for step_id in self.params.get_all_int('step_to'): + owners += [Process.by_id(self.conn, step_id)] + preset_top_step = None + for process_id in self.params.get_all_int('has_step'): + preset_top_step = process_id + return {'process': process, 'is_new': process.id_ is None, + 'preset_top_step': preset_top_step, + 'steps': process.get_steps(self.conn), 'owners': owners, 'n_todos': len(Todo.by_process_id(self.conn, process.id_)), - 'step_candidates': Process.all(self.conn), + 'process_candidates': Process.all(self.conn), 'condition_candidates': Condition.all(self.conn)} def do_GET_process_titles(self) -> dict[str, object]: @@ -269,6 +280,14 @@ 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 == 'owners': + processes.sort(key=lambda p: p.n_owners or 0) + elif sort_by == '-owners': + processes.sort(key=lambda p: p.n_owners or 0, 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: @@ -302,8 +321,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') @@ -358,6 +377,7 @@ class TaskHandler(BaseHTTPRequestHandler): def do_POST_process(self) -> str: """Update or insert Process of ?id= and fields defined in postvars.""" + # pylint: disable=too-many-branches id_ = self.params.get_int_or_none('id') for _ in self.form_data.get_all_str('delete'): process = Process.by_id(self.conn, id_) @@ -374,26 +394,54 @@ class TaskHandler(BaseHTTPRequestHandler): 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) - 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)] - for step_process_id in self.form_data.get_all_int('new_top_step'): - steps += [(None, step_process_id, None)] + 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)] + new_step_title = None + for step_identifier in self.form_data.get_all_str('new_top_step'): + try: + step_process_id = int(step_identifier) + steps += [ProcessStep(None, process.id_, step_process_id, + None)] + except ValueError: + new_step_title = step_identifier + process.uncache() process.set_steps(self.conn, steps) + process.set_step_suppressions(self.conn, + self.form_data.get_all_int('suppresses')) process.save(self.conn) - return f'/process?id={process.id_}' + owners_to_set = [] + new_owner_title = None + for owner_identifier in self.form_data.get_all_str('step_of'): + try: + owners_to_set += [int(owner_identifier)] + except ValueError: + new_owner_title = owner_identifier + process.set_owners(self.conn, owners_to_set) + params = f'id={process.id_}' + if new_step_title: + title_b64_encoded = b64encode(new_step_title.encode()).decode() + params = f'step_to={process.id_}&title_b64={title_b64_encoded}' + elif new_owner_title: + title_b64_encoded = b64encode(new_owner_title.encode()).decode() + params = f'has_step={process.id_}&title_b64={title_b64_encoded}' + return f'/process?{params}' def do_POST_condition(self) -> str: """Update/insert Condition of ?id= and fields defined in postvars."""