Improve accounting scripts.

[misc] / todo_templates / task.html

diff --git a/todo_templates/task.html b/todo_templates/task.html
index 85347efece93587e0f595050af3880ad9ec6e956..11f45377caab0d42ebe1bac09ff7cb7e7f3defb4 100644 (file)
--- a/todo_templates/task.html
+++ b/todo_templates/task.html
@@ -13,25 +13,34 @@ textarea { width: 100% };
 <input type="hidden" name="id" value="{{ task.id_ }}" />
 <input type="hidden" name="return_to" value="{{ return_to }}" />
 <table>
-<tr><th>title</th><td class="input"><input name="title" type="text" value="{{ task.title|e }}" /><details><summary>history</summary><ul>{% for k,v in task.title_history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details></td></tr>
+<tr><th>title</th><td class="input"><input name="title" type="text" value="{{ task.title.now|e }}" /><details><summary>history</summary><ul>{% for k,v in task.title.history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details></td></tr>
 <tr><th></th><td><input type="checkbox" name="as_todo" {% if selected %}checked{% endif%}> selected for {{db.selected_date}}</td></tr>
 <tr><th>comment</th><td class="input"><textarea name="comment">{{task.comment|e}}</textarea></td></tr>
-<tr><th>default effort</th><td class="input"><input type="number" name="default_effort" value="{{ task.default_effort }}" step=0.1 size=8 required /><details><summary>history</summary><ul>{% for k,v in task.default_effort_history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details></td></tr>
+<tr>
+<th>default effort</th>
+<td class="input">
+{% if task.subtasks %}
+{{ task.default_effort.now }}
+{% else %}
+<input type="number" name="default_effort" value="{{ task.default_effort.now }}" step=0.1 size=8 required /><details><summary>history</summary><ul>{% for k,v in task.default_effort.history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details>
+{% endif %}
+</td>
+</tr>
 <tr><th>tags</th>
 <td>
 {% for tag in db.t_tags | sort %}
-<input type="checkbox" name="tag_{{tag|e}}"{% if tag in task.tags %} checked{% endif %}/> {{ tag }}<br />
+<input type="checkbox" name="tag_{{tag|e}}"{% if tag in task.tags.now %} checked{% endif %}/> {{ tag }}<br />
 {% endfor %}
 add: <input name="joined_tags" type="text" value="" ><br />
-<details><summary>history</summary><ul>{% for k,v in task.tags_history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details>
+<details><summary>history</summary><ul>{% for k,v in task.tags.history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details>
 </td></tr>
 <tr><th>children</th>
 <td>
 <table>
-{% for subtask in linked_tasks %}
+{% for subtask in task.subtasks %}
 <tr>
-<td><input name="link_task" type="checkbox" value="{{subtask.id_}}" checked/></td>
-<td><a href="task?id={{subtask.id_}}">{{subtask.title}}</a></td>
+<td><input name="subtask" type="checkbox" value="{{subtask.id_}}" checked/></td>
+<td><a href="task?id={{subtask.id_}}">{{subtask.title.now}}</a></td>
 </tr>
 {% endfor %}
 <tr>
@@ -39,8 +48,8 @@ add: <input name="joined_tags" type="text" value="" ><br />
 </tr>
 {% for subtask in filtered_tasks %}
 <tr>
-<td><input name="link_task" type="checkbox" value="{{subtask.id_}}"/></td>
-<td><a href="task?id={{subtask.id_}}">{{subtask.title}}</a></td>
+<td><input name="subtask" type="checkbox" value="{{subtask.id_}}"/></td>
+<td><a href="task?id={{subtask.id_}}">{{subtask.title.now}}</a></td>
 </tr>
 {% endfor %}
 </table>