X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance?a=blobdiff_plain;f=templates%2Fday.html;h=8887f9a6609c05c119773d2d7ba68b131622856d;hb=951d8ad55c0d54286f9c986257a67dfa9710fcf2;hp=82eaa56fb7b9acfd6aa55b7db39f080f15459ce4;hpb=34741b65438149b4e02f1e2bb4f8fdba5df5a667;p=plomtask

diff --git a/templates/day.html b/templates/day.html
index 82eaa56..8887f9a 100644
--- a/templates/day.html
+++ b/templates/day.html
@@ -6,7 +6,20 @@
 {{ todo_with_children(child, indent+1) }}
 {% endfor %}
 {% for condition in todo.conditions %}
-<li>{% for i in range(indent+1) %}+{% endfor %} [{% if condition.is_active %}x{% else %} {% endif %}] <a href="condition?id={{condition.id_}}">{{condition.title.newest|e}}</a>
+<li>{% for i in range(indent) %}&nbsp;{% endfor %}&nbsp; &lt;[{% if condition.is_active %}x{% else %} {% endif %}] <a href="condition?id={{condition.id_}}">{{condition.title.newest|e}}</a>
+{% endfor %}
+{% endmacro %}
+
+{% 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 %}
 
@@ -26,22 +39,22 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 </datalist>
 </form>
 <h4>conditions</h4>
-{% for node in conditions_listing %}
-<li>[{% if node['condition'].is_active %}x{% else %} {% endif %}] <a href="condition?id={{node['condition'].id_}}">{{node['condition'].title.newest|e}}</a>
+{% for node in conditions_nodes %}
+<li>[{% if node.condition.is_active %}x{% else %} {% endif %}] <a href="condition?id={{node.condition.id_}}">{{node.condition.title.newest|e}}</a>
 <ul>
-{% for enabler in node['enablers'] %}
-<li>[+] {{enabler.process.title.newest|e}}</li>
+{% 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>
+{% for disabler in node.disablers %}
+<li>! {{disabler.process.title.newest|e}}</li>
 {% endfor %}
 </ul>
 </li>
 {% endfor %}
 <h4>todos</h4>
 <ul>
-{% for todo in todos %}
-{{ todo_with_children(todo, 0) }}
+{% for node in todo_trees %}
+{{ node_with_children(node, 0) }}
 {% endfor %}
 </ul>
 {% endblock %}