Use same date ranging code for Day and Todo filtering.

[plomtask] / plomtask / http.py

diff --git a/plomtask/http.py b/plomtask/http.py
index 8255aa2469354f0f28f7c1fe907a2adc7dd781f0..a2e8fa69fd05d4423751a4fa3ad3623ed4dffe8c 100644 (file)
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -5,7 +5,8 @@ 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 todays_date
+from plomtask.days import Day
 from plomtask.exceptions import HandledException, BadFormatException, \
         NotFoundException
 from plomtask.db import DatabaseConnection, DatabaseFile
@@ -160,11 +161,9 @@ 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.matching(self.conn, comment_pattern):
-            # pylint: disable=too-many-boolean-expressions
-            if (start and t.date < start)\
-                    or (end and t.date > end)\
-                    or (process_id and t.process.id_ != process_id):
+        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]
         if sort_by == 'doneness':
@@ -207,7 +206,13 @@ class TaskHandler(BaseHTTPRequestHandler):
     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=."""