X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/60b7cd6ee28fed9a51e5e58d7962fc5c8c4ced7f..b6b567337c2dcdf8fb959b36fbb589d8ac9ff9eb:/wtem/admin.py?ds=inline diff --git a/wtem/admin.py b/wtem/admin.py index 672666b..037ed37 100644 --- a/wtem/admin.py +++ b/wtem/admin.py @@ -8,6 +8,7 @@ from django.utils import simplejson from django.core.urlresolvers import reverse from .models import Submission, Assignment +from .middleware import get_current_request f = file(os.path.dirname(__file__) + '/fixtures/exercises.json') @@ -54,6 +55,7 @@ def get_form(request, submission): class SubmissionAdmin(admin.ModelAdmin): + list_display = ('__unicode__', 'todo',) readonly_fields = readonly_fields def get_form(self, request, obj, **kwargs): @@ -69,6 +71,12 @@ class SubmissionAdmin(admin.ModelAdmin): submitted_by.allow_tags = True submitted_by.short_description = "Zgłoszony/a przez" + def todo(self, submission): + user = get_current_request().user + user_exercises = get_user_exercises(user) + user_marks = submission.marks.get(str(user.id), {}) + return ','.join([str(e['id']) for e in user_exercises if str(e['id']) not in user_marks.keys()]) + def save_model(self, request, submission, form, change): for name, value in form.cleaned_data.items(): if name.startswith('markof_'):