In Day view, differentiate done and undone Todos, and collect doneness checkboxes.

[plomtask] / templates / process.html

diff --git a/templates/process.html b/templates/process.html
index b55ee0756314fcd746b380cfb46eddf8a7fac202..2a577152720c2101353767182f443d9d7fd11874 100644 (file)
--- a/templates/process.html
+++ b/templates/process.html
@@ -1,5 +1,7 @@
 {% extends 'base.html' %}
 
+
+
 {% macro step_with_steps(step_id, step_node, indent) %}
 <tr>
 <td>
@@ -7,7 +9,6 @@
 {% if step_node.is_explicit %}
 <input type="checkbox" name="keep_step" value="{{step_id}}" checked />
 <input type="hidden" name="step_{{step_id}}_process_id" value="{{step_node.process.id_}}" />
-<input type="hidden" name="step_{{step_id}}_condition_id" value="{{step_node.condition.id_}}" />
 <input type="hidden" name="step_{{step_id}}_parent_id" value="{{step_node.parent_id or ''}}" />
 {% endif %}
 </td>
@@ -31,13 +32,27 @@ add step: <input name="new_step_to_{{step_id}}" list="candidates" autocomplete="
 {% endif %}
 {% endmacro %}
 
+
+
 {% block content %}
 <h3>process</h3>
 <form action="process?id={{process.id_ or ''}}" method="POST">
-title: <input name="title" value="{{process.title.newest|e}}" />
-description: <input name="description" value="{{process.description.newest|e}}" />
-default effort: <input name="effort" type="number" step=0.1 value={{process.effort.newest}} />
-<h4>conditions</h4>
+<table>
+<tr>
+<th>title</th>
+<td><input name="title" value="{{process.title.newest|e}}" /></td>
+</tr>
+<tr>
+<th>default effort</th>
+<td><input name="effort" type="number" step=0.1 value={{process.effort.newest}} /></td>
+</tr>
+<tr>
+<th>description</th>
+<td><textarea name="description">{{process.description.newest|e}}</textarea></td>
+</tr>
+<tr>
+<th>conditions</th>
+<td>
 <table>
 {% for condition in process.conditions %}
 <tr>
@@ -51,17 +66,16 @@ default effort: <input name="effort" type="number" step=0.1 value={{process.effo
 {% endfor %}
 </table>
 add condition: <input name="condition" list="condition_candidates" autocomplete="off" />
-<datalist id="condition_candidates">
-{% for condition_candidate in condition_candidates %}
-<option value="{{condition_candidate.id_}}">{{condition_candidate.title.newest|e}}</option>
-{% endfor %}
-</datalist>
-<h4>fulfills</h4>
+</td>
+</tr>
+<tr>
+<th>enables</th>
+<td>
 <table>
-{% for condition in process.fulfills %}
+{% for condition in process.enables %}
 <tr>
 <td>
-<input type="checkbox" name="fulfills" value="{{condition.id_}}" checked />
+<input type="checkbox" name="enables" value="{{condition.id_}}" checked />
 </td>
 <td>
 <a href="condition?id={{condition.id_}}">{{condition.title.newest|e}}</a>
@@ -69,13 +83,17 @@ add condition: <input name="condition" list="condition_candidates" autocomplete=
 </tr>
 {% endfor %}
 </table>
-add fulfills: <input name="fulfills" list="condition_candidates" autocomplete="off" />
-<h4>conditions</h4>
+add enables: <input name="enables" list="condition_candidates" autocomplete="off" />
+</td>
+</tr>
+<tr>
+<th>disables</th>
+<td>
 <table>
-{% for condition in process.undoes %}
+{% for condition in process.disables %}
 <tr>
 <td>
-<input type="checkbox" name="undoes" value="{{condition.id_}}" checked />
+<input type="checkbox" name="disables" value="{{condition.id_}}" checked />
 </td>
 <td>
 <a href="condition?id={{condition.id_}}">{{condition.title.newest|e}}</a>
@@ -83,21 +101,35 @@ add fulfills: <input name="fulfills" list="condition_candidates" autocomplete="o
 </tr>
 {% endfor %}
 </table>
-add undoes: <input name="undoes" list="condition_candidates" autocomplete="off" />
-<h4>steps</h4>
+add disables: <input name="disables" list="condition_candidates" autocomplete="off" />
+</td>
+</tr>
+<tr>
+<th>steps</th>
+<td>
 <table>
 {% for step_id, step_node in steps.items() %}
 {{ step_with_steps(step_id, step_node, 0) }}
 {% endfor %}
 </table>
 add step: <input name="new_top_step" list="step_candidates" autocomplete="off" />
+</td>
+<tr>
+</table>
+<datalist id="condition_candidates">
+{% for condition_candidate in condition_candidates %}
+<option value="{{condition_candidate.id_}}">{{condition_candidate.title.newest|e}}</option>
+{% endfor %}
+</datalist>
 <datalist id="step_candidates">
 {% for candidate in step_candidates %}
 <option value="{{candidate.id_}}">{{candidate.title.newest|e}}</option>
 {% endfor %}
 </datalist>
-<h4>save</h4>
-<input type="submit" value="OK" />
+<input class="btn-harmless" type="submit" name="update" value="update" />
+<div class="btn-to-right">
+<input class="btn-dangerous" type="submit" name="delete" value="delete" />
+</div>
 </form>
 <h4>step of</h4>
 <ul>