Minor code style improvement re NamedTuple usage.

[plomtask] / templates / day.html

diff --git a/templates/day.html b/templates/day.html
index 637e08d94ad2e72da8fbcbd009b0c428131edaee..e3fe5ef29c5865551d42d751a5d45ea380921065 100644 (file)
--- a/templates/day.html
+++ b/templates/day.html
@@ -1,9 +1,15 @@
 {% extends 'base.html' %}
 
-{% macro todo_with_children(todo, indent) %}
-<li>{% for i in range(indent) %}+{% endfor %} [{% if todo.is_done %}x{% else %} {% endif %}] <a href="todo?id={{todo.id_}}">{{todo.process.title.newest|e}}</a>
-{% for child in todo.children %}
-{{ todo_with_children(child, indent+1) }}
+{% macro node_with_children(node, indent) %}
+<li>{% for i in range(indent) %}+{% endfor %}
+{% if node.is_todo %}
+{% if not node.item.is_doable %}<del>{% endif %}[{% if node.item.is_done %}x{% else %} {% endif %}]{% if not node.item.is_doable %}</del>{% endif %}
+{% if node.seen %}({% else %}{% endif %}<a href="todo?id={{node.item.id_}}">{{node.item.process.title.newest|e}}</a>{% if node.seen %}){% else %}{% endif %}
+{% else %}
+&lt; {% if node.seen %}({% else %}{% endif %}<a href="condition?id={{node.item.id_}}">{{node.item.title.newest|e}}</a>{% if node.seen %}){% else %}{% endif %}
+{% endif %}
+{% for child in node.children %}
+{{ node_with_children(child, indent+1) }}
 {% endfor %}
 {% endmacro %}
 
@@ -22,9 +28,23 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 {% endfor %}
 </datalist>
 </form>
+<h4>conditions</h4>
+{% for node in condition_listings %}
+<li>[{% if node.condition.is_active %}x{% else %} {% endif %}] <a href="condition?id={{node.condition.id_}}">{{node.condition.title.newest|e}}</a>
 <ul>
-{% for todo in todos %}
-{{ todo_with_children(todo, 0) }}
+{% for enabler in node.enablers %}
+<li>&lt; {{enabler.process.title.newest|e}}</li>
+{% endfor %}
+{% for disabler in node.disablers %}
+<li>! {{disabler.process.title.newest|e}}</li>
+{% endfor %}
+</ul>
+</li>
+{% endfor %}
+<h4>todos</h4>
+<ul>
+{% for node in todo_trees %}
+{{ node_with_children(node, 0) }}
 {% endfor %}
 </ul>
 {% endblock %}