X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=d7be135ee03baf997aca63ef09c55aae4a4350a6;hb=e49ef886fbe6308db338f025d21f9cb9a3901240;hp=4bf58b41a2cb264a0a40bf018ee9c5536e358bda;hpb=8f6b4ec61b126d6edbfda4f20d62398d92390a95;p=plomtask

diff --git a/plomtask/http.py b/plomtask/http.py
index 4bf58b4..d7be135 100644
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -1,5 +1,5 @@
 """Web server stuff."""
-from typing import Any
+from typing import Any, NamedTuple
 from http.server import BaseHTTPRequestHandler
 from http.server import HTTPServer
 from urllib.parse import urlparse, parse_qs
@@ -118,19 +118,28 @@ class TaskHandler(BaseHTTPRequestHandler):
 
     def do_GET_day(self) -> dict[str, object]:
         """Show single Day of ?date=."""
+
+        class ConditionListing(NamedTuple):
+            """Listing of Condition augmented with its enablers, disablers."""
+            condition: Condition
+            enablers: list[Todo]
+            disablers: list[Todo]
+
         date = self.params.get_str('date', todays_date())
-        conditions_listing = []
-        for condition in Condition.all(self.conn):
-            enablers = Todo.enablers_for_at(self.conn, condition, date)
-            disablers = Todo.disablers_for_at(self.conn, condition, date)
-            conditions_listing += [{
-                    'condition': condition,
-                    'enablers': enablers,
-                    'disablers': disablers}]
+        top_todos = [t for t in Todo.by_date(self.conn, date) if not t.parents]
+        seen_todos: set[int] = set()
+        seen_conditions: set[int] = set()
+        todo_trees = [t.get_step_tree(seen_todos, seen_conditions)
+                      for t in top_todos]
+        condition_listings: list[ConditionListing] = []
+        for cond in Condition.all(self.conn):
+            enablers = Todo.enablers_for_at(self.conn, cond, date)
+            disablers = Todo.disablers_for_at(self.conn, cond, date)
+            condition_listings += [ConditionListing(cond, enablers, disablers)]
         return {'day': Day.by_id(self.conn, date, create=True),
-                'todos': Todo.by_date(self.conn, date),
+                'todo_trees': todo_trees,
                 'processes': Process.all(self.conn),
-                'conditions_listing': conditions_listing}
+                'condition_listings': condition_listings}
 
     def do_GET_todo(self) -> dict[str, object]:
         """Show single Todo of ?id=."""
@@ -156,7 +165,7 @@ class TaskHandler(BaseHTTPRequestHandler):
         return {'process': process,
                 'steps': process.get_steps(self.conn),
                 'owners': process.used_as_step_by(self.conn),
-                'process_candidates': Process.all(self.conn),
+                'step_candidates': Process.all(self.conn),
                 'condition_candidates': Condition.all(self.conn)}
 
     def do_GET_processes(self) -> dict[str, object]:
@@ -190,18 +199,28 @@ class TaskHandler(BaseHTTPRequestHandler):
         day = Day.by_id(self.conn, date, create=True)
         day.comment = self.form_data.get_str('comment')
         day.save(self.conn)
-        process_id = self.form_data.get_int_or_none('new_todo')
-        if process_id is not None:
+        existing_todos = Todo.by_date(self.conn, date)
+        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)
+            todo.adopt_from(existing_todos)
+            todo.make_missing_children(self.conn)
+            todo.save(self.conn)
 
     def do_POST_todo(self) -> None:
         """Update Todo and its children."""
         id_ = self.params.get_int('id')
         todo = Todo.by_id(self.conn, id_)
-        child_id = self.form_data.get_int_or_none('adopt')
-        if child_id is not None:
+        adopted_child_ids = self.form_data.get_all_int('adopt')
+        for child in todo.children:
+            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)
+        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)
         todo.set_conditions(self.conn, self.form_data.get_all_int('condition'))