X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=d76ac052014c1b9f8d548ed24267561aead04892;hb=f59afccd32d45e60c48d451e6b8304a817627c62;hp=d5da1d7e4d914a17b2a27a67e80db762e83f8403;hpb=ce9b74158c87750ccf1c8f363a59c0465e4b1277;p=plomtask
diff --git a/plomtask/http.py b/plomtask/http.py
index d5da1d7..d76ac05 100644
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -147,7 +147,17 @@ class TaskHandler(BaseHTTPRequestHandler):
def do_GET_conditions(self) -> dict[str, object]:
"""Show all Conditions."""
- return {'conditions': Condition.all(self.conn)}
+ conditions = Condition.all(self.conn)
+ 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}
def do_GET_condition(self) -> dict[str, object]:
"""Show Condition of ?id=."""
@@ -196,7 +206,17 @@ class TaskHandler(BaseHTTPRequestHandler):
def do_GET_processes(self) -> dict[str, object]:
"""Show all Processes."""
- return {'processes': Process.all(self.conn)}
+ processes = Process.all(self.conn)
+ sort_by = self.params.get_str('sort_by')
+ if sort_by == 'steps':
+ processes.sort(key=lambda c: len(c.explicit_steps))
+ elif sort_by == '-steps':
+ processes.sort(key=lambda c: len(c.explicit_steps), reverse=True)
+ elif sort_by == '-title':
+ processes.sort(key=lambda c: c.title.newest, reverse=True)
+ else:
+ processes.sort(key=lambda c: c.title.newest)
+ return {'processes': processes, 'sort_by': sort_by}
def do_POST(self) -> None:
"""Handle any POST request."""
@@ -242,11 +262,14 @@ class TaskHandler(BaseHTTPRequestHandler):
todo.save(self.conn)
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)
@@ -273,6 +296,8 @@ class TaskHandler(BaseHTTPRequestHandler):
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_enables(self.conn, self.form_data.get_all_int('enables'))
todo.set_disables(self.conn, self.form_data.get_all_int('disables'))