X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/543746a467e90915f7eaf60b7b09f5fa498056e0..9e258f6b33fac6ab2068f1769d39e99a14ceb42a:/wtem/forms.py diff --git a/wtem/forms.py b/wtem/forms.py index fcce303..ae406a3 100644 --- a/wtem/forms.py +++ b/wtem/forms.py @@ -1,7 +1,7 @@ -import os +# -*- coding: utf-8 -*- +import re from django import forms -from django.utils import simplejson from .models import Submission, Attachment, exercises @@ -16,16 +16,17 @@ class WTEMForm(forms.ModelForm): for exercise in exercises: if exercise['type'] != 'file_upload': continue - self.fields['attachment_for_' + str(exercise['id'])] = forms.FileField(required = False) + self.fields['attachment_for_' + str(exercise['id'])] = forms.FileField(required=False) - def save(self): - submission = super(WTEMForm, self).save() - for name, file in self.files.items(): - exercise_id = int(name.split('_')[-1]) + def save(self, commit=True): + submission = super(WTEMForm, self).save(commit=commit) + for name, attachment_file in self.files.items(): + m = re.match(r'attachment_for_(\d+)(?:__(.*))?', name) + exercise_id = int(m.group(1)) + tag = m.group(2) or None try: - attachment = Attachment.objects.get(submission = submission, exercise_id = exercise_id) + attachment = Attachment.objects.get(submission=submission, exercise_id=exercise_id, tag=tag) except Attachment.DoesNotExist: - attachment = Attachment(submission = submission, exercise_id = exercise_id) - attachment.file = file + attachment = Attachment(submission=submission, exercise_id=exercise_id, tag=tag) + attachment.file = attachment_file attachment.save() -