X-Git-Url: https://plomlompom.com/repos/condition_titles?a=blobdiff_plain;f=todo_templates%2Ftodo.html;h=5aaf8a0bd71165ef5b36aeeb50cbe728f44d2f0b;hb=11df024d5f24e8d7916f57c907975ebe27db617f;hp=45ed8a88bd21e63f334d3fd950f7f4df6eb803b4;hpb=38b9ce0ba2b5af072554999bc5836ffe455f06db;p=misc
diff --git a/todo_templates/todo.html b/todo_templates/todo.html
index 45ed8a8..5aaf8a0 100644
--- a/todo_templates/todo.html
+++ b/todo_templates/todo.html
@@ -1,12 +1,69 @@
{% extends 'base.html' %}
+
+
{% block css %}
tr.toplevel th { padding-right: 1em; }
td.center { text-align: center; }
tr.toplevel td, tr.toplevel th { padding-top: 1em; }
tr.lowlevel td, tr.lowlevel th { padding-top: 0em; }
+tr.grey td { background-color: #cccccc; }
{% endblock %}
+
+
+{% macro draw_todo(todo) %}{{todo.title}}{% if todo.comment %}({{todo.comment|e}}){% endif %}{% endmacro %}
+
+
+
+{% macro task_with_deps(task, indent) %}
+{% for i in range(indent) %} {% endfor %}+
+({{task.title.then}})
+{% for t in task.deps %}
+{{ task_with_deps(t, indent+1) }}
+{% endfor %}
+{% endmacro %}
+
+
+
+{% macro todo_with_deps(todo, indent) %}
+{% for i in range(indent) %} {% endfor %}{{ macros.doneness_string(todo) }} {{ draw_todo(todo) }}
+{% for dep in todo.deps %}
+{% if dep.been_observed %}
+{% for i in range(indent+1) %} {% endfor %}{{ macros.doneness_string(dep) }} ({{ draw_todo(dep) }})
+{% else %}
+{{ todo_with_deps(dep, indent+1) }}
+{% endif %}
+{% endfor %}
+{{ todo.observe() }}
+{% endmacro %}
+
+
+
+{% macro draw_deps(deps) %}
+{% for t in deps %}
+
+ |
+{{ macros.doneness_string(t) }} |
+
+{% if t.deps and not t.been_observed %}
+
+{{ draw_todo(t) }}
+{% for dep in t.deps %}
+{{ todo_with_deps(dep, 0) }}
+{% endfor %}
+
+{% else %}
+{{ draw_todo(t) }}
+{% endif %}
+ |
+{{ t.observe() }}
+
+{% endfor %}
+{% endmacro %}
+
+
+
{% block content %}
edit todo
@@ -30,13 +87,10 @@ tr.lowlevel td, tr.lowlevel th { padding-top: 0em; }
work |
-{% if todo.children %}
-[{% if todo.done %}â{% else %} {% endif %}]
-{% else %}
-
-{% endif %}
+
done
-(sum: {{todo.all_days_effort}})
+(all days: {{todo.all_days_effort}})
+(dependencies: {{todo.all_days_effort}})
|
@@ -80,57 +134,129 @@ done
|
tags |
-new:
+new: {{ macros.tagselection(submit_name='tag', selected_tags=todo.day_tags, all_tags=tags) }}
{% for tag in todo.task.tags.now | sort %}{% endfor %}
-{{ macros.tagselection(submit_name='tag', selected_tags=todo.day_tags, all_tags=tags) }}
|
-{% if todo.parents %}
+{% if todo.dependers %}
-parents |
+dependers |
-
-{% for parent in todo.parents %}
-- {{parent.title}}
+
+{% for path in todo.shortened_depender_paths %}
+
+
+{% if not path[0] %}[â¦] {% endif %}
+{% for step in path %}
+{% if step %}
+{% if step.dependers %}â {% endif %}{{step.title}}
+{% endif %}
+{% endfor %} |
+
{% endfor %}
-
+
|
{% endif %}
-children |
+sub-todos |
-{% if todo.children %}
+expected: |
+{% for dep_slot in dep_slots %}
+{% if dep_slot.todos %}
+{{ draw_deps(dep_slot.todos) }}
+{% else %}
-adopted | effort | title | comments |
+ |
+[ ] |
+
+{% if dep_slot.task.deps %}
+({{dep_slot.task.title.then}})
+{% for task in dep_slot.task.deps %}
+{{ task_with_deps(task, 1) }}
+{% endfor %}
+
+{% else %}
+({{dep_slot.task.title.then}})
+{% endif %}
+ |
+
+{% endif %}
+{% endfor %}
+{% if additional_deps %}
+bonus: |
+{{ draw_deps(additional_deps) }}
+{% endif %}
+
+ |
-{% for todo in child_todos %}
+
+
+suggestions |
+
+{% if todo.task.deps %}
+
{% endif %}
-
+ |
+
+
+
+free add |
+
make from task:
-
-adopt (from to ):
-
+
+adopt:
+
- |
+
+{{ macros.datalist_tasks(filtered_tasks) }}
+
+
+as chain |
+
+
+{% for dep in todo.deps_chain %}
+
+{{dep.deps_depth}} |
+{% if dep.deps_done %}{{ macros.doneness_string(dep) }}{% endif %} |
+{{ draw_todo(dep) }} |
+
{% endfor %}
-
+
|