X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=316fd0805588a00b59dc28fbd8094fc8634dcd87;hb=f19823e9e77ae0017022dbfe63f66d2b065ba33a;hp=d8ca8dfdffd93de4ffd7cc3858826cfd35cf60f4;hpb=951d8ad55c0d54286f9c986257a67dfa9710fcf2;p=plomtask

diff --git a/plomtask/http.py b/plomtask/http.py
index d8ca8df..316fd08 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,29 @@ 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)]
+        todo_trees = [t.get_undone_steps_tree() for t in top_todos]
+        done_trees = []
+        for t in top_todos:
+            done_trees += t.get_done_steps_tree()
+        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,
+                'done_trees': done_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=."""
@@ -161,7 +166,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]:
@@ -178,32 +183,44 @@ class TaskHandler(BaseHTTPRequestHandler):
                                 keep_blank_values=True, strict_parsing=True)
             self.form_data = InputsParser(postvars)
             if self.site in ('day', 'process', 'todo', 'condition'):
-                getattr(self, f'do_POST_{self.site}')()
+                redir_target = getattr(self, f'do_POST_{self.site}')()
                 self.conn.commit()
             else:
                 msg = f'Page not known as POST target: /{self.site}'
                 raise NotFoundException(msg)
-            self._redirect('/')
+            self._redirect(redir_target)
         except HandledException as error:
             self._send_msg(error, code=error.http_code)
         finally:
             self.conn.close()
 
-    def do_POST_day(self) -> None:
+    def do_POST_day(self) -> str:
         """Update or insert Day of date and Todos mapped to it."""
         date = self.params.get_str('date')
         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)
+        for todo_id in self.form_data.get_all_int('done'):
+            todo = Todo.by_id(self.conn, todo_id)
+            todo.is_done = True
+            todo.save(self.conn)
+        return f'/day?date={date}'
 
-    def do_POST_todo(self) -> None:
+    def do_POST_todo(self) -> str:
         """Update Todo and its children."""
         id_ = self.params.get_int('id')
+        for _ in self.form_data.get_all_str('delete'):
+            todo = Todo .by_id(self.conn, id_)
+            todo.remove(self.conn)
+            return '/'
         todo = Todo.by_id(self.conn, id_)
         adopted_child_ids = self.form_data.get_all_int('adopt')
         for child in todo.children:
@@ -225,10 +242,15 @@ class TaskHandler(BaseHTTPRequestHandler):
             condition.save(self.conn)
         for condition in todo.disables:
             condition.save(self.conn)
+        return f'/todo?id={todo.id_}'
 
-    def do_POST_process(self) -> None:
+    def do_POST_process(self) -> str:
         """Update or insert Process of ?id= and fields defined in postvars."""
         id_ = self.params.get_int_or_none('id')
+        for _ in self.form_data.get_all_str('delete'):
+            process = Process.by_id(self.conn, id_)
+            process.remove(self.conn)
+            return '/processes'
         process = Process.by_id(self.conn, id_, create=True)
         process.title.set(self.form_data.get_str('title'))
         process.description.set(self.form_data.get_str('description'))
@@ -238,7 +260,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'):
@@ -256,14 +277,20 @@ class TaskHandler(BaseHTTPRequestHandler):
             steps += [(None, step_process_id, None)]
         process.set_steps(self.conn, steps)
         process.save(self.conn)
+        return f'/process?id={process.id_}'
 
-    def do_POST_condition(self) -> None:
+    def do_POST_condition(self) -> str:
         """Update/insert Condition of ?id= and fields defined in postvars."""
         id_ = self.params.get_int_or_none('id')
+        for _ in self.form_data.get_all_str('delete'):
+            condition = Condition.by_id(self.conn, id_)
+            condition.remove(self.conn)
+            return '/conditions'
         condition = Condition.by_id(self.conn, id_, create=True)
         condition.title.set(self.form_data.get_str('title'))
         condition.description.set(self.form_data.get_str('description'))
         condition.save(self.conn)
+        return f'/condition?id={condition.id_}'
 
     def _init_handling(self) -> None:
         # pylint: disable=attribute-defined-outside-init