{% block css %}
-td, th, tr, table {
- padding: 0;
- margin: 0;
-}
table {
border-collapse: collapse;
}
th {
border: 1px solid black;
}
-td.cond_line_0 {
+td.cond_line_0, td.cond_line_1, td.cond_line_2 {
+ padding: 0;
border-top: 1px solid white;
- background-color: #dddddd;
+}
+td.cond_line_0 {
+ background-color: #bfbfbf;
}
td.cond_line_1 {
- border-top: 1px solid white;
- background-color: #efefef;
+ background-color: #dfdfdf;
}
td.cond_line_2 {
- border-top: 1px solid white;
background-color: #fffff;
}
td.cond_line_corner {
text-overflow: clip;
}
td.todo_line {
- border-bottom: 1px solid #dddddd;
+ border-bottom: 1px solid #bfbfbf;
height: 1.7em;
}
-tr.inactive td.todo_line {
- background-color: #dddddd;
+tr.inactive > td.todo_line {
+ background-color: #bfbfbf;
+}
+tr.hidden_undone > td, tr.hidden_undone a {
+ color: #9f9f9f;
}
td.left_border {
border-left: 1px solid black;
td.right_border {
border-right: 1px solid black;
}
-input[type="text"] {
- width: 98%;
-}
-input[name="day_comment"] {
- width: 100em;
+input.ablers {
+ width: 50em;
}
{% endblock %}
{% macro show_node_done(node, indent, path) %}
-{% if node.todo.is_done %}
-
-<tr>
-{% if path|length > 0 and not path[-1].todo.is_done %}
-<td>
-({% for path_node in path %}<a href="todo?id={{path_node.todo.id_}}">{{path_node.todo.title_then|e}}</a> <- {% endfor %})
-</td>
-</tr>
-
-<tr>
-<td>
- +
-{% else %}
+{% if node.todo.has_doneness_in_path %}
+<tr{% if not node.todo.is_done %} class="hidden_undone"{% endif %}>
+<td>{{node.todo.performed_effort}}</td>
+<td>{{node.todo.tree_effort|round(1)}}</td>
<td>
-{% for i in range(indent) %} {% endfor %} +
-{% endif %}
-{% if node.seen %}({% endif %}<a href="todo?id={{node.todo.id_}}">{{node.todo.title_then|e}}</a> {% if node.todo.comment|length > 0 %}[{{node.todo.comment|e}}]{% endif %}{% if node.seen %}){% endif %}
+{% for i in range(indent) %} {% endfor %} +
+{% if not node.todo.is_done %}({% endif %}<a href="todo?id={{node.todo.id_}}">{{node.todo.title_then|e}}</a>{% if not node.todo.is_done %}){% endif %}
</td>
+<td>{{node.todo.comment|e}}</td>
</tr>
-
-{% endif %}
{% if not node.seen %}
{% for child in node.children %}
-{{ show_node_done(child, indent+1, path + [node]) }}
+{{ show_node_done(child, indent+1) }}
{% endfor %}
{% endif %}
-
+{% endif %}
{% endmacro %}
{% block content %}
-<h3>{{day.date}} / {{day.weekday}}</h3>
+<h3>{{day.date}} / {{day.weekday}} ({{total_effort|round(1)}})</h3>
<p>
<a href="day?date={{day.prev_date}}">prev</a> | <a href="day?date={{day.next_date}}">next</a>
</p>
<p>
comment:
-<input name="day_comment" value="{{day.comment|e}}" />
+<input name="day_comment" type="text" value="{{day.comment|e}}" />
<input type="submit" value="OK" /></td>
</p>
<h4>to do</h4>
+<p>
+add: <input type="text" name="new_todo" list="processes">
+</p>
+
<table>
<tr>
{% endfor %}
{% set list_name = "todos_for_%s"|format(condition.id_) %}
-<td><input name="new_todo" list="{{list_name}}" autocomplete="off" /></td>
+<td><input class="ablers" type="text" name="new_todo" list="{{list_name}}" autocomplete="off" /></td>
{{ macros.datalist_of_titles(list_name, enablers_for[condition.id_]) }}
</td>
{% set list_name = "todos_against_%s"|format(condition.id_) %}
-<td><input name="new_todo" list="{{list_name}}" autocomplete="off" /></td>
+<td><input class="ablers" type="text" name="new_todo" list="{{list_name}}" autocomplete="off" /></td>
{{ macros.datalist_of_titles(list_name, disablers_for[condition.id_]) }}
</td>
</tr>
{% endfor %}
<td colspan=2></td>
</tr>
-<tr>
-{% for condition in conditions_present %}
-<td class="cond_line_{{loop.index0 % 3}}"></td>
-{% endfor %}
-<td class="left_border"></td>
-<td>add:</td>
-<td class="right_border" ><input type="text" name="new_todo" list="processes"></td>
-{% for condition in conditions_present %}
-<td class="cond_line_{{(conditions_present|length - loop.index) % 3}}"></td>
-{% endfor %}
-<th colspan=2>comments</th>
-</tr>
{% for node in top_nodes %}
{{ show_node_undone(node, 0) }}
{% endfor %}