X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7B%20card_id%20%7D%7D/delete?a=blobdiff_plain;f=todo_templates%2Ftodo.html;h=45ed8a88bd21e63f334d3fd950f7f4df6eb803b4;hb=38b9ce0ba2b5af072554999bc5836ffe455f06db;hp=beccb75e2d051d5446b9adce9018ef7b3d5f3dce;hpb=76210b693b77e67bf8160a7fb869ae416309d333;p=misc

diff --git a/todo_templates/todo.html b/todo_templates/todo.html
index beccb75..45ed8a8 100644
--- a/todo_templates/todo.html
+++ b/todo_templates/todo.html
@@ -1,83 +1,143 @@
 {% extends 'base.html' %}
+
 {% block css %}
-th, td { vertical-align: top; text-align: left}
-td.checkbox { width: 0.1em; height: 0.1em; padding: 0em; text-align: center; }
-input[type="number"] { text-align: right; }
+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; }
 {% endblock %}
+
 {% block content %}
-<form action="todo" method="POST">
 <h3>edit todo</h3>
+
+<form action="todo" method="POST">
 <input type="hidden" name="todo_id" value="{{todo.id_}}" />
-<input type="hidden" name="return_to" value="{{return_to}}" />
+<input type="hidden" name="importance" step=0.1 size=8 value="{{ todo.importance }}" />
 <table>
-<tr><th>task</th><td><a href="{{db.prefix}}/task?id={{ todo.task.id_ }}">{{ todo.task.title.then|e }}</a></td></tr>
-<tr><th>default effort</th><td>{{ todo.default_effort }}</td></tr>
-<tr>
-<th>efforts</th>
+
+<tr class="toplevel">
+<th>task</th>
+<td colspan=2>
+<a href="task?id={{ todo.task.id_ }}">{{ todo.task.title.then|e }}</a>
+{% if todo.task.comment %}
+<pre>{{ todo.task.comment|e }}</pre>
+{% else %}
+<br />&nbsp;
+{% endif %}
+</td>
+</tr>
+
+<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 %}
+done<br />
+(sum: {{todo.all_days_effort}})
+</td>
 <td>
 <table>
-<tr><th>date</th><th>effort</th><th>delete</th>
+<tr class="lowlevel">
+<th>date</th>
+<th>effort</th>
+<th>delete</th>
+</tr>
 {% for date, effort in todo.efforts.items() %}
-<tr>
-<td><input name="effort_date" size=10 value="{{date}}" {% if todo.children and effort %}disabled{% endif %}></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 %} /></td>
-<td>{% if not (todo.children and effort) %}<input type="checkbox" name="delete_effort" value="{{date}}" />{% endif %}</td>
+<tr class="lowlevel">
+<td>
+<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 %} />
+</td>
+<td>
+{% if not (todo.children and effort) %}<input type="checkbox" name="delete_effort" value="{{date}}" />{% endif %}
+</td>
 </tr>
 {% endfor %}
-<tr>
-<td><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 %} /></td>
+<tr class="lowlevel">
+<td>
+<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 %} />
+</td>
 </tr>
 </table>
 </td>
 </tr>
-<tr>
-<th>total effort</th><td>{{todo.all_days_effort}}</td>
+
+<tr class="toplevel">
+<th>comment</th>
+<td class="input" colspan=2>
+<input name="comment" size=100 value="{{todo.comment|e}}" />
+</td>
 </tr>
-<tr><th>importance</th><td class="input"><input type="number" name="importance" step=0.1 size=8 value="{{ todo.importance }}" /></td></tr>
-<tr><th>comment</th><td class="input"><textarea name="comment" rows=3 cols=100>{{todo.comment|e}}</textarea></td></tr>
-<tr>
-<th>done</th>
-<td class="input">
-{% if todo.children %}✓{% else %}<input type="checkbox" name="done" {% if todo.done %}checked{% endif %}/>{% endif %}
+
+<tr class="toplevel">
+<th>tags</th>
+<td colspan=2>
+new: <input name="tag" value="" size=15 >
+{% 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>
-<tr><th>day tags</th>
-<td>
-{% for tag in db.t_tags | sort %}
-{% if tag in todo.task.tags.now %}&nbsp;✓{% else %}<input type="checkbox" name="day_tag_{{tag|e}}"{% if tag in todo.day_tags %} checked{% endif %}/>{% endif %} {{ tag }}<br />
+
+{% if todo.parents %}
+<tr class="toplevel">
+<th>parents</th>
+<td colspan=2>
+<ul>
+{% for parent in todo.parents %}
+<li><a href="todo?id={{parent.id_}}">{{parent.title}}</a>
 {% endfor %}
-add: <input name="joined_day_tags" value="" size=100 >
+</ul>
 </td>
 </tr>
-<tr><th>parent</th><td>{% if todo.parent %}<a href="todo?id={{todo.parent.id_}}">{{todo.parent.title}}</a>{% else %}–{% endif %}</td></tr>
-<tr><th>children</th>
-<td>
+{% endif %}
+
+<tr class="toplevel">
+<th>children</th>
+<td colspan=2>
+{% if todo.children %}
 <table>
-{% for todo in child_todos %}
-<tr>
-	<!-- <td><input name="link_child" type="checkbox" value="{{todo.id_}}" checked disabled/></td> -->
-	<td>{% if todo.done %}✓{% endif %}</td><td>{{todo.all_days_effort}}</td>
-<td><a href="todo?id={{todo.id_}}">{{todo.title}}</a></td>
+<tr class="lowlevel">
+<th>adopted</th><th>effort</th><th>title</th><th>comments</th>
 </tr>
-{% endfor %}
-<!--
-<tr>
-<th colspan=2>---</th>
-</tr>
-{% for todo in filtered_todos %}
-<tr>
-<td><input name="link_todo" type="checkbox" value="{{todo.id_}}" disabled/></td>
-<td><a href="todo?id={{todo.id_}}">{{todo.title}}</a></td>
+{% for todo in child_todos %}
+<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>
 </tr>
 {% 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>
+<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>
+{% endfor %}
+</datalist>
+<datalist id="tasks">
+{% for task in filtered_tasks %}<option value="{{task.id_}}">{{task.title.now}}</option>
+{% endfor %}
+</datalist>
 </td>
+</tr>
+
 </table>
-<input type="submit" value="update" />
-<div style="text-align: right">
-<input type="submit" name="delete" value="delete" />
+<input id="update_button" class="update" name="update" type="submit" value="update" />
+<div class="delete">
+<input class="delete" type="submit" name="delete" value="delete" />
 </div>
 </form>
 {% endblock %}