X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/9b0b4bb5608959a7d56f3548bd99e478baa44af6..2d06b37b45d3ba1ba224f63855631147c82cc103:/wtem/admin.py?ds=sidebyside

diff --git a/wtem/admin.py b/wtem/admin.py
index 0047e9d..78ca9b9 100644
--- a/wtem/admin.py
+++ b/wtem/admin.py
@@ -32,18 +32,29 @@ class AttachmentWidget(forms.Widget):
             a_tag = '<a href="%s">%s</a>' % (value, value)
         else:
             a_tag = 'brak'
-        return mark_safe(('<input type="hidden" name="%s" value="%s"/>' + a_tag) % (name, value))
+        return mark_safe(('<input type="hidden" name="%s" value="%s"/>' % (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 = "<div style='margin-left: 106px'>"
+        for k, n, v in links:
+            moreoutput += u"<br>%s: %s" % (k, AttachmentWidget().render(n, v))
+        output += mark_safe(moreoutput + "</div>")
+        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'])
@@ -59,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'<nie wybrano odpowiedzi>\n'
         toret += u'\nCzesc otwarta (%s):\n\n' % ' '.join(exercise['open_part'])
@@ -90,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']
                 )
@@ -194,11 +227,12 @@ 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 = 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)