X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/932383c33aa99a6ae6e61a2049ecdacc5ecf6cc3..7755781ba4e07a613fed6288ea6eef02d83b3e4d:/wtem/admin.py diff --git a/wtem/admin.py b/wtem/admin.py index 72c2042..78ca9b9 100644 --- a/wtem/admin.py +++ b/wtem/admin.py @@ -7,7 +7,11 @@ from django import forms from django.utils import simplejson from django.utils.safestring import mark_safe from django.core.urlresolvers import reverse - +from django.conf.urls import url, patterns +from django.shortcuts import render +from django.contrib.auth.models import User +from django.http import HttpResponse +from django.template.loader import render_to_string from .models import Submission, Assignment, Attachment, exercises from .middleware import get_current_request @@ -28,18 +32,29 @@ class AttachmentWidget(forms.Widget): 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']) @@ -55,9 +70,10 @@ def get_open_answer(answers, exercise): if exercise['type'] == 'edumed_wybor': 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']) @@ -86,17 +102,38 @@ def get_form(request, submission): 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'] + 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)], + choices = choices, initial = submission.get_mark(user_id = request.user.id, exercise_id = exercise['id']), label = u'Twoja ocena zadania %s' % exercise['id'] ) @@ -132,10 +169,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(): @@ -166,6 +204,35 @@ class SubmissionAdmin(admin.ModelAdmin): 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 = dict() + 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 not user 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', dict( + submissionsSet = SubmissionsSet(submissions), + #exercise_ids = map(str, range(1,len(exercises)+1)) + 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)