X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/task?a=blobdiff_plain;f=templates%2Fday.html;h=2e1a380502f2e10e934b7d4f5eab86254ebd8c8d;hb=d916781d66c1aaf4e3a04580153dce61744d5729;hp=f6e22650ddc57fd1e0553e01e9f3f4d73c5dd794;hpb=91a2a8f0fe640dac8c76515bf3fd04b0c2f49a66;p=plomtask
diff --git a/templates/day.html b/templates/day.html
index f6e2265..2e1a380 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,17 +33,25 @@ 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 %} |
+{% if condition in node.todo.conditions and not condition.is_active %}O{% elif condition in node.todo.blockers and condition.is_active %}!{% 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 %}
+{% if node.seen %}({% endif %}{{node.todo.title_then|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 %}
@@ -71,7 +86,7 @@ td.todo_line {
{% if path|length > 0 and not path[-1].todo.is_done %}
-({% for path_node in path %}{{path_node.todo.process.title.newest|e}} <- {% endfor %})
+({% for path_node in path %}{{path_node.todo.title_then|e}} <- {% endfor %})
|
@@ -82,7 +97,7 @@ td.todo_line {
{% for i in range(indent) %} {% endfor %} +
{% endif %}
-{% if node.seen %}({% endif %}{{node.todo.process.title.newest|e}} {% if node.todo.comment|length > 0 %}[{{node.todo.comment|e}}]{% endif %}{% if node.seen %}){% endif %}
+{% if node.seen %}({% endif %}{{node.todo.title_then|e}} {% if node.todo.comment|length > 0 %}[{{node.todo.comment|e}}]{% endif %}{% if node.seen %}){% endif %}
|
@@ -106,11 +121,6 @@ td.todo_line {
comment:
add todo:
-
todo
@@ -118,9 +128,10 @@ add todo:
c |
-states |
+states |
t |
add enabler |
+add disabler |
{% for condition in conditions_present %}
@@ -139,7 +150,7 @@ add todo:
{% endfor %}
[{% if condition.is_active %}X{% else %} {% endif %}] |
-{{condition.title.newest|e}} |
+{{condition.title.at(day.date)|e}} |
{% for _ in conditions_present %}
{% if outer_loop.index0 + loop.index0 < conditions_present|length %}
@@ -148,13 +159,13 @@ 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_]) }}
+
+{% set list_name = "todos_against_%s"|format(condition.id_) %}
+ |
+{{ macros.datalist_of_titles(list_name, disablers_for[condition.id_]) }}
{% endfor %}
@@ -163,7 +174,7 @@ add todo:
{% for condition in conditions_present %}
|
{% endfor %}
-doables |
+doables |
{% for condition in conditions_present %}
|
{% endfor %}
@@ -184,5 +195,6 @@ add todo:
-{% endblock %}
+{{ macros.datalist_of_titles("processes", processes) }}
+{% endblock %}