Improve accounting scripts.

[misc] / todo_templates / todo.html

diff --git a/todo_templates/todo.html b/todo_templates/todo.html
index 45ed8a88bd21e63f334d3fd950f7f4df6eb803b4..88fa72b2e0ec6fc9afb0abd7b8f89b2ab7b45e70 100644 (file)
--- a/todo_templates/todo.html
+++ b/todo_templates/todo.html
@@ -30,13 +30,10 @@ tr.lowlevel td, tr.lowlevel th { padding-top: 0em; }
 <tr class="toplevel">
 <th>work</th>
 <td>
-{% if todo.children %}
-[{% if todo.done %}✓{% else %} {% endif %}]
-{% else %}
-<input type="checkbox" name="done" {% if todo.done %}checked{% endif %}/>
-{% endif %}
+<input type="checkbox" name="done" {% if todo.done %}checked{% endif %} {% if todo.deps_done == false %}disabled{% endif %}/>
 done<br />
-(sum: {{todo.all_days_effort}})
+(all days: {{todo.all_days_effort}})<br />
+(dependencies: {{todo.all_days_effort}})
 </td>
 <td>
 <table>
@@ -51,10 +48,10 @@ done<br />
 <input name="effort_date" type="hidden" value="{{date}}">{{date}}
 </td>
 <td>
-<input type="number" name="effort" step=0.1 size=8 value="{{effort}}" placeholder="{{todo.default_effort}}" {% if todo.children and effort %}disabled{% endif %} />
+<input type="number" name="effort" step=0.1 size=8 value="{{effort}}" placeholder="{{todo.default_effort}}" {% if todo.deps and effort %}disabled{% endif %} />
 </td>
 <td>
-{% if not (todo.children and effort) %}<input type="checkbox" name="delete_effort" value="{{date}}" />{% endif %}
+{% if not (todo.deps and effort) %}<input type="checkbox" name="delete_effort" value="{{date}}" />{% endif %}
 </td>
 </tr>
 {% endfor %}
@@ -63,7 +60,7 @@ done<br />
 <input name="effort_date" size=10 value="">
 </td>
 <td>
-<input type="number" name="effort" step=0.1 size=8 value="" {% if todo.children %} disabled {% else %} placeholder="{{todo.default_effort}}" {% endif %} />
+<input type="number" name="effort" step=0.1 size=8 value="" {% if todo.deps %} disabled {% else %} placeholder="{{todo.default_effort}}" {% endif %} />
 </td>
 </tr>
 </table>
@@ -87,13 +84,13 @@ new: <input name="tag" value="" size=15 >
 </td>
 </tr>
 
-{% if todo.parents %}
+{% if todo.dependers %}
 <tr class="toplevel">
-<th>parents</th>
+<th>dependers</th>
 <td colspan=2>
 <ul>
-{% for parent in todo.parents %}
-<li><a href="todo?id={{parent.id_}}">{{parent.title}}</a>
+{% for depender in todo.dependers %}
+<li><a href="todo?id={{depender.id_}}">{{depender.title}}</a>
 {% endfor %}
 </ul>
 </td>
@@ -101,16 +98,16 @@ new: <input name="tag" value="" size=15 >
 {% endif %}
 
 <tr class="toplevel">
-<th>children</th>
+<th>dependencies</th>
 <td colspan=2>
-{% if todo.children %}
+{% if todo.deps %}
 <table>
 <tr class="lowlevel">
 <th>adopted</th><th>effort</th><th>title</th><th>comments</th>
 </tr>
-{% for todo in child_todos %}
+{% for todo in dep_todos %}
 <tr class="lowlevel">
-<td class="center"><input name="adopt_child" type="checkbox" value="{{todo.id_}}" checked/></td>
+<td class="center"><input name="adopt_dep" type="checkbox" value="{{todo.id_}}" checked/></td>
 <td class="number">{{ '{:2.1f}'.format(todo.all_days_effort) }} {% if todo.done %}✓{% else %}&nbsp;{% endif %}</td>
 <td><a href="todo?id={{todo.id_}}">{{todo.day.date}} {{todo.title}}</a></td>
 <td>{{todo.comment}}</td>
@@ -120,11 +117,11 @@ new: <input name="tag" value="" size=15 >
 {% endif %}
 <br />
 make from task:<br />
-<input name="birth_child" list="tasks" size=100><br />
+<input name="birth_dep" list="tasks" size=100><br />
 adopt (from <input name="start" {% if start_date %}value="{{ start_date }}"{% endif %} placeholder="yesterday" /> to <input name="end" {% if end_date %}value="{{ end_date }}"{% endif %} placeholder="2030-12-31" />):<br />
-<input name="adopt_child" list="todos" size=100>
+<input name="adopt_dep" list="todos" size=100>
 <datalist id="todos">
-{% for todo in filtered_todos %}<option value="{{todo.id_}}">{{ '{:2.1f}'.format(todo.all_days_effort) }} {% if todo.done %}✓{% else %}&nbsp;&nbsp;{% endif %} {{todo.day.date}} {{todo.title}}</option>
+{% for todo in filtered_todos %}<option value="{{todo.id_}}">{{ '{:2.1f}'.format(todo.all_days_effort) }} {% if todo.done %}✓{% else %}&nbsp;&nbsp;{% endif %} {{todo.day.date}} {{todo.title}} {{todo.comment}}</option>
 {% endfor %}
 </datalist>
 <datalist id="tasks">