X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;ds=sidebyside;f=templates%2Fday.html;h=59cf55b46029da9850a4e95eb0279fb3fce7e756;hb=5a393ec6a77d8f1040763ffa3e9e908f38a0e517;hp=6954fd3a85974e44b1db0801968c9313d60fdaea;hpb=eb16b47ddcaefaeab2f616419ea746cc32346893;p=plomtask
diff --git a/templates/day.html b/templates/day.html
index 6954fd3..59cf55b 100644
--- a/templates/day.html
+++ b/templates/day.html
@@ -4,27 +4,47 @@
{% block css %}
-td, th, tr, table {
- padding: 0;
- margin: 0;
-}
th {
border: 1px solid black;
}
-td.min_width {
- min-width: 1em;
+td.cond_line {
+ padding: 0;
+ border-top: 1px solid white;
+}
+td.cond_0 {
+ background-color: #bfbfbf;
}
-td.cond_line_0 {
- background-color: #ffbbbb;
+td.cond_1 {
+ background-color: #dfdfdf;
}
-td.cond_line_1 {
- background-color: #bbffbb;
+td.cond_2 {
+ background-color: fffff;
}
-td.cond_line_2 {
- background-color: #bbbbff;
+td.cond_shrink {
+ max-width: 0px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: clip;
}
td.todo_line {
- border-bottom: 1px solid #bbbbbb;
+ border-bottom: 1px solid #bfbfbf;
+ height: 1.7em;
+}
+tr.inactive > td.todo_line {
+ background-color: #bfbfbf;
+ border-bottom: 1px solid white;
+}
+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.ablers {
+ width: 50em;
}
{% endblock %}
@@ -32,38 +52,56 @@ 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 and not condition.is_active %}O{% elif condition in node.todo.blockers and condition.is_active %}!{% endif %}
+{% if condition in node.todo.conditions and not condition.is_active %}
+
++>
+{% elif condition in node.todo.blockers and condition.is_active %}
+
+->
+{% else %}
+
+|
+{% 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 %}
+
+{% for i in range(indent) %} {% endfor %} +
+{% if node.seen %}({% endif %}{{node.todo.title_then|e}} {% if node.seen %}){% endif %}
-->
{% for condition in conditions_present|reverse %}
-{% if condition in node.todo.enables %}+{% elif condition in node.todo.disables %}!{% endif %}
+{% if condition in node.todo.enables %}
+
++>
+{% elif condition in node.todo.disables %}
+
+->
+{% else %}
+
+ |
+{% endif %}
+
{% endfor %}
-
+
{% if node.seen %}
{{node.todo.comment|e}}
{% else %}
-
+
{% endif %}
@@ -81,55 +119,55 @@ td.todo_line {
{% macro show_node_done(node, indent, path) %}
-{% if node.todo.is_done %}
-
-
-{% if path|length > 0 and not path[-1].todo.is_done %}
+{% if node.todo.has_doneness_in_path %}
+
+{{ '{:4.1f}'.format(node.todo.performed_effort) }}
+{{ '{:4.1f}'.format(node.todo.tree_effort) }}
-({% for path_node in path %}{{path_node.todo.process.title.newest|e}} <- {% endfor %})
-
+{% for i in range(indent) %} {% endfor %} +
+{% if not node.todo.is_done %}({% endif %}{% if node.seen %}[{% endif %}{{node.todo.title_then|e}} {% if node.seen %}]{% endif %}{% if not node.todo.is_done %}){% endif %}{% if node.todo.comment %} · {{node.todo.comment|e}}{% endif %}
-
-
-
- +
-{% else %}
-
-{% 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 %}
-
-
-
-{% 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 %}
-{{day.date}} / {{day.weekday}}
+{{day.date}} / {{day.weekday}} ({{day.total_effort|round(1)}})
prev | next