diff --git a/pms/templates/okr/objective_detailed_view.html b/pms/templates/okr/objective_detailed_view.html index 4df00e17d..b463caee8 100644 --- a/pms/templates/okr/objective_detailed_view.html +++ b/pms/templates/okr/objective_detailed_view.html @@ -213,7 +213,6 @@ {% if employee_key_result.status != value %} {% endif%} - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ {% endfor %} diff --git a/pms/templates/okr/objective_list.html b/pms/templates/okr/objective_list.html index 9349fc656..89a617221 100644 --- a/pms/templates/okr/objective_list.html +++ b/pms/templates/okr/objective_list.html @@ -1,4 +1,5 @@ {% load i18n %} +{% load static %} {% load basefilters %} {% include 'filter_tags.html' %} @@ -48,6 +49,14 @@
+
+ +
{% trans "Owner" %}
{% trans "Objective" %}
{% trans "Due In" %}
@@ -58,23 +67,28 @@
{% for own_objective in own_objectives.object_list %}
- +
+
+
+ +
+
+
+
Mary Magdalene
- {{own_objective.employee_id.employee_first_name|title}} - {{own_objective.employee_id.employee_last_name}} + {{own_objective.employee_id}}
+ +
+
+ + +
+
+ {% if perms.pms.view_questiontemplate or request.user|filtersubordinates %}
@@ -159,6 +205,7 @@ +