X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance?a=blobdiff_plain;f=todo_templates%2Ftodo.html;h=e62a09b8c02547bcfb48dabf7f1b5b73f72163f9;hb=ecee822bebf62049803b90fc8d8a0b484915a0fc;hp=45ed8a88bd21e63f334d3fd950f7f4df6eb803b4;hpb=38b9ce0ba2b5af072554999bc5836ffe455f06db;p=misc

diff --git a/todo_templates/todo.html b/todo_templates/todo.html
index 45ed8a8..e62a09b 100644
--- a/todo_templates/todo.html
+++ b/todo_templates/todo.html
@@ -1,12 +1,69 @@
 {% extends 'base.html' %}
 
+
+
 {% block css %}
 tr.toplevel th { padding-right: 1em; }
 td.center { text-align: center; }
 tr.toplevel td, tr.toplevel th { padding-top: 1em; }
 tr.lowlevel td, tr.lowlevel th { padding-top: 0em; }
+tr.grey td { background-color: #cccccc; }
 {% endblock %}
 
+
+
+{% macro draw_todo(todo) %}<a href="?id={{todo.id_}}">{{todo.title}}</a>{% if todo.comment %}({{todo.comment|e}}){% endif %}{% endmacro %}
+
+
+
+{% macro task_with_deps(task, indent) %}
+{% for i in range(indent) %}&nbsp;&nbsp;{% endfor %}+ 
+({{task.title.then}})<br />
+{% for t in task.deps %}
+{{ task_with_deps(t, indent+1) }}
+{% endfor %}
+{% endmacro %}
+
+
+
+{% macro todo_with_deps(todo, indent) %}
+{% for i in range(indent) %}&nbsp;&nbsp;&nbsp;{% endfor %}{{ macros.doneness_string(todo) }} {{ draw_todo(todo) }}<br />
+{% for dep in todo.deps %}
+{% if dep.been_observed %}
+{% for i in range(indent+1) %}&nbsp;&nbsp;&nbsp;{% endfor %}{{ macros.doneness_string(dep) }} ({{ draw_todo(dep) }})<br />
+{% else %}
+{{ todo_with_deps(dep, indent+1) }}
+{% endif %}
+{% endfor %}
+{{ todo.observe() }}
+{% endmacro %}
+
+
+
+{% macro draw_deps(deps) %}
+{% for t in deps %}
+<tr class="lowlevel">
+<td><input name="adopt_dep" type="checkbox" value="{{t.id_}}" checked/></td>
+<td>{{ macros.doneness_string(t) }}</td>
+<td>
+{% if t.deps and not t.been_observed %}
+<details>
+<summary>{{ draw_todo(t) }}</summary>
+{% for dep in t.deps %}
+{{ todo_with_deps(dep, 0) }}
+{% endfor %}
+</details>
+{% else %}
+{{ draw_todo(t) }}
+{% endif %}
+</td>
+{{ t.observe() }}
+</tr>
+{% endfor %}
+{% endmacro %}
+
+
+
 {% block content %}
 <h3>edit todo</h3>
 
@@ -30,13 +87,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 +105,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 +117,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>
@@ -80,57 +134,129 @@ done<br />
 <tr class="toplevel">
 <th>tags</th>
 <td colspan=2>
-new: <input name="tag" value="" size=15 >
+new: {{ macros.tagselection(submit_name='tag', selected_tags=todo.day_tags, all_tags=tags) }}
 {% for tag in todo.task.tags.now | sort %}<select disabled><option>{{ tag }}</option></select>{% endfor %}
-{{ macros.tagselection(submit_name='tag', selected_tags=todo.day_tags, all_tags=tags) }}
 <br />
 </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>
+<table>
+{% for path in todo.shortened_depender_paths %}
+<tr>
+<td>
+{% if not path[0] %}[…]<br />{% endif %}
+{% for step in path %}
+{% if step %}
+{% if step.dependers %}➛ {% endif %}<a href="todo?id={{step.id_}}">{{step.title}}</a><br />
+{% endif %}
+{% endfor %}</td>
+</tr>
 {% endfor %}
-</ul>
+</table>
 </td>
 </tr>
 {% endif %}
 
 <tr class="toplevel">
-<th>children</th>
+<th>sub-todos</th>
 <td colspan=2>
-{% if todo.children %}
 <table>
+<tr class="lowlevel"><td colspan=4>expected:</td></tr>
+{% for dep_slot in dep_slots %}
+{% if dep_slot.todos %}
+{{ draw_deps(dep_slot.todos) }}
+{% else %}
 <tr class="lowlevel">
-<th>adopted</th><th>effort</th><th>title</th><th>comments</th>
+<td></td>
+<td>[ ]</td>
+<td>
+{% if dep_slot.task.deps %} <details>
+<summary>({{dep_slot.task.title.then}})</summary>
+{% for task in dep_slot.task.deps %}
+{{ task_with_deps(task, 1) }}
+{% endfor %}
+</details>
+{% else %}
+({{dep_slot.task.title.then}})
+{% endif %}
+</td>
+</tr>
+{% endif %}
+{% endfor %}
+{% if additional_deps %}
+<tr class="lowlevel"><td colspan=4>bonus:</td></tr>
+{{ draw_deps(additional_deps) }}
+{% endif %}
+</table>
+</td>
 </tr>
-{% for todo in child_todos %}
+
+<tr class="toplevel">
+<th>suggestions</th>
+<td colspan=2>
+{% if todo.task.deps %}
+<table>
+{% for dep in todo.task.deps %}
+<tr class="lowlevel">
+<td><input name="birth_dep" type="checkbox" value="{{dep.id_}}"></td>
+<td>make new</td>
+<td><a href="task?id={{dep.id_}}">{{dep.title.then}}</a></td>
+</tr>
+{% for suggested_todo in suggested_todos[dep.id_] %}
 <tr class="lowlevel">
-<td class="center"><input name="adopt_child" 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>
+<td><input name="adopt_dep" type="checkbox" value="{{suggested_todo.id_}}" /></td>
+<td>adopt</td>
+<td><a href="todo?id={{suggested_todo.id_}}">{{suggested_todo.day.date}}:{{suggested_todo.title}}{% if suggested_todo.deps %}:+{% endif %}</a></td>
+<td>{{suggested_todo.comment}}</td>
 </tr>
 {% endfor %}
+{% endfor %}
 </table>
 {% endif %}
-<br />
-make from task:<br />
-<input name="birth_child" 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>
+</td>
+</tr>
+
+<tr class="toplevel">
+<th>free add</th>
+<td colspan=2>
+make from task ({{ macros.parenthood_selector(parenthood) }}):<br />
+<input name="birth_dep" list="tasks" size=100 autocomplete="off"><br />
+adopt:<br />
+<input name="adopt_dep" list="todos" size=100 autocomplete="off">
 <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 t in filtered_todos %}
+<option value="{{t.id_}}">
+{{ macros.doneness_string(t, datalist_hack=true) }}
+{{t.day.date}} {{t.title}} {{t.comment}}
+{% if t.dependers %}
+(dependers:
+{% for path in t.depender_paths %}
+{{ path[0].title }}{% if path|count > 1 %}➛{% endif %}{% if path|count > 3 %}…➛{% endif %}{% if path|count > 1 %}{{ path[-1].title }}{% endif %}
+{% endfor %})
+{% endif %}
+</option>
 {% endfor %}
 </datalist>
-<datalist id="tasks">
-{% for task in filtered_tasks %}<option value="{{task.id_}}">{{task.title.now}}</option>
+</td>
+</tr>
+{{ macros.datalist_tasks(filtered_tasks) }}
+
+<tr class="toplevel">
+<th>as chain</th>
+<td colspan=2>
+<table>
+{% for dep in todo.deps_chain %}
+<tr class="lowlevel">
+<td class="number">{{dep.deps_depth}}</td>
+<td>{% if dep.deps_done %}{{ macros.doneness_string(dep) }}{% endif %}</td>
+<td>{{ draw_todo(dep) }}</td>
+</tr>
 {% endfor %}
-</datalist>
+</table>
 </td>
 </tr>