home · contact · privacy
When opening new Process from ProcessStep add field, pre-set as owned by previous...
[plomtask] / plomtask / http.py
index a2e8fa69fd05d4423751a4fa3ad3623ed4dffe8c..9680778bcdb21cd8526a3db46530e55ee8aa0834 100644 (file)
@@ -1,16 +1,17 @@
 """Web server stuff."""
 from typing import Any
+from base64 import b64encode, b64decode
 from http.server import BaseHTTPRequestHandler
 from http.server import HTTPServer
 from urllib.parse import urlparse, parse_qs
 from os.path import split as path_split
 from jinja2 import Environment as JinjaEnv, FileSystemLoader as JinjaFSLoader
-from plomtask.dating import todays_date
+from plomtask.dating import date_in_n_days
 from plomtask.days import Day
 from plomtask.exceptions import HandledException, BadFormatException, \
         NotFoundException
 from plomtask.db import DatabaseConnection, DatabaseFile
-from plomtask.processes import Process
+from plomtask.processes import Process, ProcessStep
 from plomtask.conditions import Condition
 from plomtask.todos import Todo
 
@@ -113,14 +114,19 @@ class TaskHandler(BaseHTTPRequestHandler):
         """Show Days from ?start= to ?end=."""
         start = self.params.get_str('start')
         end = self.params.get_str('end')
-        days = Day.all(self.conn, date_range=(start, end), fill_gaps=True)
+        if not end:
+            end = date_in_n_days(60)
+        ret = Day.by_date_range_with_limits(self.conn, (start, end), 'id')
+        days, start, end = ret
+        days = Day.with_filled_gaps(days, start, end)
         for day in days:
             day.collect_calendarized_todos(self.conn)
-        return {'start': start, 'end': end, 'days': days}
+        today = date_in_n_days(0)
+        return {'start': start, 'end': end, 'days': days, 'today': today}
 
     def do_GET_day(self) -> dict[str, object]:
         """Show single Day of ?date=."""
-        date = self.params.get_str('date', todays_date())
+        date = self.params.get_str('date', date_in_n_days(0))
         todays_todos = Todo.by_date(self.conn, date)
         conditions_present = []
         enablers_for = {}
@@ -161,18 +167,18 @@ class TaskHandler(BaseHTTPRequestHandler):
         process_id = self.params.get_int_or_none('process_id')
         comment_pattern = self.params.get_str('comment_pattern')
         todos = []
-        for t in Todo.by_date_range(self.conn, (start, end)):
-            if (process_id and t.process.id_ != process_id)\
-                    or (comment_pattern not in t.comment):
-                continue
-            todos += [t]
+        ret = Todo.by_date_range_with_limits(self.conn, (start, end))
+        todos_by_date_range, start, end = ret
+        todos = [t for t in todos_by_date_range
+                 if comment_pattern in t.comment
+                 and ((not process_id) or t.process.id_ == process_id)]
         if sort_by == 'doneness':
             todos.sort(key=lambda t: t.is_done)
         elif sort_by == '-doneness':
             todos.sort(key=lambda t: t.is_done, reverse=True)
-        elif sort_by == 'process':
+        elif sort_by == 'title':
             todos.sort(key=lambda t: t.title_then)
-        elif sort_by == '-process':
+        elif sort_by == '-title':
             todos.sort(key=lambda t: t.title_then, reverse=True)
         elif sort_by == 'comment':
             todos.sort(key=lambda t: t.comment)
@@ -208,7 +214,7 @@ class TaskHandler(BaseHTTPRequestHandler):
         id_ = self.params.get_int_or_none('id')
         c = Condition.by_id(self.conn, id_, create=True)
         ps = Process.all(self.conn)
-        return {'condition': c,
+        return {'condition': c, 'is_new': c.id_ is None,
                 'enabled_processes': [p for p in ps if c in p.conditions],
                 'disabled_processes': [p for p in ps if c in p.blockers],
                 'enabling_processes': [p for p in ps if c in p.enables],
@@ -230,11 +236,18 @@ class TaskHandler(BaseHTTPRequestHandler):
         """Show Process of ?id=."""
         id_ = self.params.get_int_or_none('id')
         process = Process.by_id(self.conn, id_, create=True)
-        return {'process': process,
+        title_64 = self.params.get_str('title_b64')
+        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)]
+        return {'process': process, 'is_new': process.id_ is None,
                 'steps': process.get_steps(self.conn),
-                'owners': process.used_as_step_by(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]:
@@ -264,6 +277,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 == 'effort':
+            processes.sort(key=lambda p: p.effort.newest)
+        elif sort_by == '-effort':
+            processes.sort(key=lambda p: p.effort.newest, reverse=True)
         elif sort_by == '-title':
             processes.sort(key=lambda p: p.title.newest, reverse=True)
         else:
@@ -297,8 +314,8 @@ class TaskHandler(BaseHTTPRequestHandler):
         day = Day.by_id(self.conn, date, create=True)
         day.comment = self.form_data.get_str('day_comment')
         day.save(self.conn)
-        Todo.create_with_children(self.conn, date,
-                                  self.form_data.get_all_int('new_todo'))
+        for process_id in sorted(self.form_data.get_all_int('new_todo')):
+            Todo.create_with_children(self.conn, process_id, date)
         done_ids = self.form_data.get_all_int('done')
         comments = self.form_data.get_all_str('comment')
         efforts = self.form_data.get_all_str('effort')
@@ -369,25 +386,43 @@ class TaskHandler(BaseHTTPRequestHandler):
         process.set_disables(self.conn, self.form_data.get_all_int('disables'))
         process.calendarize = self.form_data.get_all_str('calendarize') != []
         process.save(self.conn)
-        steps: list[tuple[int | None, int, int | None]] = []
+        assert isinstance(process.id_, int)
+        steps: list[ProcessStep] = []
         for step_id in self.form_data.get_all_int('keep_step'):
             if step_id not in self.form_data.get_all_int('steps'):
                 raise BadFormatException('trying to keep unknown step')
         for step_id in self.form_data.get_all_int('steps'):
-            for step_process_id in self.form_data.get_all_int(
-                    f'new_step_to_{step_id}'):
-                steps += [(None, step_process_id, step_id)]
             if step_id not in self.form_data.get_all_int('keep_step'):
                 continue
             step_process_id = self.form_data.get_int(
                     f'step_{step_id}_process_id')
             parent_id = self.form_data.get_int_or_none(
                     f'step_{step_id}_parent_id')
-            steps += [(step_id, step_process_id, parent_id)]
-        for step_process_id in self.form_data.get_all_int('new_top_step'):
-            steps += [(None, step_process_id, None)]
+            steps += [ProcessStep(step_id, process.id_, step_process_id,
+                                  parent_id)]
+        for step_id in self.form_data.get_all_int('steps'):
+            for step_process_id in self.form_data.get_all_int(
+                    f'new_step_to_{step_id}'):
+                steps += [ProcessStep(None, process.id_, step_process_id,
+                                      step_id)]
+        new_process_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
+        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)
+        process.set_owners(self.conn, self.form_data.get_all_int('step_of'))
+        if new_process_title:
+            title_b64_encoded = b64encode(new_process_title.encode()).decode()
+            params = f'step_to={process.id_}&title_b64={title_b64_encoded}'
+            return f'/process?{params}'
         return f'/process?id={process.id_}'
 
     def do_POST_condition(self) -> str: