new question

[edumed.git] / wtem / admin.py

diff --git a/wtem/admin.py b/wtem/admin.py
index 672666b..89389c1 100644 (file)
--- a/wtem/admin.py
+++ b/wtem/admin.py
@@ -8,6 +8,7 @@ from django.utils import simplejson
 from django.core.urlresolvers import reverse
 
 from .models import Submission, Assignment
 from django.core.urlresolvers import reverse
 
 from .models import Submission, Assignment

+from .middleware import get_current_request

 
 
 f = file(os.path.dirname(__file__) + '/fixtures/exercises.json')
 
 
 f = file(os.path.dirname(__file__) + '/fixtures/exercises.json')


@@ -28,6 +29,36 @@ class SubmissionFormBase(forms.ModelForm):
         exclude = ('answers', 'marks', 'contact') + readonly_fields
 
 
         exclude = ('answers', 'marks', 'contact') + readonly_fields
 
 

+def get_open_answer(answers, exercise):
+    def get_option(options, id):
+        for option in options:
+            if option['id'] == int(id):
+                return option
+
+    exercise_id = str(exercise['id'])
+    answer = answers[exercise_id]
+    if exercise['type'] == 'open':
+        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'])
+        else:
+            toret += u'<nie wybrano odpowiedzi>\n'
+        toret += u'\nCzesc otwarta (%s):\n\n' % ' '.join(exercise['open_part'])
+        toret += answer['open_part']
+
+    return toret
+
+

 def get_form(request, submission):
     fields = dict()
     if submission.answers:
 def get_form(request, submission):
     fields = dict()
     if submission.answers:


@@ -36,12 +67,12 @@ def get_form(request, submission):
         for exercise in exercises:
             if exercise not in user_exercises:
                 continue
         for exercise in exercises:
             if exercise not in user_exercises:
                 continue

-            if exercise['type'] == 'open':
+            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)
                 fields[answer_field_name] = forms.CharField(
                     widget = forms.Textarea(attrs={'readonly':True}),
                 answer_field_name = 'exercise_%s' % exercise['id']
                 mark_field_name = 'markof_%s_by_%s' % (exercise['id'], request.user.id)
                 fields[answer_field_name] = forms.CharField(
                     widget = forms.Textarea(attrs={'readonly':True}),

-                    initial = answers[str(exercise['id'])],
+                    initial = get_open_answer(answers, exercise),

                     label = 'Rozwiązanie zadania %s' % exercise['id']
                 )
 
                     label = 'Rozwiązanie zadania %s' % exercise['id']
                 )
 


@@ -54,6 +85,7 @@ def get_form(request, submission):
 
 
 class SubmissionAdmin(admin.ModelAdmin):
 
 
 class SubmissionAdmin(admin.ModelAdmin):

+    list_display = ('__unicode__', 'todo',)

     readonly_fields = readonly_fields
 
     def get_form(self, request, obj, **kwargs):
     readonly_fields = readonly_fields
 
     def get_form(self, request, obj, **kwargs):


@@ -69,6 +101,12 @@ class SubmissionAdmin(admin.ModelAdmin):
     submitted_by.allow_tags = True
     submitted_by.short_description = "Zgłoszony/a przez"
 
     submitted_by.allow_tags = True
     submitted_by.short_description = "Zgłoszony/a przez"
 

+    def todo(self, submission):
+        user = get_current_request().user
+        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()])
+

     def save_model(self, request, submission, form, change):
         for name, value in form.cleaned_data.items():
             if name.startswith('markof_'):
     def save_model(self, request, submission, form, change):
         for name, value in form.cleaned_data.items():
             if name.startswith('markof_'):