X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=f5160f64d2504a3cf40733668623e1475eaa0cd8;hb=a0244482692edf794960f3c2af9461be2ad15e8a;hp=b4c2b0886c08baada1f848eb66e832a0ade99b72;hpb=ee18435127ad396c24dbee2c7efcdbe6810d5a91;p=plomtask

diff --git a/plomtask/http.py b/plomtask/http.py
index b4c2b08..f5160f6 100644
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -127,10 +127,10 @@ class TaskHandler(BaseHTTPRequestHandler):
 
         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]
+        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)
@@ -138,6 +138,7 @@ class TaskHandler(BaseHTTPRequestHandler):
             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),
                 'condition_listings': condition_listings}
 
@@ -182,18 +183,18 @@ 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)
@@ -207,10 +208,23 @@ class TaskHandler(BaseHTTPRequestHandler):
             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)
+            for condition in todo.enables:
+                condition.save(self.conn)
+            for condition in todo.disables:
+                condition.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:
@@ -232,14 +246,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
+            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'))
@@ -266,14 +281,21 @@ 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.is_active = self.form_data.get_all_str('is_active') != []
         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