Improve accounting scripts.

[misc] / todo_templates / tasks.html

diff --git a/todo_templates/tasks.html b/todo_templates/tasks.html
index a125985d9df32c85d338a327f0f1d00985531d37..90f43585e1b956f8be0562e21b8398e5450746dd 100644 (file)
--- a/todo_templates/tasks.html
+++ b/todo_templates/tasks.html
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+
 {% block css %}
 table.alternating tr:nth-child(even) {
     background-color: #cccccc;
@@ -6,44 +7,47 @@ table.alternating tr:nth-child(even) {
 table.alternating tr:nth-child(odd) {
     background-color: #ffffff;
 }
-td.number { text-align: right; }
-tr.expanded { color: #888888; }
 {% endblock %}
+
 {% block content %}
+<h3>review tasks</h3>
+
 <form action="tasks" method="POST">
 {% include 'tagfilters.html' %}
+<br />
+match: <input name="search" value="{{search|e}}" />
+<input id="filter_button" type="submit" name="filter" value="match" />
 </form>
-<table class="alternating">
-<tr><th>default<br />effort</th><th>task</th><th>tags</th></tr>
 
-{% for uuid, t in db.tasks.items() | sort(attribute='1.title.now') %}
+<table class="alternating">
+<tr>
+<th class="centered{% if sort=='default_effort' %} desc{% endif %}">
+<a href="?sort=default_effort">effort</a>
+</th>
+<th {% if sort=='depth' %}class ="desc"{% endif %}>
+<a href="?sort=depth">depth</a>
+</th>
+<th {% if sort=='title' %}class="desc"{% endif %}>
+<a href="?sort=title">todo</a>
+</th>
+<th>tags</th>
+</tr>
+{% for t in tasks %}
 {% if t.visible %}
-
 <tr>
-<td class="number">{{ t.default_effort.now }}</a></td>
+<td class="number">
+{{ '{:5.1f}'.format(t.default_effort.now) }}
+</td>
+<td class="number">
+{{ '{:5.1f}'.format(t.subtask_depth) }}
+</td>
 <td>
-{% if uuid == expand_uuid %}
-<a href="tasks">[-]</a>
-{% elif t.subtasks|count > 0 %}
-<a href="tasks?expand_uuid={{uuid}}">[+]</a>
-{% endif %}
-<a href="task?id={{ uuid }}" />{{ t.title.now|e }}</a></td>
+<a href="task?id={{ t.id_ }}" />{{ t.title.now|e }}</a></td>
 <td>{% for tag in t.tags.now | sort %}<a href="tasks?and_tag={{tag|e}}">{{ tag }}</a> {% endfor %}</td>
 </tr>
-
-{% if uuid == expand_uuid %}
-{% for uuid, t in expanded_tasks.items() %}
-<tr class="expanded">
-<td class="number">{{ t.default_effort }}</a></td>
-<td>&nbsp; [+] <a href="task?id={{ uuid }}" />{{ t.title.now|e }}</a></td>
-<td>{% for tag in t.tags.now | sort %}<a href="tasks?and_tag={{tag|e}}">{{ tag }}</a> {% endfor %}</td>
-</tr>
-{% endfor %}
-{% endif %}
-
 {% endif %}
 {% endfor %}
-
 </table>
+
 {% endblock %}