[UPDT] PMS: Keyresult answer view in feedback detailed view
This commit is contained in:
@@ -62,6 +62,33 @@
|
||||
</li>
|
||||
|
||||
{% endfor %}
|
||||
{% if kr_feedbacks %}
|
||||
<hr/>
|
||||
<span class="oh-activity-sidebar__q" style="font-size: medium;">{% trans "Key results" %}</span>
|
||||
{% for kr_feedback in kr_feedbacks %}
|
||||
<li class="oh-activity-sidebar__qa-item">
|
||||
<span class="oh-activity-sidebar__q"> {{forloop.counter}}. {{kr_feedback.key_result_id.key_result_id}}</span>
|
||||
<div class="d-block">
|
||||
<div class="oh-input-picker-group oh-input-picker-group--resp mt-2">
|
||||
<div class="oh-input-picker oh-input-picker--likert oh-input-picker--selected
|
||||
{% if kr_feedback.answer.answer == "Bad" %}
|
||||
oh-input-picker--1
|
||||
{% elif kr_feedback.answer.answer == "Average" %}
|
||||
oh-input-picker--2
|
||||
{% elif kr_feedback.answer.answer == "Good" %}
|
||||
oh-input-picker--3
|
||||
{% elif kr_feedback.answer.answer == "Perfect" %}
|
||||
oh-input-picker--4
|
||||
{% endif %}
|
||||
"
|
||||
>
|
||||
{{ kr_feedback.answer.answer }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
<script>
|
||||
|
||||
|
||||
@@ -90,6 +90,26 @@
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if value.1.type == '6' %}
|
||||
<div >
|
||||
<div class="oh-input-picker-group oh-input-picker-group--resp mt-2">
|
||||
<div class="oh-input-picker oh-input-picker--likert oh-input-picker--selected
|
||||
{% if value.0.answer == "Bad" %}
|
||||
oh-input-picker--1
|
||||
{% elif value.0.answer == "Average" %}
|
||||
oh-input-picker--2
|
||||
{% elif value.0.answer == "Good" %}
|
||||
oh-input-picker--3
|
||||
{% elif value.0.answer == "Perfect" %}
|
||||
oh-input-picker--4
|
||||
{% endif %}
|
||||
"
|
||||
>
|
||||
{{ value.0.answer }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</li>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
14
pms/views.py
14
pms/views.py
@@ -1813,10 +1813,14 @@ def feedback_detailed_view_answer(request, id, emp_id):
|
||||
is_have_perm = check_permission_feedback_detailed_view(
|
||||
request, feedback, "pms.view_feedback"
|
||||
)
|
||||
kr_feedbacks = KeyResultFeedback.objects.filter(
|
||||
feedback_id=feedback, employee_id=employee
|
||||
)
|
||||
if is_have_perm:
|
||||
answers = Answer.objects.filter(employee_id=employee, feedback_id=feedback)
|
||||
context = {
|
||||
"answers": answers,
|
||||
"kr_feedbacks": kr_feedbacks,
|
||||
}
|
||||
return render(request, "feedback/feedback_detailed_view_answer.html", context)
|
||||
else:
|
||||
@@ -2036,6 +2040,7 @@ def get_feedback_overview(request, obj_id):
|
||||
question_template = feedback.question_template_id
|
||||
questions = question_template.question.all()
|
||||
feedback_answers = feedback.feedback_answer.all()
|
||||
kr_feedbacks = feedback.feedback_key_result.all()
|
||||
feedback_overview = {}
|
||||
for question in questions:
|
||||
answer_list = []
|
||||
@@ -2050,6 +2055,15 @@ def get_feedback_overview(request, obj_id):
|
||||
}
|
||||
)
|
||||
feedback_overview[question] = answer_list
|
||||
for kr_feedback in kr_feedbacks:
|
||||
answer_list = []
|
||||
answer_list.append(
|
||||
{kr_feedback.employee_id: [kr_feedback.answer, {"type": "6"}]}
|
||||
)
|
||||
feedback_overview[
|
||||
f"Feedback about keyresult: {kr_feedback.key_result_id.key_result_id}"
|
||||
] = answer_list
|
||||
|
||||
return render(
|
||||
request,
|
||||
"feedback/feedback_overview.html",
|
||||
|
||||
Reference in New Issue
Block a user