X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=f6c5dc71db70fb46abfd4b15aaa2cd8cd656410d;hb=5330c790adbff45a76988d6483ab0175cb95da77;hp=5f739b685a3215197ca64566dfc602959a7eeef7;hpb=5a5d713ce0b223ab2f6ef34c15bb82b614bdda98;p=plomtask

diff --git a/plomtask/http.py b/plomtask/http.py
index 5f739b6..f6c5dc7 100644
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -5,11 +5,12 @@ 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.days import Day, 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
 
@@ -94,8 +95,7 @@ class TaskHandler(BaseHTTPRequestHandler):
         """Handle any GET request."""
         try:
             self._init_handling()
-            if self.site in {'calendar', 'day', 'process', 'processes', 'todo',
-                             'condition', 'conditions'}:
+            if hasattr(self, f'do_GET_{self.site}'):
                 template = f'{self.site}.html'
                 ctx = getattr(self, f'do_GET_{self.site}')()
                 html = self.server.jinja.get_template(template).render(**ctx)
@@ -113,55 +113,171 @@ 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)
-        return {'start': start, 'end': end, 'days': days}
+        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)
+        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())
-        conditions_listing = []
-        for condition in Condition.all(self.conn):
-            enablers = Todo.enablers_for_at(self.conn, condition, date)
-            disablers = Todo.disablers_for_at(self.conn, condition, date)
-            conditions_listing += [{
-                    'condition': condition,
-                    'enablers': enablers,
-                    'disablers': disablers}]
+        date = self.params.get_str('date', date_in_n_days(0))
+        todays_todos = Todo.by_date(self.conn, date)
+        conditions_present = []
+        enablers_for = {}
+        disablers_for = {}
+        for todo in todays_todos:
+            for condition in todo.conditions + todo.blockers:
+                if condition not in conditions_present:
+                    conditions_present += [condition]
+                    enablers_for[condition.id_] = [p for p in
+                                                   Process.all(self.conn)
+                                                   if condition in p.enables]
+                    disablers_for[condition.id_] = [p for p in
+                                                    Process.all(self.conn)
+                                                    if condition in p.disables]
+        seen_todos: set[int] = set()
+        top_nodes = [t.get_step_tree(seen_todos)
+                     for t in todays_todos if not t.parents]
         return {'day': Day.by_id(self.conn, date, create=True),
-                'todos': Todo.by_date(self.conn, date),
-                'processes': Process.all(self.conn),
-                'conditions_listing': conditions_listing}
+                'top_nodes': top_nodes,
+                'enablers_for': enablers_for,
+                'disablers_for': disablers_for,
+                'conditions_present': conditions_present,
+                'processes': Process.all(self.conn)}
 
     def do_GET_todo(self) -> dict[str, object]:
         """Show single Todo of ?id=."""
-        id_ = self.params.get_int_or_none('id')
+        id_ = self.params.get_int('id')
         todo = Todo.by_id(self.conn, id_)
         return {'todo': todo,
                 'todo_candidates': Todo.by_date(self.conn, todo.date),
                 'condition_candidates': Condition.all(self.conn)}
 
+    def do_GET_todos(self) -> dict[str, object]:
+        """Show Todos from ?start= to ?end=, of ?process=, ?comment= pattern"""
+        sort_by = self.params.get_str('sort_by')
+        start = self.params.get_str('start')
+        end = self.params.get_str('end')
+        process_id = self.params.get_int_or_none('process_id')
+        comment_pattern = self.params.get_str('comment_pattern')
+        todos = []
+        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 == 'title':
+            todos.sort(key=lambda t: t.title_then)
+        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)
+        elif sort_by == '-comment':
+            todos.sort(key=lambda t: t.comment, reverse=True)
+        elif sort_by == '-date':
+            todos.sort(key=lambda t: t.date, reverse=True)
+        else:
+            todos.sort(key=lambda t: t.date)
+        return {'start': start, 'end': end, 'process_id': process_id,
+                'comment_pattern': comment_pattern, 'todos': todos,
+                'all_processes': Process.all(self.conn), 'sort_by': sort_by}
+
     def do_GET_conditions(self) -> dict[str, object]:
         """Show all Conditions."""
-        return {'conditions': Condition.all(self.conn)}
+        pattern = self.params.get_str('pattern')
+        conditions = Condition.matching(self.conn, pattern)
+        sort_by = self.params.get_str('sort_by')
+        if sort_by == 'is_active':
+            conditions.sort(key=lambda c: c.is_active)
+        elif sort_by == '-is_active':
+            conditions.sort(key=lambda c: c.is_active, reverse=True)
+        elif sort_by == '-title':
+            conditions.sort(key=lambda c: c.title.newest, reverse=True)
+        else:
+            conditions.sort(key=lambda c: c.title.newest)
+        return {'conditions': conditions,
+                'sort_by': sort_by,
+                'pattern': pattern}
 
     def do_GET_condition(self) -> dict[str, object]:
         """Show Condition of ?id=."""
         id_ = self.params.get_int_or_none('id')
-        return {'condition': Condition.by_id(self.conn, id_, create=True)}
+        c = Condition.by_id(self.conn, id_, create=True)
+        ps = Process.all(self.conn)
+        return {'condition': c,
+                '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],
+                'disabling_processes': [p for p in ps if c in p.disables]}
+
+    def do_GET_condition_titles(self) -> dict[str, object]:
+        """Show title history of Condition of ?id=."""
+        id_ = self.params.get_int_or_none('id')
+        condition = Condition.by_id(self.conn, id_)
+        return {'condition': condition}
+
+    def do_GET_condition_descriptions(self) -> dict[str, object]:
+        """Show description historys of Condition of ?id=."""
+        id_ = self.params.get_int_or_none('id')
+        condition = Condition.by_id(self.conn, id_)
+        return {'condition': condition}
 
     def do_GET_process(self) -> dict[str, object]:
