X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=templates%2Fday.html;h=9af375419911c05d44a0fc99dcdc3f63d2e821bd;hb=31b778276bb7297151f1c90098cc50842c9c138f;hp=a0823f33e16fb218d3212756fb3fe11bb9c8cfb3;hpb=f8118b1ed8615870b490566cf649d191f5877932;p=plomtask
diff --git a/templates/day.html b/templates/day.html
index a0823f3..9af3754 100644
--- a/templates/day.html
+++ b/templates/day.html
@@ -1,4 +1,5 @@
-{% extends 'base.html' %}
+{% extends '_base.html' %}
+{% import '_macros.html' as macros %}
@@ -32,14 +33,22 @@ td.todo_line {
{% macro show_node_undone(node, indent) %}
{% if not node.todo.is_done %}
+{% if not node.seen %}
+{% endif %}
{% for condition in conditions_present %}
{% if condition in node.todo.conditions %}{% if not condition.is_active %}O{% endif %}{% endif %} |
{% endfor %}
-> |
- |
+{% if node.seen %}
+ |
+{% if node.todo.effort %}{{ node.todo.effort }}{% endif %} |
+{% else %}
+ |
+ |
+{% endif %}
{% for i in range(indent) %} {% endfor %} +
{% if node.seen %}({% endif %}{{node.todo.process.title.newest|e}}{% if node.seen %}){% endif %}
@@ -50,7 +59,13 @@ td.todo_line {
| {% if condition in node.todo.enables %}+{% elif condition in node.todo.disables %}!{% endif %} |
{% endfor %}
- |
+
+{% if node.seen %}
+{{node.todo.comment|e}}
+{% else %}
+
+{% endif %}
+ |
{% endif %}
@@ -106,11 +121,6 @@ td.todo_line {
comment:
add todo:
-
todo
@@ -118,7 +128,7 @@ add todo:
c |
-states |
+states |
t |
add enabler |
@@ -139,7 +149,7 @@ add todo:
{% endfor %}
[{% if condition.is_active %}X{% else %} {% endif %}] |
-{{condition.title.newest|e}} |
+{{condition.title.newest|e}} |
{% for _ in conditions_present %}
{% if outer_loop.index0 + loop.index0 < conditions_present|length %}
@@ -148,13 +158,9 @@ add todo:
{% endif %}
{% endfor %}
-
- | |
-
-{% for process in enablers_for[condition.id_] %}
-
-{% endfor %}
-
+{% set list_name = "todos_for_%s"|format(condition.id_) %}
+ |
+{{ macros.datalist_of_titles(list_name, enablers_for[condition.id_]) }}
{% endfor %}
@@ -163,7 +169,7 @@ add todo:
{% for condition in conditions_present %}
|
{% endfor %}
-doables |
+doables |
{% for condition in conditions_present %}
|
{% endfor %}
@@ -184,5 +190,6 @@ add todo:
-{% endblock %}
+{{ macros.datalist_of_titles("processes", processes) }}
+{% endblock %}