X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=todo_templates%2Ftasks.html;h=cd5ef0ff7c7a69247ae415b3d9cf24bdfe64af81;hb=11df024d5f24e8d7916f57c907975ebe27db617f;hp=7943b8231eb233630ac3871f0687186960ba8a89;hpb=13a15b95ade73f4455db648b70e1de784c515039;p=misc

diff --git a/todo_templates/tasks.html b/todo_templates/tasks.html
index 7943b82..cd5ef0f 100644
--- 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,41 @@ 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 %}
-<form action="{{action|e}}" method="POST">
+<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') %}
+<table class="alternating">
+<tr>
+{{ macros.sort_head(sort, "default_effort", "effort") }}
+{{ macros.sort_head(sort, "weight", "weight") }}
+{{ macros.sort_head(sort, "title", "task") }}
+<th>tags</th>
+</tr>
+{% for t in tasks %}
 {% if t.visible %}
-
 <tr>
-<td class="number">{{ t.default_effort }}</a></td>
+<td class="number">
+{{ '{:5.1f}'.format(t.default_effort.now) }}
+</td>
+<td class="number">
+{{ '{:5.1f}'.format(t.subtask_weight) }}
+</td>
 <td>
-{% if uuid == expand_uuid %}
-<a href="{{db.prefix}}/tasks">[-]</a>
-{% elif t.links|count > 0 %}
-<a href="{{db.prefix}}/tasks?expand_uuid={{uuid}}">[+]</a>
-{% endif %}
-<a href="{{db.prefix}}/task?id={{ uuid }}" />{{ t.title|e }}</a></td>
-<td>{% for tag in t.tags | sort %}<a href="{{db.prefix}}/tasks?t_and={{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="{{db.prefix}}/task?id={{ uuid }}" />{{ t.title|e }}</a></td>
-<td>{% for tag in t.tags | sort %}<a href="{{db.prefix}}/tasks?t_and={{tag|e}}">{{ tag }}</a> {% endfor %}</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>
-{% endfor %}
-{% endif %}
-
 {% endif %}
 {% endfor %}
-
 </table>
+
 {% endblock %}