home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve placement of Todos and Conditions in Day view.
[plomtask]
/
plomtask
/
http.py
diff --git
a/plomtask/http.py
b/plomtask/http.py
index cc4358cfbf0365659fa89750e941c99533fd9a40..e541057ed793ebe2a53c55b50a11be7133c5884f 100644
(file)
--- a/
plomtask/http.py
+++ b/
plomtask/http.py
@@
-120,6
+120,11
@@
class TaskHandler(BaseHTTPRequestHandler):
"""Show single Day of ?date=."""
date = self.params.get_str('date', todays_date())
conditions_listing = []
"""Show single Day of ?date=."""
date = self.params.get_str('date', todays_date())
conditions_listing = []
+ top_todos = [t for t in Todo.by_date(self.conn, date) if not t.parents]
+ seen_todos: set[int] = set()
+ seen_conditions: set[int] = set()
+ todo_trees = [t.get_step_tree(seen_todos, seen_conditions)
+ for t in top_todos]
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)
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)
@@
-128,7
+133,7
@@
class TaskHandler(BaseHTTPRequestHandler):
'enablers': enablers,
'disablers': disablers}]
return {'day': Day.by_id(self.conn, date, create=True),
'enablers': enablers,
'disablers': disablers}]
return {'day': Day.by_id(self.conn, date, create=True),
- 'todo
s': Todo.by_date(self.conn, date)
,
+ 'todo
_trees': todo_trees
,
'processes': Process.all(self.conn),
'conditions_listing': conditions_listing}
'processes': Process.all(self.conn),
'conditions_listing': conditions_listing}
@@
-205,13
+210,13
@@
class TaskHandler(BaseHTTPRequestHandler):
child = Todo.by_id(self.conn, child_id)
todo.add_child(child)
todo.set_conditions(self.conn, self.form_data.get_all_int('condition'))
child = Todo.by_id(self.conn, child_id)
todo.add_child(child)
todo.set_conditions(self.conn, self.form_data.get_all_int('condition'))
- todo.set_
fulfills(self.conn, self.form_data.get_all_int('fulfill
s'))
- todo.set_
undoes(self.conn, self.form_data.get_all_int('undo
es'))
+ todo.set_
enables(self.conn, self.form_data.get_all_int('enable
s'))
+ todo.set_
disables(self.conn, self.form_data.get_all_int('disabl
es'))
todo.is_done = len(self.form_data.get_all_str('done')) > 0
todo.save(self.conn)
todo.is_done = len(self.form_data.get_all_str('done')) > 0
todo.save(self.conn)
- for condition in todo.
fulfill
s:
+ for condition in todo.
enable
s:
condition.save(self.conn)
condition.save(self.conn)
- for condition in todo.
undo
es:
+ for condition in todo.
disabl
es:
condition.save(self.conn)
def do_POST_process(self) -> None:
condition.save(self.conn)
def do_POST_process(self) -> None:
@@
-223,8
+228,8
@@
class TaskHandler(BaseHTTPRequestHandler):
process.effort.set(self.form_data.get_float('effort'))
process.set_conditions(self.conn,
self.form_data.get_all_int('condition'))
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('fulfill
s'))
- process.set_
undoes(self.conn, self.form_data.get_all_int('undo
es'))
+ process.set_
enables(self.conn, self.form_data.get_all_int('enable
s'))
+ process.set_
disables(self.conn, self.form_data.get_all_int('disabl
es'))
process.save_core(self.conn)
assert process.id_ is not None # for mypy
process.explicit_steps = []
process.save_core(self.conn)
assert process.id_ is not None # for mypy
process.explicit_steps = []