X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/cb238bf65280df57db6158d437853475af4f2e18..e3d5bf5183811c60ba2aeabc65fa13c7c57b90e5:/wtem/admin.py?ds=inline diff --git a/wtem/admin.py b/wtem/admin.py index be96131..08cff0d 100644 --- a/wtem/admin.py +++ b/wtem/admin.py @@ -132,10 +132,11 @@ class SubmissionAdmin(admin.ModelAdmin): 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()]) + todo.short_description = 'Twoje nieocenione zadania' def examiners_repr(self, submission): return ', '.join([u.username for u in submission.examiners.all()]) - examiners_repr.short_description = 'Przypisani' + examiners_repr.short_description = 'Przypisani do zgłoszenia' def save_model(self, request, submission, form, change): for name, value in form.cleaned_data.items(): @@ -148,15 +149,16 @@ class SubmissionAdmin(admin.ModelAdmin): 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 Submission.objects.filter(examiners = assignment.user): - 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) + assignments = Assignment.objects.all() + if not request.user.is_superuser: + assignments = assignments.filter(user = request.user) + for assignment in assignments: + examiner = dict(name = assignment.user.username, todo = 0) + for submission in Submission.objects.filter(examiners = assignment.user): + 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) def queryset(self, request):