Improve todo accounting script.

[misc] / todo_templates / pick_tasks.html

diff --git a/todo_templates/pick_tasks.html b/todo_templates/pick_tasks.html
index ea1b324c3c76af56642842a5b3adaa6b819a3d2b..3ffbf79f70ee91a7f7eb94d547c3536b784db099 100644 (file)
--- a/todo_templates/pick_tasks.html
+++ b/todo_templates/pick_tasks.html
@@ -1,75 +1,105 @@
 {% extends 'base.html' %}
+
 {% block css %}
-td.number { text-align: right; }
-table.alternating tr:nth-child(even) {
-    background-color: #cccccc;
-}
-table.alternating tr:nth-child(odd) {
-    background-color: #ffffff;
-}
-th { text-align: left; background-color: white; border: 1px solid black; }
-th.desc { background: linear-gradient(to bottom, white, grey); }
+#pick_upper, #pick_lower { margin-right: 1em; }
 {% endblock %}
+
 {% block content %}
-<form action="pick_tasks" method="POST">
+<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" />
-</form>
 
-<h3>pick todos for day</h3>
-<p><a href="pick_tasks?date={{prev_date}}">prev</a> | {{day.date}} | <a href="pick_tasks?date={{next_date}}">next</a> | {{day.comment}}</p>
-<form id="form_to_watch" action="{{action|e}}" method="POST">
+<p>
+<a href="pick_tasks?date={{prev_date}}">prev</a> | {{day.date}} | <a href="pick_tasks?date={{next_date}}">next</a> | {{day.comment}}
+</p>
+
 <input type="hidden" name="date" value="{{day.date}}" />
-<input id="pick_upper" type="submit" value="pick" />
+<input class="update" id="pick_upper" name="update" type="submit" value="pick" />
+<input type="hidden" name="search" value="{{search|e}}" />
 <table class="alternating">
 <tr>
 <th>do</th>
-<th {% if sort=='effort' %}class="desc"{% endif %}><a href="?sort=effort">effort</a></th>
-<th {% if sort=='title' %}class="desc"{% endif %}><a href="?sort=title">what</a></th>
+<th {% if sort=='effort' %}class="desc"{% endif %}>
+<a href="?sort=effort">effort</a>
+</th>
+<th {% if sort=='title' %}class="desc"{% endif %}>
+<a href="?sort=title">what</a>
+</th>
 <th>comment</th>
 </tr>
+
 {% for todo in chosen_todos %}
 <tr>
 <td class="checkbox">
 <input name="chosen_todo" {% if todo.done or todo.day_effort %}class="protected"{% endif %} type="checkbox" value="{{todo.id_}}" checked>
 </td>
 <td class="number">
-{% if todo.day_effort %}{{todo.day_effort}}&nbsp;{% else %}({{todo.default_effort}}){% endif %}{% if todo.done and not "cancelled" in todo.contemporary_tags%}✓{% else %}&nbsp;{% endif %}</td>
-<td><a href="todo?id={{todo.id_}}">{% if "cancelled" in todo.contemporary_tags %}<s>{% endif %}{% if "deadline" in todo.contemporary_tags %}DEADLINE: {% endif %}<a href="todo?id={{todo.id_}}&return_to=pick_tasks" />{{todo.path|e}}{{todo.title|e}}</a>{%if "cancelled" in todo.contemporary_tags%}</s>{% endif %}</a></td>
-<td>{{todo.comment|e}}</td>
+{% if todo.day_effort %}{{todo.day_effort}}&nbsp;{% else %}({{todo.default_effort}}){% endif %}{% if todo.done and not "cancelled" in todo.contemporary_tags%}✓{% else %}&nbsp;{% endif %}
+</td>
+<td>
+<a href="todo?id={{todo.id_}}&return_to=pick_tasks">
+{% if "cancelled" in todo.tags.now %}<s>{% endif %}
+{{todo.path|e}}{{todo.title|e}}
+{%if "cancelled" in todo.tags.now %}</s>{% endif %}
+</a>
+</td>
+<td>
+{{todo.comment|e}}
+</td>
 </tr>
 {% endfor %}
+
 <tr>
 <th colspan=4>earlier todos to continue</th>
 </tr>
+
 {% for todo in relevant_todos %}
 <tr>
 <td class="checkbox">
 <input name="choose_todo" type="checkbox" value="{{todo.id_}}">
 </td>
-<td class="number">{{todo.all_days_effort}}/{{todo.default_effort}}</td>
-<td><a href="todo?id={{todo.id_}}">{{todo.day.date}} {{todo.task.title.then|e}}</a></td>
-<td>{{todo.comment|e}}</td>
+<td class="number">
+{{todo.all_days_effort}}/{{todo.default_effort}}
+</td>
+<td>
+<a href="todo?id={{todo.id_}}">{{todo.day.date}} {{todo.task.title.then|e}}</a>
+</td>
+<td>
+{{todo.comment|e}}
+</td>
 </tr>
 {% endfor %}
+
+<tr>
 <th colspan=4>tasks</th>
+</tr>
+
 {% for task in tasks %}
 <tr>
 <td class="checkbox">
 <input name="choose_task" type="checkbox" value="{{task.id_}}">
 </td>
-<td class="number">({{task.default_effort.then}})&nbsp;</td>
-<td><a href="task?id={{ task.id_ }}&return_to=pick_tasks" />{{ task.title.then|e }}</a></td>
-<td>{{task.comment|e}}</td>
+<td class="number">
+({{task.default_effort.then}})&nbsp;
+</td>
+<td>
+<a href="task?id={{ task.id_ }}&return_to=pick_tasks" />{{ task.title.then|e }}</a>
+</td>
+<td>
+{{task.comment|e}}
+</td>
 </tr>
 {% endfor %}
+
 </table>
-<input type="hidden" name="search" value="{{search|e}}" />
-<input id="pick_lower" type="submit" value="pick" />
+<input class="update" id="pick_lower" name="update" type="submit" value="pick" />
 </form>
+
 {% include 'watch_form.html' %}
 <script>
 function make_selectables_toggler(neighbor_id, input_name) {
@@ -84,7 +114,7 @@ function make_selectables_toggler(neighbor_id, input_name) {
                 continue;      
        }
             checkboxes[i].click();
-            formHasChanged = true;
+            changes_to_comit = true;
         }
     }
     neighbor.insertAdjacentElement('afterend', button);
@@ -93,4 +123,3 @@ make_selectables_toggler('pick_upper', 'chosen_todo');
 make_selectables_toggler('pick_lower', 'choose_task');
 </script>
 {% endblock %}
-