X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/do_day?a=blobdiff_plain;f=templates%2Fday.html;h=93a430f56ccbc0eca01386482034a7a50f29cdc2;hb=f0f10048714c1bbcf23a7fa6a934d126408845f3;hp=b816f35c3ddbc5057ccf3f2fe28f20ba7045db6d;hpb=e06d3b744f88b2976399b0cbe08b526bb7e88907;p=plomtask
diff --git a/templates/day.html b/templates/day.html
index b816f35..93a430f 100644
--- a/templates/day.html
+++ b/templates/day.html
@@ -1,29 +1,52 @@
-{% extends 'base.html' %}
+{% extends '_base.html' %}
+{% import '_macros.html' as macros %}
{% block css %}
-td, th, tr, table {
- padding: 0;
- margin: 0;
+table {
+ border-collapse: collapse;
}
th {
border: 1px solid black;
}
-td.min_width {
- min-width: 1em;
+td.cond_line_0, td.cond_line_1, td.cond_line_2 {
+ padding: 0;
+ border-top: 1px solid white;
}
td.cond_line_0 {
- background-color: #ffbbbb;
+ background-color: #bfbfbf;
}
td.cond_line_1 {
- background-color: #bbffbb;
+ background-color: #dfdfdf;
}
td.cond_line_2 {
- background-color: #bbbbff;
+ background-color: #fffff;
+}
+td.cond_line_corner {
+ 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;
+}
+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 %}
@@ -31,26 +54,44 @@ 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 %}
-->
-
-
-{% for i in range(indent) %} {% endfor %} +
-{% if node.seen %}({% endif %}{{node.todo.process.title.newest|e}} {% if node.seen %}){% endif %}
+{% 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.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 %} !{% endif %}
{% endfor %}
-
+
+{% if node.seen %}
+{{node.todo.comment|e}}
+{% else %}
+
+{% endif %}
+
{% endif %}
@@ -66,61 +107,51 @@ 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 %}
+
+{{node.todo.performed_effort}}
+{{node.todo.tree_effort|round(1)}}
-({% 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 %}{{node.todo.title_then|e}} {% if not node.todo.is_done %}){% endif %}
+{{node.todo.comment|e}}
-
-
-
- +
-{% 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}} ({{total_effort|round(1)}})
prev | next
-{% endblock %}
+{{ macros.datalist_of_titles("processes", processes) }}
+{% endblock %}