X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/31616af54ad101b9926cce57c96ae327179a5990..47336ec077dcbae1fc40a01a1054cd28224a1649:/wtem/admin.py diff --git a/wtem/admin.py b/wtem/admin.py index 08cff0d..03c4446 100644 --- a/wtem/admin.py +++ b/wtem/admin.py @@ -1,20 +1,22 @@ # -*- coding: utf-8 -*- +import json -import os - -from django.contrib import admin from django import forms -from django.utils import simplejson -from django.utils.safestring import mark_safe +from django.conf.urls import url, patterns +from django.contrib import admin +from django.contrib.auth.models import User from django.core.urlresolvers import reverse +from django.http import HttpResponse +from django.template.loader import render_to_string +from django.utils.safestring import mark_safe -from .models import Submission, Assignment, Attachment, exercises from .middleware import get_current_request +from .models import Submission, Assignment, Attachment, exercises def get_user_exercises(user): try: - assignment = Assignment.objects.get(user = user) + assignment = Assignment.objects.get(user=user) return [e for e in exercises if e['id'] in assignment.exercises] except Assignment.DoesNotExist: return [] @@ -22,24 +24,38 @@ def get_user_exercises(user): readonly_fields = ('submitted_by', 'first_name', 'last_name', 'email', 'key', 'key_sent') + class AttachmentWidget(forms.Widget): def render(self, name, value, *args, **kwargs): if value: a_tag = '%s' % (value, value) else: a_tag = 'brak' - return mark_safe(('' + a_tag) % (name, value)) + return mark_safe(('' % (name, value)) + a_tag) + + +class TextareaWithLinks(forms.Textarea): + def render(self, name, value, *args, **kwargs): + t, links = value + self.links = links + output = super(TextareaWithLinks, self).render(name, t, *args, **kwargs) + moreoutput = "
" + for k, n, v in links: + moreoutput += u"
%s: %s" % (k, AttachmentWidget().render(n, v)) + output += mark_safe(moreoutput + "
") + return output + class SubmissionFormBase(forms.ModelForm): class Meta: model = Submission - exclude = ('answers', 'marks', 'contact') + readonly_fields + exclude = ('answers', 'marks', 'contact', 'end_time') + readonly_fields def get_open_answer(answers, exercise): def get_option(options, id): for option in options: - if option['id'] == int(id): + if str(option['id']) == id: return option exercise_id = str(exercise['id']) @@ -53,11 +69,12 @@ def get_open_answer(answers, exercise): else: toret = answer if exercise['type'] == 'edumed_wybor': - ok = set(map(str, exercise['answer'])) == set(map(str,answer['closed_part'])) + ok = set(map(str, exercise['answer'])) == set(map(str, answer['closed_part'])) toret = u'Czesc testowa [%s]:\n' % ('poprawna' if ok else 'niepoprawna') - for selected in answer['closed_part']: - option = get_option(exercise['options'], selected) - toret += '%s: %s\n' % (selected, option['text']) + if len(answer['closed_part']): + for selected in answer['closed_part']: + option = get_option(exercise['options'], selected) + toret += '%s: %s\n' % (selected, option['text']) else: toret += u'\n' toret += u'\nCzesc otwarta (%s):\n\n' % ' '.join(exercise['open_part']) @@ -68,8 +85,8 @@ def get_open_answer(answers, exercise): def get_form(request, submission): fields = dict() - if submission.answers: - answers = simplejson.loads(submission.answers) + if submission and submission.answers: + answers = json.loads(submission.answers) user_exercises = get_user_exercises(request.user) for exercise in exercises: if exercise not in user_exercises: @@ -80,25 +97,46 @@ def get_form(request, submission): if exercise['type'] in ('open', 'file_upload') or exercise.get('open_part', None): if exercise['type'] == 'file_upload': try: - attachment = Attachment.objects.get(submission = submission, exercise_id = exercise['id']) + attachment = Attachment.objects.get(submission=submission, exercise_id=exercise['id']) except Attachment.DoesNotExist: attachment = None widget = AttachmentWidget initial = attachment.file.url if attachment else None else: - widget = forms.Textarea(attrs={'readonly':True}) - initial = get_open_answer(answers, exercise) + # widget = forms.Textarea(attrs={'readonly':True}) + widget = TextareaWithLinks(attrs={'readonly': True}) + links = [] + qfiles = [] + for qfield in exercise.get('fields', []): + if qfield.get('type') == 'file': + qfiles.append((qfield['id'], qfield['caption'])) + if qfiles: + eid = int(exercise['id']) + by_tag = {} + for att in Attachment.objects.filter(submission=submission, exercise_id=eid).order_by('tag'): + by_tag[att.tag] = att.file.url + for tag, caption in qfiles: + v = by_tag.get(tag) + if v: + links.append((caption, "file_%s__%s" % (eid, tag), v)) + initial = get_open_answer(answers, exercise), links fields[answer_field_name] = forms.CharField( - widget = widget, - initial = initial, - label = 'Rozwiązanie zadania %s' % exercise['id'] + widget=widget, + initial=initial, + label=u'Rozwiązanie zadania %s' % exercise['id'], + required=False ) + choices = [(None, '-')] # + [(i,i) for i in range(exercise['max_points']+1)], + i = 0 + while i <= exercise['max_points']: + choices.append((i, i)) + i += .5 fields[mark_field_name] = forms.ChoiceField( - choices = [(None, '-')] + [(i,i) for i in range(exercise['max_points']+1)], - initial = submission.get_mark(user_id = request.user.id, exercise_id = exercise['id']), - label = u'Twoja ocena zadania %s' % exercise['id'] + choices=choices, + initial=submission.get_mark(user_id=request.user.id, exercise_id=exercise['id']), + label=u'Twoja ocena zadania %s' % exercise['id'] ) if not request.user.is_superuser: @@ -114,13 +152,13 @@ class SubmissionAdmin(admin.ModelAdmin): list_display = ('__unicode__', 'todo', 'examiners_repr') readonly_fields = readonly_fields - def get_form(self, request, obj, **kwargs): + def get_form(self, request, obj=None, **kwargs): return get_form(request, obj) - + def submitted_by(self, instance): if instance.contact: return '%s' % ( - reverse('admin:contact_contact_change', args = [instance.contact.id]), + reverse('admin:contact_contact_change', args=[instance.contact.id]), instance.contact.contact ) return '-' @@ -144,29 +182,58 @@ class SubmissionAdmin(admin.ModelAdmin): parts = name.split('_') exercise_id = parts[1] user_id = parts[3] - submission.set_mark(user_id = user_id, exercise_id = exercise_id, mark = value) + 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 = []) + context = dict(examiners=[]) assignments = Assignment.objects.all() if not request.user.is_superuser: - assignments = assignments.filter(user = request.user) + 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): + 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: + 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) + return super(SubmissionAdmin, self).changelist_view(request, extra_context=context) def queryset(self, request): qs = super(SubmissionAdmin, self).queryset(request) if not request.user.is_superuser: - qs = qs.filter(examiners = request.user) + qs = qs.filter(examiners=request.user) return qs + def get_urls(self): + urls = super(SubmissionAdmin, self).get_urls() + return patterns( + '', + url(r'^report/$', self.admin_site.admin_view(report_view), name='wtem_admin_report') + ) + super(SubmissionAdmin, self).get_urls() + + +class SubmissionsSet: + def __init__(self, submissions): + self.submissions = submissions + self.examiners_by_exercise = {} + for submission in submissions: + for user_id, marks in submission.marks.items(): + user = User.objects.get(pk=user_id) + for exercise_id in marks.keys(): + examiners = self.examiners_by_exercise.setdefault(exercise_id, []) + if user not in examiners: + examiners.append(user) + + +def report_view(request): + submissions = sorted(Submission.objects.all(), key=lambda s: -s.final_result) + toret = render_to_string('wtem/admin_report.csv', { + 'submissionsSet': SubmissionsSet(submissions), + 'exercise_ids': [str(e['id']) for e in exercises]}) + response = HttpResponse(toret, content_type='text/csv') + response['Content-Disposition'] = 'attachment; filename="wyniki.csv"' + return response admin.site.register(Submission, SubmissionAdmin) -admin.site.register(Assignment) \ No newline at end of file +admin.site.register(Assignment)