arbiter counts for supervisor

diff --git a/stage2/templates/stage2/assignment_list.html b/stage2/templates/stage2/assignment_list.html
index 7125c47..1609c7a 100644 (file)
--- a/stage2/templates/stage2/assignment_list.html
+++ b/stage2/templates/stage2/assignment_list.html
@@ -7,7 +7,8 @@
     <p>
       <a href="{% url 'stage2_answer_list' assignment.id %}">{{ assignment.title }}</a>
       ({% if assignment.marked_count %}<a href="{% url 'stage2_marked_answers' assignment.id %}">{{ assignment.marked_count }} ocenionych</a>{% else %}{{ assignment.marked_count }} ocenionych{% endif %},
     <p>
       <a href="{% url 'stage2_answer_list' assignment.id %}">{{ assignment.title }}</a>
       ({% if assignment.marked_count %}<a href="{% url 'stage2_marked_answers' assignment.id %}">{{ assignment.marked_count }} ocenionych</a>{% 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 %})

     </p>
   {% endfor %}
 {% endblock %}
     </p>
   {% endfor %}
 {% endblock %}

diff --git a/stage2/views.py b/stage2/views.py
index 1116257..3d6a72d 100644 (file)
--- 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()
     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]))
     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]))