Improve accounting scripts.

[misc] / todo_templates / pick_tasks.html

diff --git a/todo_templates/pick_tasks.html b/todo_templates/pick_tasks.html
index 3ffbf79f70ee91a7f7eb94d547c3536b784db099..28919df2fa48ecbea98cff4caafa1c9d844d130f 100644 (file)
--- a/todo_templates/pick_tasks.html
+++ b/todo_templates/pick_tasks.html
@@ -8,11 +8,6 @@
 <h3>pick todos for day</h3>
 
 <form id="form_to_watch" action="pick_tasks" method="POST">
-{% include 'tagfilters.html' %}
-<br />
-<input name="hide_chosen_tasks" type="checkbox" {% if hide_chosen_tasks %}checked{% endif %} /> hide chosen tasks<br />
-search: <input name="search" value="{{search|e}}" />
-<input type="submit" name="filter" value="filter" />
 
 <p>
 <a href="pick_tasks?date={{prev_date}}">prev</a> | {{day.date}} | <a href="pick_tasks?date={{next_date}}">next</a> | {{day.comment}}
@@ -21,7 +16,17 @@ search: <input name="search" value="{{search|e}}" />
 <input type="hidden" name="date" value="{{day.date}}" />
 <input class="update" id="pick_upper" name="update" type="submit" value="pick" />
 <input type="hidden" name="search" value="{{search|e}}" />
-<table class="alternating">
+<table>
+
+<tr>
+<th colspan=5>task quick-add: <input name="choose_task" size=50 list="tasks"></th>
+</tr>
+<datalist id="tasks">
+{% for task in all_tasks %}
+<option value="{{task.id_}}">{{task.title.now}}</option>
+{% endfor %}
+</datalist>
+
 <tr>
 <th>do</th>
 <th {% if sort=='effort' %}class="desc"{% endif %}>
@@ -67,7 +72,7 @@ search: <input name="search" value="{{search|e}}" />
 {{todo.all_days_effort}}/{{todo.default_effort}}
 </td>
 <td>
-<a href="todo?id={{todo.id_}}">{{todo.day.date}} {{todo.task.title.then|e}}</a>
+<a href="todo?id={{todo.id_}}">{{todo.dated_title|e}}</a>
 </td>
 <td>
 {{todo.comment|e}}
@@ -79,7 +84,7 @@ search: <input name="search" value="{{search|e}}" />
 <th colspan=4>tasks</th>
 </tr>
 
-{% for task in tasks %}
+{% for task in filtered_tasks %}
 <tr>
 <td class="checkbox">
 <input name="choose_task" type="checkbox" value="{{task.id_}}">
@@ -97,7 +102,13 @@ search: <input name="search" value="{{search|e}}" />
 {% endfor %}
 
 </table>
-<input class="update" id="pick_lower" name="update" type="submit" value="pick" />
+<input id="update_button" class="update" id="pick_lower" name="update" type="submit" value="pick" />
+<br />
+{% include 'tagfilters.html' %}
+<br />
+<input name="hide_chosen_tasks" type="checkbox" {% if hide_chosen_tasks %}checked{% endif %} /> hide chosen tasks<br />
+search: <input name="search" value="{{search|e}}" />
+<input id="filter_button" type="submit" name="filter" value="filter" />
 </form>
 
 {% include 'watch_form.html' %}