diff --git a/templates/observations/observation_detail.html b/templates/observations/observation_detail.html index 44920b6..54ce97e 100644 --- a/templates/observations/observation_detail.html +++ b/templates/observations/observation_detail.html @@ -124,22 +124,89 @@ {% endif %} {% elif observation.department_responded_at and observation.status not in 'resolved,closed' %} -
-
+
+
-

{% trans "Department has responded" %}

{% trans "Review the response and resolve this observation." %}

+
+

{% trans "Department has responded" %}

+

{% trans "Decide what to do next, then resolve and inform the reporter." %}

+
{% if can_convert %} -
+
+ {% if not observation.action_id %} + + + {% trans "Create Action" %} + {% trans "Minor / isolated" %} + + {% else %} +
+ + {% trans "Action exists" %} +
+ {% endif %} + + + + {% trans "Start RCA" %} + {% trans "Serious / pattern" %} + + + {% if can_admin %} + + + {% trans "QI Project" %} + {% trans "Systemic trend" %} + + {% endif %} + + + {% csrf_token %} + + + +
+ {% else %} + {# Non-admin viewers see only the simple resolve form #} +
{% csrf_token %} - +
{% endif %}
{% elif observation.status in 'resolved,closed' %} -
-
-

{% trans "This observation is resolved" %}

+
+
+
+
+

{% trans "This observation is resolved" %}

+ {% if observation.response_sent_at %} +

{% trans "Reporter informed on" %} {{ observation.response_sent_at|date:"M d, Y H:i" }}

+ {% else %} +

{% trans "Reporter has not yet been informed." %}

+ {% endif %} +
+
+ {% if can_convert and not observation.response_sent_at and observation.status == 'resolved' %} + + {% endif %}
{% endif %}