X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=templates%2Fday.html;h=59cf55b46029da9850a4e95eb0279fb3fce7e756;hb=26b862b518df1cfff05fc9c3d749c03cb842d07a;hp=0165c9ede5593a8cfde064c72d6bb45fc779a8ba;hpb=8542cd471f1aeea1abbe0b237a94f7863fb12dd0;p=plomtask
diff --git a/templates/day.html b/templates/day.html
index 0165c9e..59cf55b 100644
--- a/templates/day.html
+++ b/templates/day.html
@@ -4,40 +4,38 @@
{% 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 {
+ padding: 0;
border-top: 1px solid white;
- background-color: #dddddd;
}
-td.cond_line_1 {
- border-top: 1px solid white;
- background-color: #efefef;
+td.cond_0 {
+ background-color: #bfbfbf;
}
-td.cond_line_2 {
- border-top: 1px solid white;
- background-color: #fffff;
+td.cond_1 {
+ background-color: #dfdfdf;
}
-td.cond_line_corner {
+td.cond_2 {
+ background-color: fffff;
+}
+td.cond_shrink {
max-width: 0px;
white-space: nowrap;
overflow: hidden;
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: #efefef;
+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;
@@ -45,8 +43,8 @@ td.left_border {
td.right_border {
border-right: 1px solid black;
}
-input {
- height: 100%;
+input.ablers {
+ width: 50em;
}
{% endblock %}
@@ -60,11 +58,15 @@ input {
{% 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 %}
-!
+
+->
+{% else %}
+
+|
{% endif %}
{% endfor %}
@@ -74,7 +76,7 @@ O
{% if node.todo.effort %}{{ node.todo.effort }}{% endif %}
{% else %}
-
+
{% endif %}
{% for i in range(indent) %} {% endfor %} +
@@ -82,14 +84,24 @@ O
{% 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 %}
@@ -107,53 +119,55 @@ O
{% macro show_node_done(node, indent, path) %}
-{% if node.todo.is_done %}
-
-
-{% if path|length > 0 and not path[-1].todo.is_done %}
-
-({% for path_node in path %}{{path_node.todo.title_then|e}} <- {% endfor %})
-
-
-
-
-
- +
-{% else %}
+{% if node.todo.has_doneness_in_path %}
+
+{{ '{:4.1f}'.format(node.todo.performed_effort) }}
+{{ '{:4.1f}'.format(node.todo.tree_effort) }}
-{% for i in range(indent) %} {% endfor %} +
-{% 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 %}
-
+{% 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 %}
-
-{% 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