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

diff --git a/plomtask/http.py b/plomtask/http.py
index 800193c..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}
 
@@ -207,11 +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) -> 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:
@@ -273,7 +286,12 @@ class TaskHandler(BaseHTTPRequestHandler):
     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)