-        """Show process of ?id=."""
+        """Show Process of ?id=."""
         id_ = self.params.get_int_or_none('id')
         process = Process.by_id(self.conn, id_, create=True)
         return {'process': process,
                 'steps': process.get_steps(self.conn),
                 'owners': process.used_as_step_by(self.conn),
-                'process_candidates': Process.all(self.conn),
+                'n_todos': len(Todo.by_process_id(self.conn, process.id_)),
+                'step_candidates': Process.all(self.conn),
                 'condition_candidates': Condition.all(self.conn)}
 
+    def do_GET_process_titles(self) -> dict[str, object]:
+        """Show title history of Process of ?id=."""
+        id_ = self.params.get_int_or_none('id')
+        process = Process.by_id(self.conn, id_)
+        return {'process': process}
+
+    def do_GET_process_descriptions(self) -> dict[str, object]:
+        """Show description historys of Process of ?id=."""
+        id_ = self.params.get_int_or_none('id')
+        process = Process.by_id(self.conn, id_)
+        return {'process': process}
+
+    def do_GET_process_efforts(self) -> dict[str, object]:
+        """Show default effort history of Process of ?id=."""
+        id_ = self.params.get_int_or_none('id')
+        process = Process.by_id(self.conn, id_)
+        return {'process': process}
+
     def do_GET_processes(self) -> dict[str, object]:
         """Show all Processes."""
-        return {'processes': Process.all(self.conn)}
+        pattern = self.params.get_str('pattern')
+        processes = Process.matching(self.conn, pattern)
+        sort_by = self.params.get_str('sort_by')
+        if sort_by == 'steps':
+            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:
+            processes.sort(key=lambda p: p.title.newest)
+        return {'processes': processes, 'sort_by': sort_by, 'pattern': pattern}
 
     def do_POST(self) -> None:
         """Handle any POST request."""
@@ -172,86 +288,137 @@ class TaskHandler(BaseHTTPRequestHandler):
             postvars = parse_qs(self.rfile.read(length).decode(),
                                 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}')()
+            if hasattr(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.comment = self.form_data.get_str('day_comment')
         day.save(self.conn)
-        process_id = self.form_data.get_int_or_none('new_todo')
-        if process_id is not None:
-            process = Process.by_id(self.conn, process_id)
-            todo = Todo(None, process, False, day.date)
+        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')
+        for i, todo_id in enumerate(self.form_data.get_all_int('todo_id')):
+            todo = Todo.by_id(self.conn, todo_id)
+            todo.is_done = todo_id in done_ids
+            if len(comments) > 0:
+                todo.comment = comments[i]
+            if len(efforts) > 0:
+                todo.effort = float(efforts[i]) if efforts[i] else None
             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_or_none('id')
+        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_)
-        child_id = self.form_data.get_int_or_none('adopt')
-        if child_id is not None:
+        adopted_child_ids = self.form_data.get_all_int('adopt')
+        for child in todo.children:
+            if child.id_ not in adopted_child_ids:
+                assert isinstance(child.id_, int)
+                child = Todo.by_id(self.conn, child.id_)
+                todo.remove_child(child)
+        for child_id in adopted_child_ids:
+            if child_id in [c.id_ for c in todo.children]:
+                continue
             child = Todo.by_id(self.conn, child_id)
             todo.add_child(child)
+        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'))
-        todo.set_fulfills(self.conn, self.form_data.get_all_int('fulfills'))
-        todo.set_undoes(self.conn, self.form_data.get_all_int('undoes'))
+        todo.set_blockers(self.conn, self.form_data.get_all_int('blocker'))
+        todo.set_enables(self.conn, self.form_data.get_all_int('enables'))
+        todo.set_disables(self.conn, self.form_data.get_all_int('disables'))
         todo.is_done = len(self.form_data.get_all_str('done')) > 0
+        todo.calendarize = len(self.form_data.get_all_str('calendarize')) > 0
+        todo.comment = self.form_data.get_str('comment', ignore_strict=True)
         todo.save(self.conn)
-        for condition in todo.fulfills:
+        for condition in todo.enables:
             condition.save(self.conn)
-        for condition in todo.undoes:
+        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'))
         process.effort.set(self.form_data.get_float('effort'))
         process.set_conditions(self.conn,
                                self.form_data.get_all_int('condition'))
-        process.set_fulfills(self.conn, self.form_data.get_all_int('fulfills'))
-        process.set_undoes(self.conn, self.form_data.get_all_int('undoes'))
-        process.save_core(self.conn)
-        assert process.id_ is not None  # for mypy
-        process.explicit_steps = []
-        steps: list[tuple[int | None, int, int | None]] = []
+        process.set_blockers(self.conn, self.form_data.get_all_int('blocker'))
+        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.calendarize = self.form_data.get_all_str('calendarize') != []
+        process.save(self.conn)
+        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)]
+            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)]
         for step_process_id in self.form_data.get_all_int('new_top_step'):
-            steps += [(None, step_process_id, None)]
+            steps += [ProcessStep(None, process.id_, step_process_id, None)]
+        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)
+        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