Improve accounting scripts.

[misc] / todo_templates / tasks.html

diff --git a/todo_templates/tasks.html b/todo_templates/tasks.html
index 7943b8231eb233630ac3871f0687186960ba8a89..ed01d3071646d0adf58ea6658e23347b4ca5400b 100644 (file)
--- a/todo_templates/tasks.html
+++ b/todo_templates/tasks.html
@@ -10,33 +10,33 @@ td.number { text-align: right; }
 tr.expanded { color: #888888; }
 {% endblock %}
 {% block content %}
-<form action="{{action|e}}" method="POST">
+<form action="tasks" method="POST">
 {% include 'tagfilters.html' %}
 </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') %}
+{% for uuid, t in db.tasks.items() | sort(attribute='1.title.now') %}
 {% if t.visible %}
 
 <tr>
-<td class="number">{{ t.default_effort }}</a></td>
+<td class="number">{{ t.default_effort.now }}</a></td>
 <td>
 {% if uuid == expand_uuid %}
 <a href="{{db.prefix}}/tasks">[-]</a>
-{% elif t.links|count > 0 %}
+{% elif t.subtasks|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>
+<a href="{{db.prefix}}/task?id={{ uuid }}" />{{ t.title.now|e }}</a></td>
+<td>{% for tag in t.tags.now | 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>
+<td>&nbsp; [+] <a href="{{db.prefix}}/task?id={{ uuid }}" />{{ t.title.now|e }}</a></td>
+<td>{% for tag in t.tags.now | sort %}<a href="{{db.prefix}}/tasks?t_and={{tag|e}}">{{ tag }}</a> {% endfor %}</td>
 </tr>
 {% endfor %}
 {% endif %}