X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=plomtask%2Fhttp.py;h=bb05fa9618effaf7279ffe8553f872d3d1f16e05;hb=eea64af900512aaa83146a02f6e7c6d0092b5b3a;hp=2d5db82ccd2e85e7a56ae13c2e52134592efccd7;hpb=4c546e0133670dd10aec890c3cea6329c3a29663;p=plomtask

diff --git a/plomtask/http.py b/plomtask/http.py
index 2d5db82..bb05fa9 100644
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -110,7 +110,7 @@ class TaskHandler(BaseHTTPRequestHandler):
         finally:
             self.conn.close()
 
-    def do_GET_calendar(self) -> dict[str, object]:
+    def _do_GET_calendar(self) -> dict[str, object]:
         """Show Days from ?start= to ?end=."""
         start = self.params.get_str('start')
         end = self.params.get_str('end')
@@ -124,6 +124,14 @@ class TaskHandler(BaseHTTPRequestHandler):
         today = date_in_n_days(0)
         return {'start': start, 'end': end, 'days': days, 'today': today}
 
+    def do_GET_calendar(self) -> dict[str, object]:
+        """Show Days from ?start= to ?end= – normal view."""
+        return self._do_GET_calendar()
+
+    def do_GET_calendar_txt(self) -> dict[str, object]:
+        """Show Days from ?start= to ?end= – minimalist view."""
+        return self._do_GET_calendar()
+
     def do_GET_day(self) -> dict[str, object]:
         """Show single Day of ?date=."""
         date = self.params.get_str('date', date_in_n_days(0))
@@ -156,6 +164,7 @@ class TaskHandler(BaseHTTPRequestHandler):
         id_ = self.params.get_int('id')
         todo = Todo.by_id(self.conn, id_)
         return {'todo': todo,
+                'process_candidates': Process.all(self.conn),
                 'todo_candidates': Todo.by_date(self.conn, todo.date),
                 'condition_candidates': Condition.all(self.conn)}
 
@@ -240,11 +249,17 @@ class TaskHandler(BaseHTTPRequestHandler):
         if title_64:
             title = b64decode(title_64.encode()).decode()
             process.title.set(title)
+        owners = process.used_as_step_by(self.conn)
+        for step_id in self.params.get_all_int('step_to'):
+            owners += [Process.by_id(self.conn, step_id)]
+        preset_top_step = None
+        for process_id in self.params.get_all_int('has_step'):
+            preset_top_step = process_id
         return {'process': process, 'is_new': process.id_ is None,
-                'steps': process.get_steps(self.conn),
-                'owners': process.used_as_step_by(self.conn),
+                'preset_top_step': preset_top_step,
+                'steps': process.get_steps(self.conn), 'owners': owners,
                 'n_todos': len(Todo.by_process_id(self.conn, process.id_)),
-                'step_candidates': Process.all(self.conn),
+                'process_candidates': Process.all(self.conn),
                 'condition_candidates': Condition.all(self.conn)}
 
     def do_GET_process_titles(self) -> dict[str, object]:
@@ -274,6 +289,10 @@ class TaskHandler(BaseHTTPRequestHandler):
             processes.sort(key=lambda p: len(p.explicit_steps))
         elif sort_by == '-steps':
             processes.sort(key=lambda p: len(p.explicit_steps), reverse=True)
+        elif sort_by == 'owners':
+            processes.sort(key=lambda p: p.n_owners or 0)
+        elif sort_by == '-owners':
+            processes.sort(key=lambda p: p.n_owners or 0, reverse=True)
         elif sort_by == 'effort':
             processes.sort(key=lambda p: p.effort.newest)
         elif sort_by == '-effort':
@@ -349,6 +368,9 @@ class TaskHandler(BaseHTTPRequestHandler):
                 continue
             child = Todo.by_id(self.conn, child_id)
             todo.add_child(child)
+        for process_id in self.form_data.get_all_int('make'):
+            made = Todo.create_with_children(self.conn, process_id, todo.date)
+            todo.add_child(made)
         effort = self.form_data.get_str('effort', ignore_strict=True)
         todo.effort = float(effort) if effort else None
         todo.set_conditions(self.conn, self.form_data.get_all_int('condition'))
@@ -367,6 +389,7 @@ class TaskHandler(BaseHTTPRequestHandler):
 
     def do_POST_process(self) -> str:
         """Update or insert Process of ?id= and fields defined in postvars."""
+        # pylint: disable=too-many-branches
         id_ = self.params.get_int_or_none('id')
         for _ in self.form_data.get_all_str('delete'):
             process = Process.by_id(self.conn, id_)
@@ -402,23 +425,35 @@ class TaskHandler(BaseHTTPRequestHandler):
                     f'new_step_to_{step_id}'):
                 steps += [ProcessStep(None, process.id_, step_process_id,
                                       step_id)]
-        new_process_title = None
+        new_step_title = None
         for step_identifier in self.form_data.get_all_str('new_top_step'):
             try:
                 step_process_id = int(step_identifier)
                 steps += [ProcessStep(None, process.id_, step_process_id,
                                       None)]
             except ValueError:
-                new_process_title = step_identifier
+                new_step_title = step_identifier
         process.uncache()
         process.set_steps(self.conn, steps)
         process.set_step_suppressions(self.conn,
                                       self.form_data.get_all_int('suppresses'))
         process.save(self.conn)
-        if new_process_title:
-            title_b64_encoded = b64encode(new_process_title.encode()).decode()
-            return f'/process?title_b64={title_b64_encoded}'
-        return f'/process?id={process.id_}'
+        owners_to_set = []
+        new_owner_title = None
+        for owner_identifier in self.form_data.get_all_str('step_of'):
+            try:
+                owners_to_set += [int(owner_identifier)]
+            except ValueError:
+                new_owner_title = owner_identifier
+        process.set_owners(self.conn, owners_to_set)
+        params = f'id={process.id_}'
+        if new_step_title:
+            title_b64_encoded = b64encode(new_step_title.encode()).decode()
+            params = f'step_to={process.id_}&title_b64={title_b64_encoded}'
+        elif new_owner_title:
+            title_b64_encoded = b64encode(new_owner_title.encode()).decode()
+            params = f'has_step={process.id_}&title_b64={title_b64_encoded}'
+        return f'/process?{params}'
 
     def do_POST_condition(self) -> str:
         """Update/insert Condition of ?id= and fields defined in postvars."""