X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=templates%2Fday.html;h=efa1c9bb1e78fc5ea455c5a678b4727fb22efdd3;hb=908debd6dc3a56a4e39617e35d479f5683017433;hp=8887f9a6609c05c119773d2d7ba68b131622856d;hpb=951d8ad55c0d54286f9c986257a67dfa9710fcf2;p=plomtask

diff --git a/templates/day.html b/templates/day.html
index 8887f9a..efa1c9b 100644
--- a/templates/day.html
+++ b/templates/day.html
@@ -1,28 +1,50 @@
 {% 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) }}
-{% endfor %}
-{% for condition in todo.conditions %}
-<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 %}
+{% macro show_node(node, indent) %}
 {% 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 %}
+{% for i in range(indent) %}&nbsp; {% endfor %} +
 {% 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 %}
+{% for i in range(indent) %}&nbsp;{% endfor %} +
+{% if node.seen %}({% else %}{% endif %}<a href="condition?id={{node.item.id_}}">{{node.item.title.newest|e}}</a>{% if node.seen %}){% else %}{% endif %}
+{% endif %}
+{% endmacro %}
+
+
+{% macro undone_with_children(node, indent) %}
+{% if not node.hide %}
+<tr>
+<td>
+{% if node.is_todo %}
+<input name="done" value="{{node.item.id_}}" type="checkbox" {% if node.seen or not node.item.is_doable %}disabled{% endif %} {% if node.item.is_done %} checked {% endif %} />
+{% endif %}
+</td>
+<td>
+{{ show_node(node, indent) }}
+</td>
+</tr>
+{% endif %}
+{% for child in node.children %}
+{{ undone_with_children(child, indent+1) }}
+{% endfor %}
+{% endmacro %}
+
+
+{% macro done_with_children(node, indent) %}
+{% if not node.hide %}
+<tr>
+<td>
+{{ show_node(node, indent) }}
+</td>
+</tr>
 {% endif %}
 {% for child in node.children %}
-{{ node_with_children(child, indent+1) }}
+{{ done_with_children(child, indent+1) }}
 {% endfor %}
 {% endmacro %}
 
+
 {% block content %}
 <h3>{{day.date}} / {{day.weekday}}</h3>
 <p>
@@ -37,25 +59,30 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 <option value="{{process.id_}}">{{process.title.newest|e}}</option>
 {% endfor %}
 </datalist>
-</form>
 <h4>conditions</h4>
-{% 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>&lt; {{enabler.process.title.newest|e}}</li>
+{% 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>
+({% for enabler in node.enablers %}
+&lt; {{enabler.process.title.newest|e}};
 {% endfor %}
 {% for disabler in node.disablers %}
-<li>! {{disabler.process.title.newest|e}}</li>
+! {{disabler.process.title.newest|e}};
+{% endfor %})
 {% endfor %}
 </ul>
-</li>
-{% endfor %}
-<h4>todos</h4>
-<ul>
+<h4>to do</h4>
+<table>
 {% for node in todo_trees %}
-{{ node_with_children(node, 0) }}
+{{ undone_with_children(node, indent=0) }}
 {% endfor %}
-</ul>
+</table>
+<h4>done</h4>
+<table>
+{% for node in done_trees %}
+{{ done_with_children(node, indent=0) }}
+{% endfor %}
+</table>
+</form>
 {% endblock %}