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

[plomtask] / templates / day.html

diff --git a/templates/day.html b/templates/day.html
index 9af375419911c05d44a0fc99dcdc3f63d2e821bd..6954fd3a85974e44b1db0801968c9313d60fdaea 100644 (file)
--- a/templates/day.html
+++ b/templates/day.html
@@ -38,7 +38,7 @@ td.todo_line {
 {% endif %}
 
 {% for condition in conditions_present %}
-<td class="cond_line_{{loop.index0 % 3}} {% if not condition.is_active %}min_width{% endif %}">{% if condition in node.todo.conditions %}{% if not condition.is_active %}O{% endif %}{% endif %}</td>
+<td class="cond_line_{{loop.index0 % 3}} {% if not condition.is_active %}min_width{% endif %}">{% if condition in node.todo.conditions and not condition.is_active %}O{% elif condition in node.todo.blockers and condition.is_active %}!{% endif %}</td>
 {% endfor %}
 
 <td class="todo_line">-&gt;</td>
@@ -131,6 +131,7 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 <th colspan=5>states</th>
 <th colspan={{ conditions_present|length}}>t</th>
 <th>add enabler</th>
+<th>add disabler</th>
 </tr>
 
 {% for condition in conditions_present %}
@@ -162,6 +163,10 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 <td><input name="new_todo" list="{{list_name}}" autocomplete="off" /></td>
 {{ macros.datalist_of_titles(list_name, enablers_for[condition.id_]) }}
 </td>
+{% set list_name = "todos_against_%s"|format(condition.id_) %}
+<td><input name="new_todo" list="{{list_name}}" autocomplete="off" /></td>
+{{ macros.datalist_of_titles(list_name, disablers_for[condition.id_]) }}
+</td>
 </tr>
 {% endfor %}