X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/0b270a5b1cfeefeff9663764e716d633bf7382a4..db84146fd291bfa7a9209939348b7932eefa3a06:/wtem/admin.py
diff --git a/wtem/admin.py b/wtem/admin.py
index a101cad..47e0a77 100644
--- a/wtem/admin.py
+++ b/wtem/admin.py
@@ -8,24 +8,23 @@ from django.utils import simplejson
from django.utils.safestring import mark_safe
from django.core.urlresolvers import reverse
-from .models import Submission, Assignment, Attachment
+from .models import Submission, Assignment, Attachment, exercises
from .middleware import get_current_request
-f = file(os.path.dirname(__file__) + '/fixtures/exercises.json')
-exercises = simplejson.loads(f.read())
-f.close()
-
def get_user_exercises(user):
- assignment = Assignment.objects.get(user = user)
- return [e for e in exercises if e['id'] in assignment.exercises]
+ try:
+ assignment = Assignment.objects.get(user = user)
+ return [e for e in exercises if e['id'] in assignment.exercises]
+ except Assignment.DoesNotExist:
+ return []
readonly_fields = ('submitted_by', 'first_name', 'last_name', 'email', 'key', 'key_sent')
class AttachmentWidget(forms.Widget):
def render(self, name, value, *args, **kwargs):
- return mark_safe('%s' % (value, value))
+ return mark_safe('%s' % (name, value, value, value))
class SubmissionFormBase(forms.ModelForm):
class Meta:
@@ -132,6 +131,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