Add Todo/Process.blockers for Conditions that block rather than enable.

[plomtask] / templates / process.html

diff --git a/templates/process.html b/templates/process.html
index 55eeb52589fae2c97d1585b64624cb36eefab456..7ad59b844cd4ae7d03f8ee597b7ba9f9d7918f04 100644 (file)
--- a/templates/process.html
+++ b/templates/process.html
@@ -1,6 +1,9 @@
-{% extends 'base.html' %}
+{% extends '_base.html' %}
+{% import '_macros.html' as macros %}
 
-{% macro process_with_steps(step_id, step_node, indent) %}
+
+
+{% macro step_with_steps(step_id, step_node, indent) %}
 <tr>
 <td>
 <input type="hidden" name="steps" value="{{step_id}}" />
@@ -11,38 +14,97 @@
 {% 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>
-add step: <input name="new_step_to_{{step_id}}" list="candidates" autocomplete="off" />
+{% if step_node.is_explicit %}
+add: <input name="new_step_to_{{step_id}}" list="candidates" autocomplete="off" />
+{% endif %}
 </td>
 </tr>
-{% if indent < 5 %}
+{% if step_node.is_explicit or not step_node.seen %}
 {% for substep_id, substep in step_node.steps.items() %}
-{{ process_with_steps(substep_id, substep, indent+1) }}
+{{ 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}} />
+<table>
+
+<tr>
+<th>title</th>
+<td><input name="title" value="{{process.title.newest|e}}" />{% if process.id_ %} [<a href="process_titles?id={{process.id_}}">history</a>]{% endif %}</td>
+</tr>
+
+<tr>
+<th>default effort</th>
+<td><input name="effort" type="number" step=0.1 value={{process.effort.newest}} />{% if process.id_ %} [<a href="process_efforts?id={{process.id_}}">history</a>]{% endif %}</td>
+</tr>
+
+<tr>
+<th>description</th>
+<td><textarea name="description">{{process.description.newest|e}}</textarea><br />{% if process.id_ %} [<a href="process_descriptions?id={{process.id_}}">history</a>]{% endif %}</td>
+</tr>
+
+<tr>
+<th>calendarize</th>
+<td><input type="checkbox" name="calendarize" {% if process.calendarize %}checked {% endif %}</td>
+</tr>
+
+<tr>
+<th>conditions</th>
+<td>{{ macros.simple_checkbox_table("condition", process.conditions, "condition", "condition_candidates") }}</td>
+</tr>
+
+<tr>
+<th>blockers</th>
+<td>{{ macros.simple_checkbox_table("blocker", process.blockers, "condition", "condition_candidates") }}</td>
+</tr>
+
+<tr>
+<th>enables</th>
+<td>{{ macros.simple_checkbox_table("enables", process.enables, "condition", "condition_candidates") }}</td>
+</tr>
+
+<tr>
+<th>disables</th>
+<td>{{ macros.simple_checkbox_table("disables", process.disables, "condition", "condition_candidates") }}</td>
+</tr>
+
+<tr>
+<th>steps</th>
+<td>
 <table>
 {% for step_id, step_node in steps.items() %}
-{{ process_with_steps(step_id, step_node, 0) }}
+{{ step_with_steps(step_id, step_node, 0) }}
 {% endfor %}
 </table>
-add step: <input name="new_top_step" list="candidates" autocomplete="off" />
-<datalist id="candidates">
-{% for candidate in candidates %}
-<option value="{{candidate.id_}}">{{candidate.title.newest|e}}</option>
+add: <input name="new_top_step" list="step_candidates" autocomplete="off" />
+</td>
+<tr>
+
+<tr>
+<th>step of</th>
+<td>
+{% for owner in owners %}
+<a href="process?id={{owner.id_}}">{{owner.title.newest|e}}</a><br />
 {% endfor %}
-</datalist>
-<input type="submit" value="OK" />
-</form>
-{% endblock %}
+</td>
+<tr>
 
+</table>
+{{ macros.edit_buttons() }}
+</form>
 
+{{ macros.datalist_of_titles("condition_candidates", condition_candidates) }}
+{{ macros.datalist_of_titles("step_candidates", step_candidates) }}
+{% endblock %}