Fix Process retrieval/display/saving bugs.

[plomtask] / templates / process.html

diff --git a/templates/process.html b/templates/process.html
index f2d5055043da9388f488b37cf4336c6423dd1cab..ec06d3a4c44232032266d07a1a1d42ab924632a4 100644 (file)
--- a/templates/process.html
+++ b/templates/process.html
@@ -1,39 +1,107 @@
 {% extends 'base.html' %}
 
-{% macro process_with_children(node, indent) %}
+{% macro step_with_steps(step_id, step_node, indent) %}
 <tr>
 <td>
-<input type="checkbox" name="children" value="{{node.process.id_}}" checked />
+<input type="hidden" name="steps" value="{{step_id}}" />
+{% 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}}_parent_id" value="{{step_node.parent_id or ''}}" />
+{% endif %}
+</td>
+<td>{% for i in range(indent) %}+{%endfor %}
+{% if (not step_node.is_explicit) and step_node.seen %}
+<a href="process?id={{step_node.process.id_}}">({{step_node.process.title.newest|e}})</a>
+{% else %}
+<a href="process?id={{step_node.process.id_}}">{{step_node.process.title.newest|e}}</a>
+{% endif %}
 </td>
 <td>
-{% for i in range(indent) %}+{%endfor %}
-<a href="process?id={{node.process.id_}}">{{node.process.title.newest|e}}</a>
+{% if step_node.is_explicit %}
+add step: <input name="new_step_to_{{step_id}}" list="candidates" autocomplete="off" />
+{% endif %}
 </td>
 </tr>
-{% for child in node.children.values() %}
-{{ process_with_children(child, indent+1) }}
+{% if step_node.is_explicit or not step_node.seen %}
+{% for substep_id, substep in step_node.steps.items() %}
+{{ step_with_steps(substep_id, substep, indent+1) }}
 {% endfor %}
+{% endif %}
 {% endmacro %}
 
 {% block content %}
-<h3>Process</h3>
+<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>
-{% for child in children.values() %}
-{{ process_with_children(child, 0) }}
+{% for condition in process.conditions %}
+<tr>
+<td>
+<input type="checkbox" name="condition" value="{{condition.id_}}" checked />
+</td>
+<td>
+<a href="condition?id={{condition.id_}}">{{condition.title.newest|e}}</a>
+</td>
+</tr>
 {% endfor %}
 </table>
-add child: <input name="children" list="candidates" autocomplete="off" />
-<datalist id="candidates">
-{% for candidate in candidates %}
+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>enables</h4>
+<table>
+{% for condition in process.enables %}
+<tr>
+<td>
+<input type="checkbox" name="enables" value="{{condition.id_}}" checked />
+</td>
+<td>
+<a href="condition?id={{condition.id_}}">{{condition.title.newest|e}}</a>
+</td>
+</tr>
+{% endfor %}
+</table>
+add enables: <input name="enables" list="condition_candidates" autocomplete="off" />
+<h4>disables</h4>
+<table>
+{% for condition in process.disables %}
+<tr>
+<td>
+<input type="checkbox" name="disables" value="{{condition.id_}}" checked />
+</td>
+<td>
+<a href="condition?id={{condition.id_}}">{{condition.title.newest|e}}</a>
+</td>
+</tr>
+{% endfor %}
+</table>
+add disables: <input name="disables" list="condition_candidates" autocomplete="off" />
+<h4>steps</h4>
+<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" />
+<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" />
 </form>
+<h4>step of</h4>
+<ul>
+{% for owner in owners %}
+<li><a href="process?id={{owner.id_}}">{{owner.title.newest|e}}</a>
+{% endfor %}
+</ul>
 {% endblock %}
-
-