X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=c8486003ce48fb785474432f512b08a380193a32;hb=7b6b8d0b93b1d4dd85152e49e7105aacc647327c;hp=140f6bcfb16dbe89222b324d7e06bd7545f2f0f3;hpb=0ed3bc539d21d5536d0fc635760d88a2231587b9;p=plomtask

diff --git a/plomtask/http.py b/plomtask/http.py
index 140f6bc..c848600 100644
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -1,6 +1,5 @@
 """Web server stuff."""
-from typing import Any
-from collections import namedtuple
+from typing import Any, NamedTuple
 from http.server import BaseHTTPRequestHandler
 from http.server import HTTPServer
 from urllib.parse import urlparse, parse_qs
@@ -119,23 +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())
         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]
-        ConditionsNode = namedtuple('ConditionsNode',
-                                    ('condition', 'enablers', 'disablers'))
-        conditions_nodes: list[ConditionsNode] = []
-        for condi in Condition.all(self.conn):
-            enablers = Todo.enablers_for_at(self.conn, condi, date)
-            disablers = Todo.disablers_for_at(self.conn, condi, date)
-            conditions_nodes += [ConditionsNode(condi, enablers, disablers)]
+        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),
                 'todo_trees': todo_trees,
                 'processes': Process.all(self.conn),
-                'conditions_nodes': conditions_nodes}
+                'condition_listings': condition_listings}
 
     def do_GET_todo(self) -> dict[str, object]:
         """Show single Todo of ?id=."""
@@ -195,10 +199,14 @@ class TaskHandler(BaseHTTPRequestHandler):
         day = Day.by_id(self.conn, date, create=True)
         day.comment = self.form_data.get_str('comment')
         day.save(self.conn)
+        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."""
@@ -237,7 +245,6 @@ class TaskHandler(BaseHTTPRequestHandler):
         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.save_core(self.conn)
-        assert process.id_ is not None  # for mypy
         process.explicit_steps = []
         steps: list[tuple[int | None, int, int | None]] = []
         for step_id in self.form_data.get_all_int('steps'):