X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=b81083b26e35a4d3a6dfb140781d95f14bae5c3c;hb=f79031c51b888d66448d18b159f17fbe28c7885c;hp=f6b17a076c6fa92455983b1198351cc486c79906;hpb=ad957773a676d94f523199e7fc46fa416224a09f;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index f6b17a0..b81083b 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -172,9 +172,9 @@ class TaskHandler(BaseHTTPRequestHandler): elif sort_by == '-doneness': todos.sort(key=lambda t: t.is_done, reverse=True) elif sort_by == 'process': - todos.sort(key=lambda t: t.process.title.newest) + todos.sort(key=lambda t: t.title_then) elif sort_by == '-process': - todos.sort(key=lambda t: t.process.title.newest, reverse=True) + 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': @@ -182,7 +182,7 @@ class TaskHandler(BaseHTTPRequestHandler): elif sort_by == '-date': todos.sort(key=lambda t: t.date, reverse=True) else: - todos.sort(key=lambda c: c.title.newest) + 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} @@ -207,7 +207,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=.""" @@ -256,13 +262,13 @@ class TaskHandler(BaseHTTPRequestHandler): processes = Process.matching(self.conn, pattern) sort_by = self.params.get_str('sort_by') if sort_by == 'steps': - processes.sort(key=lambda c: len(c.explicit_steps)) + processes.sort(key=lambda p: len(p.explicit_steps)) elif sort_by == '-steps': - processes.sort(key=lambda c: len(c.explicit_steps), reverse=True) + processes.sort(key=lambda p: len(p.explicit_steps), reverse=True) elif sort_by == '-title': - processes.sort(key=lambda c: c.title.newest, reverse=True) + processes.sort(key=lambda p: p.title.newest, reverse=True) else: - processes.sort(key=lambda c: c.title.newest) + processes.sort(key=lambda p: p.title.newest) return {'processes': processes, 'sort_by': sort_by, 'pattern': pattern} def do_POST(self) -> None: