From 76e88ee8284e822ac876adf28441a0fab32a7882 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 9 Mar 2017 16:12:50 +0100 Subject: [PATCH 1/1] arbiter counts for supervisor --- stage2/templates/stage2/assignment_list.html | 3 ++- stage2/views.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stage2/templates/stage2/assignment_list.html b/stage2/templates/stage2/assignment_list.html index 7125c47..1609c7a 100644 --- a/stage2/templates/stage2/assignment_list.html +++ b/stage2/templates/stage2/assignment_list.html @@ -7,7 +7,8 @@

{{ assignment.title }} ({% if assignment.marked_count %}{{ assignment.marked_count }} ocenionych{% else %}{{ assignment.marked_count }} ocenionych{% endif %}, - {{ assignment.to_mark_count }} dostępnych do oceny) + {{ assignment.to_mark_count }} dostępnych do oceny{% if assignment.supervisor %}, + {{ assignment.arbiter_count }} do rozstrzygnięcia{% endif %})

{% endfor %} {% endblock %} diff --git a/stage2/views.py b/stage2/views.py index 1116257..3d6a72d 100644 --- a/stage2/views.py +++ b/stage2/views.py @@ -87,6 +87,9 @@ def assignment_list(request): for assignment in assignments: assignment.marked_count = Mark.objects.filter(expert=request.user, answer__assignment=assignment).count() assignment.to_mark_count = assignment.available_answers(request.user).count() + assignment.supervisor = request.user in assignment.supervisors.all() + assignment.arbiter_count = assignment.answer_set.filter(need_arbiter=True).count() + non_empty_assignments = [ass for ass in assignments if ass.marked_count > 0 or ass.to_mark_count > 0] if len(non_empty_assignments) == 1 and non_empty_assignments[0].to_mark_count > 0: return HttpResponseRedirect(reverse('stage2_answer_list', args=[non_empty_assignments[0].id])) -- 2.20.1