X-Git-Url: https://plomlompom.com/repos/bar%20baz.html?a=blobdiff_plain;f=templates%2Fday.html;h=4c77705b514b6aec0821b336fea107fcaea3cd1f;hb=6f44fcfab7927af1800107f9a2ad3ba05e0651f9;hp=b816f35c3ddbc5057ccf3f2fe28f20ba7045db6d;hpb=e06d3b744f88b2976399b0cbe08b526bb7e88907;p=plomtask

diff --git a/templates/day.html b/templates/day.html
index b816f35..4c77705 100644
--- a/templates/day.html
+++ b/templates/day.html
@@ -1,4 +1,5 @@
-{% extends 'base.html' %}
+{% extends '_base.html' %}
+{% import '_macros.html' as macros %}
 
 
 
@@ -40,6 +41,7 @@ td.todo_line {
 
 <td class="todo_line">-&gt;</td>
 <td class="todo_line"><input name="done" type="checkbox" value="{{node.todo.id_}}" {% if node.todo.is_done %}checked disabled{% endif %} {% if not node.todo.is_doable %}disabled{% endif %}/></td>
+<td class="todo_line"><input name="effort" type="number" step=0.1 size=5 placeholder={{node.todo.process.effort.newest }} value={{node.todo.effort}} /></td>
 <td class="todo_line">
 {% for i in range(indent) %}&nbsp; {% endfor %} +
 {% if node.seen %}({% endif %}<a href="todo?id={{node.todo.id_}}">{{node.todo.process.title.newest|e}}</a>{% if node.seen %}){% endif %}
@@ -106,11 +108,6 @@ td.todo_line {
 comment: <input name="day_comment" value="{{day.comment|e}}" />
 <input type="submit" value="OK" /><br />
 add todo: <input name="new_todo" list="processes" autocomplete="off" />
-<datalist id="processes">
-{% for process in processes %}
-<option value="{{process.id_}}">{{process.title.newest|e}}</option>
-{% endfor %}
-</datalist>
 
 <h4>todo</h4>
 
@@ -118,7 +115,7 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 
 <tr>
 <th colspan={{ conditions_present|length}}>c</th>
-<th colspan=4>states</th>
+<th colspan=5>states</th>
 <th colspan={{ conditions_present|length}}>t</th>
 <th>add enabler</th>
 </tr>
@@ -139,7 +136,7 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 {% endfor %}
 
 <td class="cond_line_{{loop.index0 % 3}}">[{% if condition.is_active %}X{% else %}&nbsp;{% endif %}]</td>
-<td colspan=3 class="cond_line_{{loop.index0 % 3}}"><a href="condition?id={{condition.id_}}">{{condition.title.newest|e}}</a></td>
+<td colspan=4 class="cond_line_{{loop.index0 % 3}}"><a href="condition?id={{condition.id_}}">{{condition.title.newest|e}}</a></td>
 
 {% for _ in conditions_present %}
 {% if outer_loop.index0 + loop.index0 < conditions_present|length %}
@@ -148,13 +145,9 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 <td class="cond_line_{{(conditions_present|length - loop.index) % 3}}">
 {% endif %}
 {% endfor %}
-
-<td><input list="todos_for_{{condition.id_}}" /></td>
-<datalist name="new_todo" id="todos_for_{{condition.id_}}" />
-{% for process in enablers_for[condition.id_] %}
-<option value="{{process.id_}}">{{process.title.newest|e}}</option>
-{% endfor %}
-</datalist />
+{% set list_name = "todos_for_%s"|format(condition.id_) %}
+<td><input name="new_todo" list="{{list_name}}" autocomplete="off" /></td>
+{{ macros.datalist_of_titles(list_name, enablers_for[condition.id_]) }}
 </td>
 </tr>
 {% endfor %}
@@ -163,7 +156,7 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 {% for condition in conditions_present %}
 <td class="cond_line_{{loop.index0 % 3}}"></td>
 {% endfor %}
-<th colspan={{ 4 }}>doables</th>
+<th colspan=5>doables</th>
 {% for condition in conditions_present %}
 <td class="cond_line_{{(conditions_present|length - loop.index) % 3}}"></td>
 {% endfor %}
@@ -184,5 +177,6 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 </table>
 
 </form>
-{% endblock %}
 
+{{ macros.datalist_of_titles("processes", processes) }}
+{% endblock %}