X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/8ae6663631b0a013f88ae69e6553cdce8e7c6837..1467a7241e5ca7fd4b709e6b9dac131c695cca33:/wtem/admin.py
diff --git a/wtem/admin.py b/wtem/admin.py
index a23874e..78ca9b9 100644
--- a/wtem/admin.py
+++ b/wtem/admin.py
@@ -5,46 +5,75 @@ 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.core.urlresolvers import reverse
-
-from .models import Submission, Assignment
+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
-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):
+ if value:
+ a_tag = '%s' % (value, value)
+ else:
+ a_tag = 'brak'
+ 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'])
answer = answers[exercise_id]
if exercise['type'] == 'open':
- toret = answer
+ if isinstance(answer, list):
+ toret = ''
+ for part in answer:
+ field = get_option(exercise['fields'], part['id'])
+ toret += '- %s:\n\n%s\n\n' % (field['caption'], part['text'])
+ else:
+ toret = answer
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'])
@@ -61,25 +90,65 @@ def get_form(request, submission):
for exercise in exercises:
if exercise not in user_exercises:
continue
- if exercise['type'] == 'open' or exercise.get('open_part', None):
- answer_field_name = 'exercise_%s' % exercise['id']
- mark_field_name = 'markof_%s_by_%s' % (exercise['id'], request.user.id)
+
+ answer_field_name = 'exercise_%s' % exercise['id']
+ mark_field_name = 'markof_%s_by_%s' % (exercise['id'], request.user.id)
+ 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'])
+ except Attachment.DoesNotExist:
+ attachment = None
+ widget = AttachmentWidget
+ initial = attachment.file.url if attachment else None
+ else:
+ #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 = forms.Textarea(attrs={'readonly':True}),
- initial = get_open_answer(answers, exercise),
- 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)],
+ 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:
+ class Meta(SubmissionFormBase.Meta):
+ pass
+ Meta.exclude += ('examiners',)
+ fields['Meta'] = Meta
+
return type('SubmissionForm', (SubmissionFormBase,), fields)
class SubmissionAdmin(admin.ModelAdmin):
- list_display = ('__unicode__', 'todo',)
+ list_display = ('__unicode__', 'todo', 'examiners_repr')
readonly_fields = readonly_fields
def get_form(self, request, obj, **kwargs):
@@ -100,6 +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 do zgÅoszenia'
def save_model(self, request, submission, form, change):
for name, value in form.cleaned_data.items():
@@ -110,6 +184,55 @@ 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 = [])
+ 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):
+ qs = super(SubmissionAdmin, self).queryset(request)
+ if not request.user.is_superuser:
+ 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)