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
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':