From c99e78247b06e2c73348db14c37baa9c87c04e74 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Thu, 7 Nov 2013 17:02:36 +0100 Subject: [PATCH 1/1] Show marking status for a superuser on submission list view --- wtem/admin.py | 12 ++++++++++++ .../admin/wtem/submission/change_list.html | 15 +++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 wtem/templates/admin/wtem/submission/change_list.html diff --git a/wtem/admin.py b/wtem/admin.py index c3405b4..dcf4558 100644 --- a/wtem/admin.py +++ b/wtem/admin.py @@ -132,6 +132,18 @@ class SubmissionAdmin(admin.ModelAdmin): submission.set_mark(user_id = user_id, exercise_id = exercise_id, mark = value) submission.save() + def changelist_view(self, request, extra_context=None): + context = dict(examiners = []) + if request.user.is_superuser: + submissions = Submission.objects.all() + for assignment in Assignment.objects.all(): + examiner = dict(name = assignment.user.username, todo = 0) + for submission in submissions: + for exercise_id in assignment.exercises: + if submission.get_mark(user_id = assignment.user.id, exercise_id = exercise_id) is None: + examiner['todo'] += 1 + context['examiners'].append(examiner) + return super(SubmissionAdmin, self).changelist_view(request, extra_context = context) admin.site.register(Submission, SubmissionAdmin) admin.site.register(Assignment) \ No newline at end of file diff --git a/wtem/templates/admin/wtem/submission/change_list.html b/wtem/templates/admin/wtem/submission/change_list.html new file mode 100644 index 0000000..8f31489 --- /dev/null +++ b/wtem/templates/admin/wtem/submission/change_list.html @@ -0,0 +1,15 @@ +{% extends "admin/change_list.html" %} +{% load i18n %} +{% load admin_urls %} + + +{% block result_list %} + {% if examiners %} +

+ {% for examiner in examiners %} + {{examiner.name}}: {{examiner.todo}} {% if not forloop.last %}, {% endif %} + {% endfor %} +

+ {% endif %} + {{block.super}} +{% endblock %} \ No newline at end of file -- 2.20.1