Add foreign key restraints, expand and fix tests, add deletion and forking.

[misc] / todo_templates / day_todos.html

diff --git a/todo_templates/day_todos.html b/todo_templates/day_todos.html
index 8cf87fbd8c9d00c44d53eda35a89cb521331003e..4bdd7b33456ac56b8eba66f645ddc11392350add 100644 (file)
--- a/todo_templates/day_todos.html
+++ b/todo_templates/day_todos.html
@@ -48,14 +48,14 @@ td.unbreakable { white-space: nowrap; }
 {% else %}
     
 {% endif %}
-<a href="todo?id={{todo.id_}}&return_to=day_todos">{{todo.title|e}}</a>
+<a href="todo?id={{todo.id_}}">{{todo.title|e}}</a>
 {% if todo.has_dependers or todo.has_deps %}
 </summary>
 {% if todo.has_dependers %}
 dependers:
 <ul>
 {% for path in todo.depender_paths %}
-<li>{% for depender_todo in path %}<a href="todo?id={{depender_todo.id_}}&return_to=day_todos">{{ depender_todo.title|e }}</a>{% if not loop.last %}:{% endif %}{% endfor %}
+<li>{% for depender_todo in path %}<a href="todo?id={{depender_todo.id_}}">{{ depender_todo.title|e }}</a>{% if not loop.last %}:{% endif %}{% endfor %}
 {% endfor %}
 </ul>
 {% endif %}
@@ -65,7 +65,7 @@ depends on:
 {% for dep_todo in todo.deps %}
 <li>
 {% if show_deps_doneness == true %}{{ macros.doneness_string(dep_todo) }}{% endif %}
-<a href="todo?id={{dep_todo.id_}}&return_to=day_todos">{{ dep_todo.title|e }}</a>{% if dep_todo.has_deps %}:+{% endif %}
+<a href="todo?id={{dep_todo.id_}}">{{ dep_todo.title|e }}</a>{% if dep_todo.has_deps %}:+{% endif %}
 {% endfor %}
 </ul>
 {% endif %}
@@ -78,14 +78,14 @@ depends on:
 {% macro todo_title_as_tree_node(todo, indent) %}
 {% for i in range(indent-1) %}&nbsp; &nbsp;{% endfor %}
 {% if indent>0 %}&nbsp;+{% endif %}
-{% if todo.been_observed %}({% endif %}<a href="todo?id={{todo.id_}}&return_to=day_todos">{{todo.title}}</a>{% if todo.been_observed %}){% endif %}
+{% if todo.been_observed %}({% endif %}<a href="todo?id={{todo.id_}}">{{todo.title}}</a>{% if todo.been_observed %}){% endif %}
 {% endmacro %}
 
 
 
 {% macro draw_undone_todo_row(todo, title_drawer, indent_or_doneness) %}
 <tr {% if todo.deps_done == false %}class="deps_undone"{% endif %}>
-{% if todo.already_listed %}
+{% if todo.been_observed %}
 <td class="checkbox"><input type="checkbox" disabled /></td>
 <td class="number left"><input type="number" value="{{todo.day_effort}}" size=7 disabled /></td>
 <td class="number"><input type="number" value="{{todo.importance}}" size=7 disabled /></td>
@@ -165,7 +165,7 @@ comment: <input name="day_comment" value="{{day.comment|e}}">
 <h3>undone</h3>
 <p>
 task quick-add: <input name="choose_task" size=50 list="tasks" autocomplete="off">
-don't adopt, make new: <input type="checkbox" name="dont_adopt" />
+{{ macros.parenthood_selector(parenthood) }}
 </p>
 {{ macros.datalist_tasks(all_tasks, with_weight=true) }}
 
@@ -219,6 +219,8 @@ don't adopt, make new: <input type="checkbox" name="dont_adopt" />
 
 {% include 'watch_form.html' %}
 <script>
+inputs_to_ignore += ['parenthood'];
+
 var effort_inputs = document.getElementsByClassName("effort_input");
 for (let i = 0; i < effort_inputs.length; i++) {
     let input = effort_inputs[i];