X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=0aa692545d3e5ae38f4be7190a697df40259dcb0;hb=1ac1d92bba8caeeadf2f853cf15b9158c6024908;hp=9bb96f9c3a23aab0e470feba437038796302ffe8;hpb=23bf47fbbc14ccaf36fc5183720b413eea892ddf;p=plomtask
diff --git a/plomtask/http.py b/plomtask/http.py
index 9bb96f9..0aa6925 100644
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -1,4 +1,6 @@
"""Web server stuff."""
+from __future__ import annotations
+from dataclasses import dataclass
from typing import Any
from base64 import b64encode, b64decode
from http.server import BaseHTTPRequestHandler
@@ -11,13 +13,23 @@ from plomtask.days import Day
from plomtask.exceptions import HandledException, BadFormatException, \
NotFoundException
from plomtask.db import DatabaseConnection, DatabaseFile
-from plomtask.processes import Process, ProcessStep
+from plomtask.processes import Process, ProcessStep, ProcessStepsNode
from plomtask.conditions import Condition
from plomtask.todos import Todo
TEMPLATES_DIR = 'templates'
+@dataclass
+class TodoStepsNode:
+ """Collect what's useful for Todo steps tree display."""
+ id_: int
+ todo: Todo | None
+ process: Process | None
+ children: list[TodoStepsNode]
+ fillable: bool = False
+
+
class TaskServer(HTTPServer):
"""Variant of HTTPServer that knows .jinja as Jinja Environment."""
@@ -45,6 +57,13 @@ class InputsParser:
return default
return self.inputs[key][0]
+ def get_first_strings_starting(self, prefix: str) -> dict[str, str]:
+ """Retrieve dict of (first) strings at key starting with prefix."""
+ ret = {}
+ for key in [k for k in self.inputs.keys() if k.startswith(prefix)]:
+ ret[key] = self.inputs[key][0]
+ return ret
+
def get_int(self, key: str) -> int:
"""Retrieve single/first value of key as int, error if empty."""
val = self.get_int_or_none(key)
@@ -90,6 +109,7 @@ class InputsParser:
class TaskHandler(BaseHTTPRequestHandler):
"""Handles single HTTP request."""
+ # pylint: disable=too-many-public-methods
server: TaskServer
def do_GET(self) -> None:
@@ -110,12 +130,12 @@ class TaskHandler(BaseHTTPRequestHandler):
finally:
self.conn.close()
- def do_GET_calendar(self) -> dict[str, object]:
+ def _do_GET_calendar(self) -> dict[str, object]:
"""Show Days from ?start= to ?end=."""
start = self.params.get_str('start')
end = self.params.get_str('end')
if not end:
- end = date_in_n_days(60)
+ end = date_in_n_days(366)
ret = Day.by_date_range_with_limits(self.conn, (start, end), 'id')
days, start, end = ret
days = Day.with_filled_gaps(days, start, end)
@@ -124,10 +144,21 @@ class TaskHandler(BaseHTTPRequestHandler):
today = date_in_n_days(0)
return {'start': start, 'end': end, 'days': days, 'today': today}
+ def do_GET_calendar(self) -> dict[str, object]:
+ """Show Days from ?start= to ?end= â normal view."""
+ return self._do_GET_calendar()
+
+ def do_GET_calendar_txt(self) -> dict[str, object]:
+ """Show Days from ?start= to ?end= â minimalist view."""
+ return self._do_GET_calendar()
+
def do_GET_day(self) -> dict[str, object]:
"""Show single Day of ?date=."""
date = self.params.get_str('date', date_in_n_days(0))
todays_todos = Todo.by_date(self.conn, date)
+ total_effort = 0.0
+ for todo in todays_todos:
+ total_effort += todo.performed_effort
conditions_present = []
enablers_for = {}
disablers_for = {}
@@ -145,6 +176,7 @@ class TaskHandler(BaseHTTPRequestHandler):
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),
+ 'total_effort': total_effort,
'top_nodes': top_nodes,
'enablers_for': enablers_for,
'disablers_for': disablers_for,
@@ -153,10 +185,68 @@ class TaskHandler(BaseHTTPRequestHandler):
def do_GET_todo(self) -> dict[str, object]:
"""Show single Todo of ?id=."""
+
+ def walk_process_steps(id_: int,
+ process_step_nodes: list[ProcessStepsNode],
+ steps_nodes: list[TodoStepsNode]) -> None:
+ for process_step_node in process_step_nodes:
+ id_ += 1
+ node = TodoStepsNode(id_, None, process_step_node.process, [])
+ steps_nodes += [node]
+ walk_process_steps(id_, list(process_step_node.steps.values()),
+ node.children)
+
+ def walk_todo_steps(id_: int, todos: list[Todo],
+ steps_nodes: list[TodoStepsNode]) -> None:
+ for todo in todos:
+ matched = False
+ for match in [item for item in steps_nodes
+ if item.process
+ and item.process == todo.process]:
+ match.todo = todo
+ matched = True
+ for child in match.children:
+ child.fillable = True
+ walk_todo_steps(id_, todo.children, match.children)
+ if not matched:
+ id_ += 1
+ node = TodoStepsNode(id_, todo, None, [])
+ steps_nodes += [node]
+ walk_todo_steps(id_, todo.children, node.children)
+
+ def collect_adoptables_keys(steps_nodes: list[TodoStepsNode]
+ ) -> set[int]:
+ ids = set()
+ for node in steps_nodes:
+ if not node.todo:
+ assert isinstance(node.process, Process)
+ assert isinstance(node.process.id_, int)
+ ids.add(node.process.id_)
+ ids = ids | collect_adoptables_keys(node.children)
+ return ids
+
id_ = self.params.get_int('id')
todo = Todo.by_id(self.conn, id_)
- return {'todo': todo,
- 'todo_candidates': Todo.by_date(self.conn, todo.date),
+ todo_steps = [step.todo for step in todo.get_step_tree(set()).children]
+ process_tree = todo.process.get_steps(self.conn, None)
+ steps_todo_to_process: list[TodoStepsNode] = []
+ walk_process_steps(0, list(process_tree.values()),
+ steps_todo_to_process)
+ for steps_node in steps_todo_to_process:
+ steps_node.fillable = True
+ walk_todo_steps(len(steps_todo_to_process), todo_steps,
+ steps_todo_to_process)
+ adoptables: dict[int, list[Todo]] = {}
+ any_adoptables = [Todo.by_id(self.conn, t.id_)
+ for t in Todo.by_date(self.conn, todo.date)
+ if t != todo]
+ for id_ in collect_adoptables_keys(steps_todo_to_process):
+ adoptables[id_] = [t for t in any_adoptables
+ if t.process.id_ == id_]
+ return {'todo': todo, 'steps_todo_to_process': steps_todo_to_process,
+ 'adoption_candidates_for': adoptables,
+ 'process_candidates': Process.all(self.conn),
+ 'todo_candidates': any_adoptables,
'condition_candidates': Condition.all(self.conn)}
def do_GET_todos(self) -> dict[str, object]:
@@ -240,9 +330,15 @@ class TaskHandler(BaseHTTPRequestHandler):
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,
- 'steps': process.get_steps(self.conn),
- 'owners': process.used_as_step_by(self.conn),
+ '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_)),
'process_candidates': Process.all(self.conn),
'condition_candidates': Condition.all(self.conn)}
@@ -274,6 +370,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 == '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':
@@ -339,16 +439,29 @@ class TaskHandler(BaseHTTPRequestHandler):
return '/'
todo = Todo.by_id(self.conn, id_)
adopted_child_ids = self.form_data.get_all_int('adopt')
+ processes_to_make = self.form_data.get_all_int('make')
+ fill_fors = self.form_data.get_first_strings_starting('fill_for_')
+ for v in fill_fors.values():
+ if v.startswith('make_'):
+ processes_to_make += [int(v[5:])]
+ elif v != 'ignore':
+ adopted_child_ids += [int(v)]
+ to_remove = []
for child in todo.children:
+ assert isinstance(child.id_, int)
if child.id_ not in adopted_child_ids:
- assert isinstance(child.id_, int)
- child = Todo.by_id(self.conn, child.id_)
- todo.remove_child(child)
+ to_remove += [child.id_]
+ for id_ in to_remove:
+ child = Todo.by_id(self.conn, id_)
+ todo.remove_child(child)
for child_id in adopted_child_ids:
if child_id in [c.id_ for c in todo.children]:
continue
child = Todo.by_id(self.conn, child_id)
todo.add_child(child)
+ for process_id in processes_to_make:
+ made = Todo.create_with_children(self.conn, process_id, todo.date)
+ todo.add_child(made)
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'))
@@ -365,8 +478,34 @@ class TaskHandler(BaseHTTPRequestHandler):
condition.save(self.conn)
return f'/todo?id={todo.id_}'
+ def _do_POST_versioned_timestamps(self, cls: Any, attr_name: str) -> str:
+ """Update history timestamps for VersionedAttribute."""
+ id_ = self.params.get_int_or_none('id')
+ item = cls.by_id(self.conn, id_)
+ attr = getattr(item, attr_name)
+ for k, v in self.form_data.get_first_strings_starting('at:').items():
+ old = k[3:]
+ if old[19:] != v:
+ attr.reset_timestamp(old, f'{v}.0')
+ attr.save(self.conn)
+ cls_name = cls.__name__.lower()
+ return f'/{cls_name}_{attr_name}s?id={item.id_}'
+
+ def do_POST_process_descriptions(self) -> str:
+ """Update history timestamps for Process.description."""
+ return self._do_POST_versioned_timestamps(Process, 'description')
+
+ def do_POST_process_efforts(self) -> str:
+ """Update history timestamps for Process.effort."""
+ return self._do_POST_versioned_timestamps(Process, 'effort')
+
+ def do_POST_process_titles(self) -> str:
+ """Update history timestamps for Process.title."""
+ return self._do_POST_versioned_timestamps(Process, 'title')
+
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_)
@@ -402,24 +541,43 @@ class TaskHandler(BaseHTTPRequestHandler):
f'new_step_to_{step_id}'):
steps += [ProcessStep(None, process.id_, step_process_id,
step_id)]
- new_process_title = None
+ 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_process_title = step_identifier
+ 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)
- process.set_owners(self.conn, self.form_data.get_all_int('step_of'))
- if new_process_title:
- title_b64_encoded = b64encode(new_process_title.encode()).decode()
- return f'/process?title_b64={title_b64_encoded}'
- 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_descriptions(self) -> str:
+ """Update history timestamps for Condition.description."""
+ return self._do_POST_versioned_timestamps(Condition, 'description')
+
+ def do_POST_condition_titles(self) -> str:
+ """Update history timestamps for Condition.title."""
+ return self._do_POST_versioned_timestamps(Condition, 'title')
def do_POST_condition(self) -> str:
"""Update/insert Condition of ?id= and fields defined in postvars."""