diff --git a/pms/templates/feedback/feedback_list.html b/pms/templates/feedback/feedback_list.html index c3c3af2cc..8e74f8b6e 100644 --- a/pms/templates/feedback/feedback_list.html +++ b/pms/templates/feedback/feedback_list.html @@ -142,7 +142,7 @@ onclick="event.stopPropagation()" >
- +
{% if feedback.archive == True %} @@ -285,7 +285,7 @@
{{ current_date|timesince:feedback.end_date }}
- + {% if feedback.archive == True %} @@ -429,8 +429,11 @@
{{ current_date|timesince:feedback.end_date }}
- - + {% if feedback|is_feedback_answer:request.user %} + + {% else %} + + {% endif %} {% if feedback.archive == True %} diff --git a/pms/templatetags/pmsfilters.py b/pms/templatetags/pmsfilters.py index 743c14903..5c4979d0c 100644 --- a/pms/templatetags/pmsfilters.py +++ b/pms/templatetags/pmsfilters.py @@ -66,3 +66,18 @@ def is_feedback_manager_or_owner(feedback, user): elif Feedback.objects.filter(id=feedback.id, employee_id=employee).exists(): return True return False + + +@register.filter(name="is_feedback_answer") +def is_feedback_answer(feedback, user): + """ + This method will return true, if the user is manger or owner of the feedback, + """ + employee = Employee.objects.filter(employee_user_id=user).first() + if Feedback.objects.filter(id=feedback.id, manager_id=employee).exists(): + return True + elif Feedback.objects.filter(id=feedback.id, employee_id=employee).exists(): + return True + elif Feedback.objects.filter(id=feedback.id, subordinate_id=employee).exists(): + return True + return False diff --git a/static/images/ui/writing.png b/static/images/ui/writing.png new file mode 100644 index 000000000..ed3383437 Binary files /dev/null and b/static/images/ui/writing.png differ